Attachment 118355 Details for Bug 160590 – file.diff

[patch] file.diff

file.diff (text/plain), 9.61 KB, created by Douglas Carmichael on 2011-09-09 16:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Carmichael

Created: 2011-09-09 16:20:06 UTC

Size: 9.61 KB

patch

obsolete

>diff -ruN netatalk.orig/Makefile netatalk/Makefile
>--- netatalk.orig/Makefile	2011-09-07 14:14:11.000000000 -0500
>+++ netatalk/Makefile	2011-09-09 10:04:45.000000000 -0500
>@@ -6,11 +6,11 @@
> #
> 
> PORTNAME=	netatalk
>-PORTVERSION=	2.2.0
>+PORTVERSION=	2.2.1
> PORTREVISION=	3
> PORTEPOCH=	1
> CATEGORIES=	net print
>-MASTER_SITES=	SF/netatalk/netatalk/2.2
>+MASTER_SITES=	SF/netatalk/netatalk/2.2.1
> 
> MAINTAINER=	marcus@FreeBSD.org
> COMMENT=	File server for Mac OS X
>@@ -103,6 +103,7 @@
> 
> .if defined (WITH_ZEROCONF)
> CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
>+CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
> LIB_DEPENDS+=		avahi-client.3:${PORTSDIR}/net/avahi-app
> USE_GNOME+=		pkgconfig
> SUB_LIST+=		ZEROCONF="avahi_daemon"
>diff -ruN netatalk.orig/distinfo netatalk/distinfo
>--- netatalk.orig/distinfo	2011-09-07 14:14:11.000000000 -0500
>+++ netatalk/distinfo	2011-09-07 14:15:01.000000000 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (netatalk-2.2.0.tar.bz2) = 31bf7c1ea311f876d9be6d4be9faed24d170a89e6ce692304fc2cb525f25143b
>-SIZE (netatalk-2.2.0.tar.bz2) = 1216174
>+SHA256 (netatalk-2.2.1.tar.bz2) = 3ab81c6335f8c33fd01ae599459a26c8cfe3b975009ce73640cae823ddc78bbf
>+SIZE (netatalk-2.2.1.tar.bz2) = 1227602
>diff -ruN netatalk.orig/files/patch-config_Makefile.in netatalk/files/patch-config_Makefile.in
>--- netatalk.orig/files/patch-config_Makefile.in	2011-09-07 14:14:11.000000000 -0500
>+++ netatalk/files/patch-config_Makefile.in	1969-12-31 18:00:00.000000000 -0600
>@@ -1,28 +0,0 @@
>---- config/Makefile.in.orig	2010-10-15 06:10:05.000000000 -0400
>-+++ config/Makefile.in	2010-11-07 18:38:03.000000000 -0500
>-@@ -592,8 +592,8 @@ install-data-local: install-config-files
>- 
>- uninstall-local:
>- 	for f in $(CONFFILES) $(GENFILES); do \
>--		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
>--		rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
>-+		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
>-+		rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
>- 	done
>- 
>- @USE_DEBIAN_TRUE@	rm -f $(DESTDIR)/etc/default/netatalk;
>-@@ -601,12 +601,8 @@ uninstall-local:
>- install-config-files: $(CONFFILES) $(GENFILES)
>- 	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
>- 	for f in $(CONFFILES) $(GENFILES); do \
>--		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
>--			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
>--			$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
>--		else \
>--			echo "not overwriting $$f"; \
>--		fi; \
>-+	    echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \
>-+	    $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
>- 	done
>- 
>- @USE_DEBIAN_TRUE@	$(mkinstalldirs) $(DESTDIR)/default
>diff -ruN netatalk.orig/files/patch-config_netatalk.conf netatalk/files/patch-config_netatalk.conf
>--- netatalk.orig/files/patch-config_netatalk.conf	2011-09-07 14:14:11.000000000 -0500
>+++ netatalk/files/patch-config_netatalk.conf	1969-12-31 18:00:00.000000000 -0600
>@@ -1,20 +0,0 @@
>---- config/netatalk.conf.orig	2011-07-22 00:30:42.000000000 -0400
>-+++ config/netatalk.conf	2011-07-30 18:01:04.000000000 -0400
>-@@ -1,4 +1,5 @@
>--# Netatalk configuration
>-+# netatalk configuration
>-+# For details see man netatalk.conf
>- 
>- #########################################################################
>- # Global configuration
>-@@ -21,8 +22,8 @@ export ATALK_MAC_CHARSET
>- 
>- #### Set which daemons to run.
>- #### If you use AFP file server, run both cnid_metad and afpd.
>--CNID_METAD_RUN=yes
>--AFPD_RUN=yes
>-+#CNID_METAD_RUN=yes
>-+#AFPD_RUN=yes
>- 
>- #### maximum number of clients that can connect:
>- #AFPD_MAX_CLIENTS=20
>diff -ruN netatalk.orig/files/patch-configure netatalk/files/patch-configure
>--- netatalk.orig/files/patch-configure	2011-09-07 14:14:11.000000000 -0500
>+++ netatalk/files/patch-configure	1969-12-31 18:00:00.000000000 -0600
>@@ -1,37 +0,0 @@
>---- configure.orig	2011-07-27 07:59:28.000000000 -0400
>-+++ configure	2011-08-01 03:26:25.000000000 -0400
>-@@ -27039,6 +27039,7 @@ fi
>- 
>-         savedcflags="$CFLAGS"
>-         savedldflags="$LDFLAGS"
>-+        saved_CPPFLAGS="$CPPFLAGS"
>- 	ICONV_CFLAGS=""
>- 	ICONV_LIBS=""
>- 
>-@@ -28265,6 +28266,8 @@ echo "$as_me: error: internal error, ata
>- 	if test "x$zeroconf" != "xno"; then
>- 		savedcppflags="$CPPFLAGS"
>- 		savedldflags="$LDFLAGS"
>-+		CPPFLAGS="-I%%LOCALBASE%%/include $CPPFLAGS"
>-+		LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
>- 
>- 		if test "x$zeroconf" = "xyes" -o "x$zeroconf" = "xtry"; then
>- 			zeroconf_dir="/usr"
>-@@ -31357,7 +31360,7 @@ if test "x$bdb_required" = "xyes"; then
>-     trybdbdir=""
>-     dobdbsearch=yes
>-     bdb_search_dirs="/usr/local /usr"
>--    search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
>-+    search_subdirs="/%%DB_NAME%% / /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
>- 
>-     bdbfound=no
>-     savedcflags="$CFLAGS"
>-@@ -33387,7 +33390,7 @@ rm -f core conftest.err conftest.$ac_obj
>- fi
>- { echo "$as_me:$LINENO: result: $netatalk_cv_HAVE_ACL_GET_PERM_NP" >&5
>- echo "${ECHO_T}$netatalk_cv_HAVE_ACL_GET_PERM_NP" >&6; }
>--			if test x"netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
>-+			if test x"$netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
>- 
>- cat >>confdefs.h <<\_ACEOF
>- #define HAVE_ACL_GET_PERM_NP 1
>diff -ruN netatalk.orig/files/patch-etc_afpd_acls.c netatalk/files/patch-etc_afpd_acls.c
>--- netatalk.orig/files/patch-etc_afpd_acls.c	2011-09-07 14:14:11.000000000 -0500
>+++ netatalk/files/patch-etc_afpd_acls.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,63 +0,0 @@
>---- etc/afpd/acls.c.orig	2011-07-30 18:08:35.000000000 -0400
>-+++ etc/afpd/acls.c	2011-07-30 18:19:19.000000000 -0400
>-@@ -1060,7 +1060,59 @@ static int set_acl(const struct vol *vol
>- #ifdef HAVE_ACL_FROM_MODE
>-     EC_NULL_LOG_ERR(acc_acl = acl_from_mode(st.st_mode), AFPERR_MISC);
>- #else
>--#error "Missing acl_from_mode() replacement"
>-+    /* Implement the non POSIX.1e function acl_from_mode
>-+     *
>-+     * Taken from http://people.freebsd.org/~markus/stuff/kacl.diff
>-+     */
>-+    {
>-+	    acl_t new_acl = acl_init( 3 );
>-+	    acl_entry_t entry;
>-+	    acl_permset_t permset = 0;
>-+	    int error = 0;
>-+
>-+	    /* Add owner entry */
>-+	    if ( ( error = acl_create_entry( &new_acl, &entry ) ) == 0 ) {
>-+		    /* Set owner permissions */
>-+		    acl_set_tag_type( entry, ACL_USER_OBJ );
>-+		    acl_get_permset( entry, &permset );
>-+		    acl_clear_perms( permset );
>-+		    if ( st.st_mode & S_IRUSR ) acl_add_perm( permset, ACL_READ );
>-+		    if ( st.st_mode & S_IWUSR ) acl_add_perm( permset, ACL_WRITE );
>-+		    if ( st.st_mode & S_IXUSR ) acl_add_perm( permset, ACL_EXECUTE );
>-+		    acl_set_permset( entry, permset );
>-+
>-+		    /* Add group entry */
>-+		    if ( ( error = acl_create_entry( &new_acl, &entry ) ) == 0 ) {
>-+			    /* Set group permissions */
>-+			    acl_set_tag_type( entry, ACL_GROUP_OBJ );
>-+			    acl_get_permset( entry, &permset );
>-+			    acl_clear_perms( permset );
>-+			    if ( st.st_mode & S_IRGRP ) acl_add_perm( permset, ACL_READ );
>-+			    if ( st.st_mode & S_IWGRP ) acl_add_perm( permset, ACL_WRITE );
>-+			    if ( st.st_mode & S_IXGRP ) acl_add_perm( permset, ACL_EXECUTE );
>-+			    acl_set_permset( entry, permset );
>-+
>-+			    /* Add other entry */
>-+			    if ( ( error = acl_create_entry( &new_acl, &entry ) ) == 0 ) {
>-+				    /* Set other permissions */
>-+				    acl_set_tag_type( entry, ACL_OTHER );
>-+				    acl_get_permset( entry, &permset );
>-+				    acl_clear_perms( permset );
>-+				    if ( st.st_mode & S_IROTH ) acl_add_perm( permset, ACL_READ );
>-+				    if ( st.st_mode & S_IWOTH ) acl_add_perm( permset, ACL_WRITE );
>-+				    if ( st.st_mode & S_IXOTH ) acl_add_perm( permset, ACL_EXECUTE );
>-+				    acl_set_permset( entry, permset );
>-+			    }
>-+		    }
>-+	    }
>-+
>-+	    if ( error ) {
>-+		    acl_free( &new_acl );
>-+		    EC_NULL_LOG_ERR(acc_acl = NULL, AFPERR_MISC);
>-+	    }
>-+	    else
>-+		    acc_acl = new_acl;
>-+    }
>- #endif
>-     /* adds the clients aces */
>-     EC_ZERO_ERR(map_aces_darwin_to_posix(daces, &def_acl, &acc_acl, ace_count), AFPERR_MISC);
>diff -ruN netatalk.orig/files/patch-etc_afpd_afp_asp.c netatalk/files/patch-etc_afpd_afp_asp.c
>--- netatalk.orig/files/patch-etc_afpd_afp_asp.c	2011-09-07 14:14:11.000000000 -0500
>+++ netatalk/files/patch-etc_afpd_afp_asp.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,13 +0,0 @@
>---- etc/afpd/afp_asp.c.orig	2011-07-30 23:13:47.000000000 -0400
>-+++ etc/afpd/afp_asp.c	2011-07-30 23:14:22.000000000 -0400
>-@@ -31,9 +31,9 @@
>- #include <atalk/atp.h>
>- #include <atalk/asp.h>
>- #include <atalk/compat.h>
>-+#include <atalk/globals.h>
>- #include <atalk/util.h>
>- 
>--#include "globals.h"
>- #include "switch.h"
>- #include "auth.h"
>- #include "fork.h"
>diff -ruN netatalk.orig/files/patch-etc_cnid_dbd_comm.c netatalk/files/patch-etc_cnid_dbd_comm.c
>--- netatalk.orig/files/patch-etc_cnid_dbd_comm.c	2011-09-07 14:14:11.000000000 -0500
>+++ netatalk/files/patch-etc_cnid_dbd_comm.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,12 +0,0 @@
>---- etc/cnid_dbd/comm.c.orig	2011-07-30 18:27:55.000000000 -0400
>-+++ etc/cnid_dbd/comm.c	2011-07-30 18:28:04.000000000 -0400
>-@@ -9,9 +9,6 @@
>- #include "config.h"
>- #endif
>- 
>--#ifndef _XOPEN_SOURCE
>--# define _XOPEN_SOURCE 600
>--#endif
>- #ifndef __EXTENSIONS__
>- # define __EXTENSIONS__
>- #endif
>diff -ruN netatalk.orig/files/patch-include_atalk_dsi.h netatalk/files/patch-include_atalk_dsi.h
>--- netatalk.orig/files/patch-include_atalk_dsi.h	2011-09-07 14:14:11.000000000 -0500
>+++ netatalk/files/patch-include_atalk_dsi.h	1969-12-31 18:00:00.000000000 -0600
>@@ -1,10 +0,0 @@
>---- include/atalk/dsi.h.orig	2010-06-09 18:46:15.000000000 -0400
>-+++ include/atalk/dsi.h	2010-06-09 18:44:22.000000000 -0400
>-@@ -11,6 +11,7 @@
>- #include <sys/time.h>
>- #include <signal.h>
>- 
>-+#include <sys/socket.h>
>- #include <netinet/in.h>
>- #include <atalk/afp.h>
>- #include <atalk/server_child.h>

Actions: View | Diff

Attachments on bug 160590: 118355