Attachment #118355 for bug #160590

View | Details | Raw Unified | Return to bug 160590
Collapse All | Expand All




#

PORTNAME=	netatalk
PORTVERSION=	2.2.1
PORTREVISION=	3
PORTEPOCH=	1
CATEGORIES=	net print
MASTER_SITES=	SF/netatalk/netatalk/2.2.1

MAINTAINER=	marcus@FreeBSD.org
COMMENT=	File server for Mac OS X


.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"

Lines 1-2 Link Here

(-)netatalk/distinfo (-2 / +2 lines)
1	SHA256 (netatalk-2.2.0.tar.bz2) = 31bf7c1ea311f876d9be6d4be9faed24d170a89e6ce692304fc2cb525f25143b	1	SHA256 (netatalk-2.2.1.tar.bz2) = 3ab81c6335f8c33fd01ae599459a26c8cfe3b975009ce73640cae823ddc78bbf
2	SIZE (netatalk-2.2.0.tar.bz2) = 1216174	2	SIZE (netatalk-2.2.1.tar.bz2) = 1227602




--- 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




--- 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




--- 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




--- 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);




--- 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"




--- 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

Lines 1-10 Link Here

(-)netatalk/files/patch-include_atalk_dsi.h (-10 lines)
1	--- include/atalk/dsi.h.orig 2010-06-09 18:46:15.000000000 -0400
2	+++ include/atalk/dsi.h 2010-06-09 18:44:22.000000000 -0400
3	@@ -11,6 +11,7 @@
4	#include <sys/time.h>
5	#include <signal.h>
6
7	+#include <sys/socket.h>
8	#include <netinet/in.h>
9	#include <atalk/afp.h>
10	#include <atalk/server_child.h>

Return to bug 160590

Lines 6-16 Link Here

(-)netatalk/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= netatalk	8	PORTNAME= netatalk
9	PORTVERSION= 2.2.0	9	PORTVERSION= 2.2.1
10	PORTREVISION= 3	10	PORTREVISION= 3
11	PORTEPOCH= 1	11	PORTEPOCH= 1
12	CATEGORIES= net print	12	CATEGORIES= net print
13	MASTER_SITES= SF/netatalk/netatalk/2.2	13	MASTER_SITES= SF/netatalk/netatalk/2.2.1
14		14
15	MAINTAINER= marcus@FreeBSD.org	15	MAINTAINER= marcus@FreeBSD.org
16	COMMENT= File server for Mac OS X	16	COMMENT= File server for Mac OS X
Lines 103-108 Link Here
103		103
104	.if defined (WITH_ZEROCONF)	104	.if defined (WITH_ZEROCONF)
105	CONFIGURE_ARGS+= --enable-zeroconf=${LOCALBASE}	105	CONFIGURE_ARGS+= --enable-zeroconf=${LOCALBASE}
		106	CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
106	LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app	107	LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app
107	USE_GNOME+= pkgconfig	108	USE_GNOME+= pkgconfig
108	SUB_LIST+= ZEROCONF="avahi_daemon"	109	SUB_LIST+= ZEROCONF="avahi_daemon"

Lines 1-28 Link Here

(-)netatalk/files/patch-config_Makefile.in (-28 lines)
1	--- config/Makefile.in.orig 2010-10-15 06:10:05.000000000 -0400
2	+++ config/Makefile.in 2010-11-07 18:38:03.000000000 -0500
3	@@ -592,8 +592,8 @@ install-data-local: install-config-files
4
5	uninstall-local:
6	for f in $(CONFFILES) $(GENFILES); do \
7	- echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
8	- rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
9	+ echo rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
10	+ rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
11	done
12
13	@USE_DEBIAN_TRUE@ rm -f $(DESTDIR)/etc/default/netatalk;
14	@@ -601,12 +601,8 @@ uninstall-local:
15	install-config-files: $(CONFFILES) $(GENFILES)
16	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
17	for f in $(CONFFILES) $(GENFILES); do \
18	- if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
19	- echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
20	- $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
21	- else \
22	- echo "not overwriting $$f"; \
23	- fi; \
24	+ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \
25	+ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
26	done
27
28	@USE_DEBIAN_TRUE@ $(mkinstalldirs) $(DESTDIR)/default

