Date: Fri, 30 Mar 2012 13:59:36 GMT From: Douglas Carmichael <dcarmich@dcarmichael.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/166519: I have updated net/netatalk to 2.2.2 Message-ID: <201203301359.q2UDxacp057358@red.freebsd.org> Resent-Message-ID: <201203301400.q2UE0ZKM083109@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166519
>Category: ports
>Synopsis: I have updated net/netatalk to 2.2.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 30 14:00:35 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Douglas Carmichael
>Release: 8.2-RELEASE-p6
>Organization:
n/a
>Environment:
FreeBSD dc-freebsd82.carmichael.lan 8.2-RELEASE-p6 FreeBSD 8.2-RELEASE-p6 #2: Tue Jan 17 01:02:36 CST 2012 root@dc-freebsd82.carmichael.lan:/usr/src/sys/amd64/compile/VMWARE81-64 amd64
>Description:
I have updated net/netatalk to 2.2.2.
A patch is attached.
>How-To-Repeat:
n/a
>Fix:
n/a
Patch attached with submission follows:
diff -ruN netatalk.orig/Makefile netatalk/Makefile
--- netatalk.orig/Makefile 2011-09-07 14:14:11.000000000 -0500
+++ netatalk/Makefile 2012-03-17 19:43:31.000000000 -0500
@@ -2,15 +2,14 @@
# Date created: 23 Jul 1997
# Whom: stb
#
-# $FreeBSD: ports/net/netatalk/Makefile,v 1.102 2011/08/28 07:40:00 marcus Exp $
+# $FreeBSD: ports/net/netatalk/Makefile,v 1.103 2011/09/10 18:40:45 marcus Exp $
#
PORTNAME= netatalk
-PORTVERSION= 2.2.0
-PORTREVISION= 3
+PORTVERSION= 2.2.2
PORTEPOCH= 1
CATEGORIES= net print
-MASTER_SITES= SF/netatalk/netatalk/2.2
+MASTER_SITES= SF
MAINTAINER= marcus@FreeBSD.org
COMMENT= File server for Mac OS X
@@ -45,7 +44,7 @@
LINKS= unbin unhex unsingle hqx2bin single2bin macbinary \
binheader nadheader
MAN1= ad.1 afpldaptest.1 afppasswd.1 apple_dump.1 asip-status.pl.1 \
- dbd.1 hqx2bin.1 macbinary.1 megatron.1 \
+ dbd.1 hqx2bin.1 macbinary.1 macusers.1 megatron.1 \
netatalk-config.1 single2bin.1 unbin.1 unhex.1 uniconv.1 \
unsingle.1
MAN5= AppleVolumes.5 AppleVolumes.default.5 \
@@ -103,6 +102,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 2012-03-17 19:43:40.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.2.tar.bz2) = 443031b90d9dd6270d98659d210f408437d8e71e8094d6f0b71706a5c481e3a0
+SIZE (netatalk-2.2.2.tar.bz2) = 1239433
diff -ruN netatalk.orig/files/netatalk.in netatalk/files/netatalk.in
--- netatalk.orig/files/netatalk.in 2011-09-07 14:14:11.000000000 -0500
+++ netatalk/files/netatalk.in 2012-01-14 02:56:20.000000000 -0600
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/net/netatalk/files/netatalk.in,v 1.4 2011/08/14 17:17:28 marcus Exp $
+# $FreeBSD: ports/net/netatalk/files/netatalk.in,v 1.5 2012/01/14 08:56:20 dougb Exp $
#
# PROVIDE: atalkd papd cnid_metad timelord afpd
# REQUIRE: DAEMON %%SRVLOC%% %%ZEROCONF%%
@@ -31,7 +31,7 @@
. /etc/rc.subr
name=netatalk
-rcvar=`set_rcvar`
+rcvar=netatalk_enable
hostname=`hostname -s`
start_cmd=netatalk_start
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 2011-09-10 13:40:45.000000000 -0500
@@ -1,22 +1,5 @@
--- 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
@@ -26,12 +9,3 @@
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>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203301359.q2UDxacp057358>