<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/35a8a491fc87c49d2d6d0ba781eb6787626b3075">https://github.com/macports/macports-ports/commit/35a8a491fc87c49d2d6d0ba781eb6787626b3075</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 35a8a491fc8 netatalk: update to 2.2.10
</span>35a8a491fc8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 35a8a491fc87c49d2d6d0ba781eb6787626b3075
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Nov 13 01:31:38 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> netatalk: update to 2.2.10
</span>---
net/netatalk/Portfile | 84 ++++++++++++++------------
net/netatalk/files/patch-adv1tov2.c | 31 ----------
net/netatalk/files/patch-afppasswd.c | 11 ----
net/netatalk/files/patch-bin-Makefile.am | 7 ---
net/netatalk/files/patch-bin-Makefile.in | 11 ----
net/netatalk/files/patch-bin-cnid-cnid_index.c | 14 -----
net/netatalk/files/patch-configure | 12 ----
net/netatalk/files/patch-configure.in | 10 ---
net/netatalk/files/patch-etc-cnid_dbd-dbif.c | 15 -----
net/netatalk/files/patch-paths.h | 34 -----------
net/netatalk/files/patch-uams_randnum.c | 11 ----
net/netatalk/files/patch-usockfd.c | 11 ----
12 files changed, 46 insertions(+), 205 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/Portfile b/net/netatalk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e765ff68be..c7d855fd342 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/netatalk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name netatalk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span> maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description file and printer server for Apple Macintosh clients
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description File and printer server for Apple Macintosh clients
</span> long_description netatalk is a daemon which provides POSIX-compliant \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Unix/BSD systems with the ability to share files and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printers with Apple Macintosh computers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Unix/BSD systems with the ability to share files \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and printers with Apple Macintosh computers.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://netatalk.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://netatalk.sourceforge.net
</span> master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 47247d376bf421652d9f9897c75853424215ae0a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aa11b26ad5c6cfb6043458fc849ed82b13b6d13219191a6335fce1bc76288b37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 993882
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3a8b7e7dac944dbc65005ebcdf49b286b6ac9730 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0443368ec1a6019c41a0406d34fe6681b00207a5abe8a8a731a557d1d2a998e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1341863
</span>
use_bzip2 yes
startupitem.create yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,40 +27,45 @@ startupitem.start "${prefix}/etc/netatalk/initscript start"
</span> startupitem.stop "${prefix}/etc/netatalk/initscript stop"
startupitem.restart "${prefix}/etc/netatalk/initscript restart"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-afppasswd.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-paths.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-uams_randnum.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-adv1tov2.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-usockfd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:db47 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/perl:perl5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:bin/perl:perl5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libldap.dylib:openldap \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:avahi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:db48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcrypt \
</span> port:libiconv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "AppleTalk has been removed from Mac OS X 10.6+."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Building without AppleTalk support."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-ddp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/include/atalk/paths.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-bdb=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-logfile=${prefix}/var/log/netatalk.log \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-acls=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bdb=${prefix} \
</span> --with-spooldir=${prefix}/var/spool/netatalk \
--with-ssl-dir=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libiconv=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libiconv=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ldap=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-a2boot \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-ddp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-timelord
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For some reason, several symbols from uams_guest are left undefined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-pgp-uam \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-krb4-uam \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-krbV-uam
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -I${prefix}/include/db47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -L${prefix}/lib/db47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include/db48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/db48
</span>
post-destroot {
file delete -force ${destroot}${prefix}/sbin/atalkd \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-adv1tov2.c b/net/netatalk/files/patch-adv1tov2.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d40915db263..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-adv1tov2.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/adv1tov2/adv1tov2.c~ 2009-03-29 09:23:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/adv1tov2/adv1tov2.c 2009-11-10 18:36:50.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,16 +8,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "config.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_CONFIG_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <atalk/adouble.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* HAVE_UNISTD_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dirent.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_FCNTL_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_FCNTL_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* HAVE_UNISTD_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <atalk/adouble.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <atalk/util.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if AD_VERSION == AD_VERSION2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-afppasswd.c b/net/netatalk/files/patch-afppasswd.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2e441f5efed..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-afppasswd.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/afppasswd/afppasswd.c Thu Oct 28 17:29:41 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/afppasswd/afppasswd.c.new Thu Oct 28 17:29:34 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <des.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_CRACKLIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <crack.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <packer.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* USE_CRACKLIB */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define OPT_ISROOT (1 << 0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-bin-Makefile.am b/net/netatalk/files/patch-bin-Makefile.am
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4ac1076538e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-bin-Makefile.am
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/Makefile.am.org 2004-02-16 02:34:05.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/Makefile.am 2006-05-29 01:52:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Makefile.am for bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SUBDIRS = adv1tov2 aecho afile afppasswd cnid getzones megatron nbp pap psorder uniconv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SUBDIRS = aecho afile afppasswd cnid getzones megatron nbp pap psorder uniconv
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-bin-Makefile.in b/net/netatalk/files/patch-bin-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9c3a941a4c4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-bin-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/Makefile.in.org 2005-01-03 08:04:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/Makefile.in 2006-05-29 01:52:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_os = @target_os@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_vendor = @target_vendor@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SUBDIRS = adv1tov2 aecho afile afppasswd cnid getzones megatron nbp pap psorder uniconv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SUBDIRS = aecho afile afppasswd cnid getzones megatron nbp pap psorder uniconv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir = bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-bin-cnid-cnid_index.c b/net/netatalk/files/patch-bin-cnid-cnid_index.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9addc4535f7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-bin-cnid-cnid_index.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/cnid/cnid_index.c.orig 2005-01-04 02:49:55.000000000 +1300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/cnid/cnid_index.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -274,7 +274,11 @@ static int dbif_count(const int dbi, u_i
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DB_BTREE_STAT *sp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DB *db = db_table[dbi].db;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ret = db->stat(db, NULL, &sp, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = db->stat(db, &sp, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ret) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bd996f481d3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure~ 2009-10-05 10:27:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2009-11-14 16:34:56.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30116,9 +30116,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cat >>confdefs.h <<\_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define MACOSX_SERVER 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-configure.in b/net/netatalk/files/patch-configure.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6082d603f6a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-configure.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.in.org 2004-11-09 15:07:03.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.in 2006-05-29 01:24:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1016,7 +1016,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_OUTPUT([Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bin/adv1tov2/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin/aecho/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin/afile/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin/afppasswd/Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-etc-cnid_dbd-dbif.c b/net/netatalk/files/patch-etc-cnid_dbd-dbif.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 50ab029b16e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-etc-cnid_dbd-dbif.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- etc/cnid_dbd/dbif.c.orig 2004-12-22 02:36:12.000000000 +1300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc/cnid_dbd/dbif.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -514,7 +514,11 @@ int dbif_count(const int dbi, u_int32_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DB_BTREE_STAT *sp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DB *db = db_table[dbi].db;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ret = db->stat(db, NULL, &sp, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = db->stat(db, &sp, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ret) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-paths.h b/net/netatalk/files/patch-paths.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 77c37a08b72..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-paths.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/atalk/paths.h Sat Oct 5 15:07:18 2002
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/atalk/paths.h.new Thu Oct 28 16:57:53 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,21 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* lock file path. this should be re-organized a bit. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if ! defined (_PATH_LOCKDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if defined (FHS_COMPATIBILITY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define _PATH_LOCKDIR "/var/run/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# elif defined (BSD4_4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef MACOSX_SERVER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define _PATH_LOCKDIR "/var/run/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define _PATH_LOCKDIR "/var/spool/lock/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# elif defined (linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define _PATH_LOCKDIR "/var/lock/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define _PATH_LOCKDIR "/var/spool/locks/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _PATH_LOCKDIR "__PREFIX__/var/run/netatalk/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * papd paths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * atalkd paths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define _PATH_ATALKDEBUG "/tmp/atalkd.debug"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _PATH_ATALKDEBUG "/private/tmp/atalkd.debug"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _PATH_ATALKDTMP "atalkd.tmp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef FHS_COMPATIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define _PATH_ATALKDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-uams_randnum.c b/net/netatalk/files/patch-uams_randnum.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 28a1a699308..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-uams_randnum.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- etc/uams/uams_randnum.c~ 2009-03-29 09:23:23.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc/uams/uams_randnum.c 2009-11-14 16:33:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <des.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_CRACKLIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <crack.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <packer.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* USE_CRACKLIB */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PASSWDLEN 8
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netatalk/files/patch-usockfd.c b/net/netatalk/files/patch-usockfd.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bc845f89f15..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netatalk/files/patch-usockfd.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- etc/cnid_dbd/usockfd.c~ 2009-03-29 09:23:23.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc/cnid_dbd/usockfd.c 2009-11-14 11:11:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int tsockfd_create(char *host, u_int16_t ipport, int backlog)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int sockfd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct sockaddr_in server;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct sockaddr_in server = { 0 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct hostent *hp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int port;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>