Lines 1-20 Link Here

(-)netatalk/files/patch-config_netatalk.conf (-20 lines)
1	--- config/netatalk.conf.orig 2011-07-22 00:30:42.000000000 -0400
2	+++ config/netatalk.conf 2011-07-30 18:01:04.000000000 -0400
3	@@ -1,4 +1,5 @@
4	-# Netatalk configuration
5	+# netatalk configuration
6	+# For details see man netatalk.conf
7
8	#########################################################################
9	# Global configuration
10	@@ -21,8 +22,8 @@ export ATALK_MAC_CHARSET
11
12	#### Set which daemons to run.
13	#### If you use AFP file server, run both cnid_metad and afpd.
14	-CNID_METAD_RUN=yes
15	-AFPD_RUN=yes
16	+#CNID_METAD_RUN=yes
17	+#AFPD_RUN=yes
18
19	#### maximum number of clients that can connect:
20	#AFPD_MAX_CLIENTS=20

Lines 1-37 Link Here

(-)netatalk/files/patch-configure (-37 lines)
1	--- configure.orig 2011-07-27 07:59:28.000000000 -0400
2	+++ configure 2011-08-01 03:26:25.000000000 -0400
3	@@ -27039,6 +27039,7 @@ fi
4
5	savedcflags="$CFLAGS"
6	savedldflags="$LDFLAGS"
7	+ saved_CPPFLAGS="$CPPFLAGS"
8	ICONV_CFLAGS=""
9	ICONV_LIBS=""
10
11	@@ -28265,6 +28266,8 @@ echo "$as_me: error: internal error, ata
12	if test "x$zeroconf" != "xno"; then
13	savedcppflags="$CPPFLAGS"
14	savedldflags="$LDFLAGS"
15	+ CPPFLAGS="-I%%LOCALBASE%%/include $CPPFLAGS"
16	+ LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
17
18	if test "x$zeroconf" = "xyes" -o "x$zeroconf" = "xtry"; then
19	zeroconf_dir="/usr"
20	@@ -31357,7 +31360,7 @@ if test "x$bdb_required" = "xyes"; then
21	trybdbdir=""
22	dobdbsearch=yes
23	bdb_search_dirs="/usr/local /usr"
24	- search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
25	+ search_subdirs="/%%DB_NAME%% / /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
26
27	bdbfound=no
28	savedcflags="$CFLAGS"
29	@@ -33387,7 +33390,7 @@ rm -f core conftest.err conftest.$ac_obj
30	fi
31	{ echo "$as_me:$LINENO: result: $netatalk_cv_HAVE_ACL_GET_PERM_NP" >&5
32	echo "${ECHO_T}$netatalk_cv_HAVE_ACL_GET_PERM_NP" >&6; }
33	- if test x"netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
34	+ if test x"$netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
35
36	cat >>confdefs.h <<\_ACEOF
37	#define HAVE_ACL_GET_PERM_NP 1

Lines 1-63 Link Here

(-)netatalk/files/patch-etc_afpd_acls.c (-63 lines)
1	--- etc/afpd/acls.c.orig 2011-07-30 18:08:35.000000000 -0400
2	+++ etc/afpd/acls.c 2011-07-30 18:19:19.000000000 -0400
3	@@ -1060,7 +1060,59 @@ static int set_acl(const struct vol *vol
4	#ifdef HAVE_ACL_FROM_MODE
5	EC_NULL_LOG_ERR(acc_acl = acl_from_mode(st.st_mode), AFPERR_MISC);
6	#else
7	-#error "Missing acl_from_mode() replacement"
8	+ /* Implement the non POSIX.1e function acl_from_mode
9	+ *
10	+ * Taken from http://people.freebsd.org/~markus/stuff/kacl.diff
11	+ */
12	+ {
13	+ acl_t new_acl = acl_init( 3 );
14	+ acl_entry_t entry;
15	+ acl_permset_t permset = 0;
16	+ int error = 0;
17	+
18	+ /* Add owner entry */
19	+ if ( ( error = acl_create_entry( &new_acl, &entry ) ) == 0 ) {
20	+ /* Set owner permissions */
21	+ acl_set_tag_type( entry, ACL_USER_OBJ );
22	+ acl_get_permset( entry, &permset );
23	+ acl_clear_perms( permset );
24	+ if ( st.st_mode & S_IRUSR ) acl_add_perm( permset, ACL_READ );
25	+ if ( st.st_mode & S_IWUSR ) acl_add_perm( permset, ACL_WRITE );
26	+ if ( st.st_mode & S_IXUSR ) acl_add_perm( permset, ACL_EXECUTE );
27	+ acl_set_permset( entry, permset );
28	+
29	+ /* Add group entry */
30	+ if ( ( error = acl_create_entry( &new_acl, &entry ) ) == 0 ) {
31	+ /* Set group permissions */
32	+ acl_set_tag_type( entry, ACL_GROUP_OBJ );
33	+ acl_get_permset( entry, &permset );
34	+ acl_clear_perms( permset );
35	+ if ( st.st_mode & S_IRGRP ) acl_add_perm( permset, ACL_READ );
36	+ if ( st.st_mode & S_IWGRP ) acl_add_perm( permset, ACL_WRITE );
37	+ if ( st.st_mode & S_IXGRP ) acl_add_perm( permset, ACL_EXECUTE );
38	+ acl_set_permset( entry, permset );
39	+
40	+ /* Add other entry */
41	+ if ( ( error = acl_create_entry( &new_acl, &entry ) ) == 0 ) {
42	+ /* Set other permissions */
43	+ acl_set_tag_type( entry, ACL_OTHER );
44	+ acl_get_permset( entry, &permset );
45	+ acl_clear_perms( permset );
46	+ if ( st.st_mode & S_IROTH ) acl_add_perm( permset, ACL_READ );
47	+ if ( st.st_mode & S_IWOTH ) acl_add_perm( permset, ACL_WRITE );
48	+ if ( st.st_mode & S_IXOTH ) acl_add_perm( permset, ACL_EXECUTE );
49	+ acl_set_permset( entry, permset );
50	+ }
51	+ }
52	+ }
53	+
54	+ if ( error ) {
55	+ acl_free( &new_acl );
56	+ EC_NULL_LOG_ERR(acc_acl = NULL, AFPERR_MISC);
57	+ }
58	+ else
59	+ acc_acl = new_acl;
60	+ }
61	#endif
62	/* adds the clients aces */
63	EC_ZERO_ERR(map_aces_darwin_to_posix(daces, &def_acl, &acc_acl, ace_count), AFPERR_MISC);

Lines 1-13 Link Here

(-)netatalk/files/patch-etc_afpd_afp_asp.c (-13 lines)
1	--- etc/afpd/afp_asp.c.orig 2011-07-30 23:13:47.000000000 -0400
2	+++ etc/afpd/afp_asp.c 2011-07-30 23:14:22.000000000 -0400
3	@@ -31,9 +31,9 @@
4	#include <atalk/atp.h>
5	#include <atalk/asp.h>
6	#include <atalk/compat.h>
7	+#include <atalk/globals.h>
8	#include <atalk/util.h>
9
10	-#include "globals.h"
11	#include "switch.h"
12	#include "auth.h"
13	#include "fork.h"

Lines 1-12 Link Here

(-)netatalk/files/patch-etc_cnid_dbd_comm.c (-12 lines)
1	--- etc/cnid_dbd/comm.c.orig 2011-07-30 18:27:55.000000000 -0400
2	+++ etc/cnid_dbd/comm.c 2011-07-30 18:28:04.000000000 -0400
3	@@ -9,9 +9,6 @@
4	#include "config.h"
5	#endif
6
7	-#ifndef _XOPEN_SOURCE
8	-# define _XOPEN_SOURCE 600
9	-#endif
10	#ifndef __EXTENSIONS__
11	# define __EXTENSIONS__
12	#endif