[csw-devel] SF.net SVN: gar:[20934] csw/mgar/pkg/netatalk/trunk
slowfranklin at users.sourceforge.net
slowfranklin at users.sourceforge.net
Thu May 2 12:04:34 CEST 2013
Revision: 20934
http://gar.svn.sourceforge.net/gar/?rev=20934&view=rev
Author: slowfranklin
Date: 2013-05-02 10:04:33 +0000 (Thu, 02 May 2013)
Log Message:
-----------
Bump to version 3.0.3 and fix the package
Modified Paths:
--------------
csw/mgar/pkg/netatalk/trunk/Makefile
csw/mgar/pkg/netatalk/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/netatalk/trunk/files/0001-Fix-use-of-unnamed-union-inside-struct.patch
csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch
csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall
csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove
Modified: csw/mgar/pkg/netatalk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-02 07:47:16 UTC (rev 20933)
+++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-02 10:04:33 UTC (rev 20934)
@@ -2,45 +2,50 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = netatalk
-VERSION = 3.0.1
+VERSION = 3.0.3
GARTYPE = v2
-DESCRIPTION = Brief description
+DESCRIPTION = Open Source AFP fileserver
define BLURB
- Long description
+ Netatalk is a freely-available Open Source AFP fileserver. A *NIX/*BSD system
+ running Netatalk is capable of serving many Macintosh clients simultaneously
+ as an AppleShare file server (AFP).
endef
MASTER_SITES = $(SF_MIRROR)
DISTFILES = $(DISTNAME).tar.gz
+DISTFILES += CSWnetatalk.postinstall CSWnetatalk.preremove
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-GARCOMPILER = GNU
-PACKAGES += CSWlibatalk1
-CATALOGNAME_CSWlibatalk1 = libatalk1
-PKGFILES_CSWlibatalk1 += $(call baseisadirs,$(libdir),libatalk\.so\.1\.0\.0)
-PKGFILES_CSWlibatalk1 += $(call baseisadirs,$(libdir),libatalk\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibatalk1 += $(DESCRIPTION), libatalk.so.1
-RUNTIME_DEP_PKGS_CSWlibatalk1 += CSWlibiconv2
+BUILD_DEP_PKGS += CSWlibgcrypt-dev
+BUILD_DEP_PKGS += CSWbdb48devel
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWlibssl-dev
+BUILD_DEP_PKGS += CSWlibkrb5-dev
+BUILD_DEP_PKGS += CSWlibdbus-dev
+BUILD_DEP_PKGS += CSWlibdbus-glib-dev
-PACKAGES += CSWetatalk
-SPKG_DESC_CSWetatalk = $(DESCRIPTION)
-# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWnetatalk += CSWlibatalk1
+RUNTIME_DEP_PKGS += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS += CSWlibgcrypt11
+RUNTIME_DEP_PKGS += CSWbdb48
+RUNTIME_DEP_PKGS += CSWlibiconv2
+RUNTIME_DEP_PKGS += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS += CSWkrb5lib
+RUNTIME_DEP_PKGS += CSWlibdbus
+RUNTIME_DEP_PKGS += CSWdbusglib
+# Both patched are in upstream and will be in 3.0.4
+PATCHFILES += 0001-Fix-use-of-unnamed-union-inside-struct.patch
+PATCHFILES += 0003-Fix-misspelled-compiler-variable.patch
-# File name regex to get notifications about upstream software releases
-# NOTE: Use this only if the automatic regex creation
-# does not work for your package
-# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-static
+CONFIGURE_ARGS += --disable-tcp-wrappers
+CONFIGURE_ARGS += --with-bdb=/opt/csw/bdb48
+CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/run/netatalk
+CONFIGURE_ARGS += --with-init-style=solaris
+CONFIGURE_ARGS += --with-init-dir=/var/opt/csw/svc/manifest/network/
-# If the url used to check for software update is different of MASTER_SITES, then
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES =
-
-CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-ssl-dir=/opt/csw --with-bdb=/opt/csw/bdb47 --with-libiconv=/opt/csw --disable-tcp-wrappers --disable-silent-rules --with-libevent-header=/opt/csw/include --with-libevent-lib=/opt/csw/lib
-
-#EXTRA_LINKER_FLAGS = -levent
-
include gar/category.mk
Modified: csw/mgar/pkg/netatalk/trunk/checksums
===================================================================
--- csw/mgar/pkg/netatalk/trunk/checksums 2013-05-02 07:47:16 UTC (rev 20933)
+++ csw/mgar/pkg/netatalk/trunk/checksums 2013-05-02 10:04:33 UTC (rev 20934)
@@ -1 +1 @@
-0d9446247e1eb260bf4205ea075958c0 netatalk-3.0.1.tar.gz
+cbecbb09a390126d1c74bcfbce3b32c5 netatalk-3.0.3.tar.gz
Added: csw/mgar/pkg/netatalk/trunk/files/0001-Fix-use-of-unnamed-union-inside-struct.patch
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/0001-Fix-use-of-unnamed-union-inside-struct.patch (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/0001-Fix-use-of-unnamed-union-inside-struct.patch 2013-05-02 10:04:33 UTC (rev 20934)
@@ -0,0 +1,181 @@
+From fa8a635cd0894ee40d05d41482608707b5b2419c Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Thu, 2 May 2013 10:23:02 +0200
+Subject: [PATCH] Fix use of unnamed union inside struct
+
+---
+ include/atalk/dsi.h | 2 +-
+ libatalk/dsi/dsi_close.c | 2 +-
+ libatalk/dsi/dsi_cmdreply.c | 2 +-
+ libatalk/dsi/dsi_getsess.c | 6 +++---
+ libatalk/dsi/dsi_getstat.c | 2 +-
+ libatalk/dsi/dsi_opensess.c | 2 +-
+ libatalk/dsi/dsi_read.c | 2 +-
+ libatalk/dsi/dsi_stream.c | 6 +++---
+ libatalk/dsi/dsi_tcp.c | 2 +-
+ libatalk/dsi/dsi_write.c | 2 +-
+ 10 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/include/atalk/dsi.h b/include/atalk/dsi.h
+index fc1af46..c31b522 100644
+--- a/include/atalk/dsi.h
++++ b/include/atalk/dsi.h
+@@ -48,7 +48,7 @@ struct dsi_block {
+ union {
+ uint32_t dsi_code; /* error code */
+ uint32_t dsi_doff; /* data offset */
+- };
++ } dsi_data;
+ uint32_t dsi_len; /* total data length */
+ uint32_t dsi_reserved; /* reserved field */
+ };
+diff --git a/libatalk/dsi/dsi_close.c b/libatalk/dsi/dsi_close.c
+index 892b982..199954f 100644
+--- a/libatalk/dsi/dsi_close.c
++++ b/libatalk/dsi/dsi_close.c
+@@ -21,7 +21,7 @@ void dsi_close(DSI *dsi)
+ dsi->header.dsi_flags = DSIFL_REQUEST;
+ dsi->header.dsi_command = DSIFUNC_CLOSE;
+ dsi->header.dsi_requestID = htons(dsi_serverID(dsi));
+- dsi->header.dsi_code = dsi->header.dsi_reserved = htonl(0);
++ dsi->header.dsi_data.dsi_code = dsi->header.dsi_reserved = htonl(0);
+ dsi->cmdlen = 0;
+ dsi_send(dsi);
+ dsi->proto_close(dsi);
+diff --git a/libatalk/dsi/dsi_cmdreply.c b/libatalk/dsi/dsi_cmdreply.c
+index 5b0d627..04d1708 100644
+--- a/libatalk/dsi/dsi_cmdreply.c
++++ b/libatalk/dsi/dsi_cmdreply.c
+@@ -25,7 +25,7 @@ int dsi_cmdreply(DSI *dsi, const int err)
+
+ dsi->header.dsi_flags = DSIFL_REPLY;
+ dsi->header.dsi_len = htonl(dsi->datalen);
+- dsi->header.dsi_code = htonl(err);
++ dsi->header.dsi_data.dsi_code = htonl(err);
+
+ ret = dsi_stream_send(dsi, dsi->data, dsi->datalen);
+
+diff --git a/libatalk/dsi/dsi_getsess.c b/libatalk/dsi/dsi_getsess.c
+index 38477be..a928d34 100644
+--- a/libatalk/dsi/dsi_getsess.c
++++ b/libatalk/dsi/dsi_getsess.c
+@@ -65,9 +65,9 @@ int dsi_getsession(DSI *dsi, server_child_t *serv_children, int tickleval, afp_c
+ LOG(log_error, logtype_dsi, "dsi_getsess: %s", strerror(errno));
+ close(ipc_fds[0]);
+ dsi->header.dsi_flags = DSIFL_REPLY;
+- dsi->header.dsi_code = DSIERR_SERVBUSY;
++ dsi->header.dsi_data.dsi_code = DSIERR_SERVBUSY;
+ dsi_send(dsi);
+- dsi->header.dsi_code = DSIERR_OK;
++ dsi->header.dsi_data.dsi_code = DSIERR_OK;
+ kill(pid, SIGKILL);
+ }
+ dsi->proto_close(dsi);
+@@ -81,7 +81,7 @@ int dsi_getsession(DSI *dsi, server_child_t *serv_children, int tickleval, afp_c
+ (dsi->header.dsi_command == DSIFUNC_OPEN)) {
+ LOG(log_info, logtype_dsi, "dsi_getsess: too many connections");
+ dsi->header.dsi_flags = DSIFL_REPLY;
+- dsi->header.dsi_code = DSIERR_TOOMANY;
++ dsi->header.dsi_data.dsi_code = DSIERR_TOOMANY;
+ dsi_send(dsi);
+ exit(EXITERR_CLNT);
+ }
+diff --git a/libatalk/dsi/dsi_getstat.c b/libatalk/dsi/dsi_getstat.c
+index dac4f76..4be9b80 100644
+--- a/libatalk/dsi/dsi_getstat.c
++++ b/libatalk/dsi/dsi_getstat.c
+@@ -20,7 +20,7 @@ void dsi_getstatus(DSI *dsi)
+ {
+ dsi->header.dsi_flags = DSIFL_REPLY;
+ /*dsi->header.dsi_command = DSIFUNC_STAT;*/
+- dsi->header.dsi_code = dsi->header.dsi_reserved = 0;
++ dsi->header.dsi_data.dsi_code = dsi->header.dsi_reserved = 0;
+
+ memcpy(dsi->commands, dsi->status, dsi->statuslen);
+ dsi->cmdlen = dsi->statuslen;
+diff --git a/libatalk/dsi/dsi_opensess.c b/libatalk/dsi/dsi_opensess.c
+index a2dcb4c..2945f9b 100644
+--- a/libatalk/dsi/dsi_opensess.c
++++ b/libatalk/dsi/dsi_opensess.c
+@@ -44,7 +44,7 @@ void dsi_opensession(DSI *dsi)
+ /* let the client know the server quantum. we don't use the
+ * max server quantum due to a bug in appleshare client 3.8.6. */
+ dsi->header.dsi_flags = DSIFL_REPLY;
+- dsi->header.dsi_code = 0;
++ dsi->header.dsi_data.dsi_code = 0;
+ /* dsi->header.dsi_command = DSIFUNC_OPEN;*/
+
+ dsi->cmdlen = 2 * (2 + sizeof(i)); /* length of data. dsi_send uses it. */
+diff --git a/libatalk/dsi/dsi_read.c b/libatalk/dsi/dsi_read.c
+index a0cbd87..31ee3bd 100644
+--- a/libatalk/dsi/dsi_read.c
++++ b/libatalk/dsi/dsi_read.c
+@@ -31,7 +31,7 @@ ssize_t dsi_readinit(DSI *dsi, void *buf, const size_t buflen, const size_t size
+ dsi->flags |= DSI_NOREPLY; /* we will handle our own replies */
+ dsi->header.dsi_flags = DSIFL_REPLY;
+ dsi->header.dsi_len = htonl(size);
+- dsi->header.dsi_code = htonl(err);
++ dsi->header.dsi_data.dsi_code = htonl(err);
+
+ dsi->in_write++;
+ if (dsi_stream_send(dsi, buf, buflen)) {
+diff --git a/libatalk/dsi/dsi_stream.c b/libatalk/dsi/dsi_stream.c
+index 05c36fc..afce54e 100644
+--- a/libatalk/dsi/dsi_stream.c
++++ b/libatalk/dsi/dsi_stream.c
+@@ -45,7 +45,7 @@ static void dsi_header_pack_reply(const DSI *dsi, char *buf)
+ buf[0] = dsi->header.dsi_flags;
+ buf[1] = dsi->header.dsi_command;
+ memcpy(buf + 2, &dsi->header.dsi_requestID, sizeof(dsi->header.dsi_requestID));
+- memcpy(buf + 4, &dsi->header.dsi_code, sizeof(dsi->header.dsi_code));
++ memcpy(buf + 4, &dsi->header.dsi_data.dsi_code, sizeof(dsi->header.dsi_data.dsi_code));
+ memcpy(buf + 8, &dsi->header.dsi_len, sizeof(dsi->header.dsi_len));
+ memcpy(buf + 12, &dsi->header.dsi_reserved, sizeof(dsi->header.dsi_reserved));
+ }
+@@ -366,7 +366,7 @@ ssize_t dsi_stream_read_file(DSI *dsi, const int fromfd, off_t offset, const siz
+ dsi->flags |= DSI_NOREPLY;
+ dsi->header.dsi_flags = DSIFL_REPLY;
+ dsi->header.dsi_len = htonl(length);
+- dsi->header.dsi_code = htonl(err);
++ dsi->header.dsi_data.dsi_code = htonl(err);
+ dsi_header_pack_reply(dsi, block);
+
+ #ifdef HAVE_SENDFILEV
+@@ -615,7 +615,7 @@ int dsi_stream_receive(DSI *dsi)
+ return 0;
+
+ memcpy(&dsi->header.dsi_requestID, block + 2, sizeof(dsi->header.dsi_requestID));
+- memcpy(&dsi->header.dsi_code, block + 4, sizeof(dsi->header.dsi_code));
++ memcpy(&dsi->header.dsi_data.dsi_code, block + 4, sizeof(dsi->header.dsi_data.dsi_code));
+ memcpy(&dsi->header.dsi_len, block + 8, sizeof(dsi->header.dsi_len));
+ memcpy(&dsi->header.dsi_reserved, block + 12, sizeof(dsi->header.dsi_reserved));
+ dsi->clientID = ntohs(dsi->header.dsi_requestID);
+diff --git a/libatalk/dsi/dsi_tcp.c b/libatalk/dsi/dsi_tcp.c
+index f73147a..731252e 100644
+--- a/libatalk/dsi/dsi_tcp.c
++++ b/libatalk/dsi/dsi_tcp.c
+@@ -209,7 +209,7 @@ static pid_t dsi_tcp_open(DSI *dsi)
+ dsi->header.dsi_command = block[1];
+ memcpy(&dsi->header.dsi_requestID, block + 2,
+ sizeof(dsi->header.dsi_requestID));
+- memcpy(&dsi->header.dsi_code, block + 4, sizeof(dsi->header.dsi_code));
++ memcpy(&dsi->header.dsi_data.dsi_code, block + 4, sizeof(dsi->header.dsi_data.dsi_code));
+ memcpy(&dsi->header.dsi_len, block + 8, sizeof(dsi->header.dsi_len));
+ memcpy(&dsi->header.dsi_reserved, block + 12,
+ sizeof(dsi->header.dsi_reserved));
+diff --git a/libatalk/dsi/dsi_write.c b/libatalk/dsi/dsi_write.c
+index 65a479e..dc35caf 100644
+--- a/libatalk/dsi/dsi_write.c
++++ b/libatalk/dsi/dsi_write.c
+@@ -32,7 +32,7 @@ size_t dsi_writeinit(DSI *dsi, void *buf, const size_t buflen _U_)
+
+ /* figure out how much data we have. do a couple checks for 0
+ * data */
+- header = ntohl(dsi->header.dsi_doff);
++ header = ntohl(dsi->header.dsi_data.dsi_doff);
+ dsi->datasize = header ? ntohl(dsi->header.dsi_len) - header : 0;
+
+ if (dsi->datasize > 0) {
+--
+1.8.1.4
+
Added: csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch 2013-05-02 10:04:33 UTC (rev 20934)
@@ -0,0 +1,36 @@
+From a03430e9e6b9f9a83902e652cad6d06d3931ce3e Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Thu, 2 May 2013 10:28:11 +0200
+Subject: [PATCH 3/3] Fix misspelled compiler variable
+
+---
+ configure | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index f34f304..3bbb206 100755
+--- a/configure
++++ b/configure
+@@ -17413,7 +17413,7 @@ fi
+
+
+ CFLAGS="$save_CFLAGS"
+-LDLFLAGS="$save_LDLFLAGS"
++LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
+
+
+@@ -21818,8 +21818,8 @@ $as_echo " CFLAGS = $ZEROCONF_CFLAGS" >&6; }
+ if test x"$netatalk_cv_ldap" = x"yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: LDAP:" >&5
+ $as_echo " LDAP:" >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: LIBS = $LDAP_LDLFLAGS $LDAP_LIBS" >&5
+-$as_echo " LIBS = $LDAP_LDLFLAGS $LDAP_LIBS" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: LIBS = $LDAP_LDFLAGS $LDAP_LIBS" >&5
++$as_echo " LIBS = $LDAP_LDFLAGS $LDAP_LIBS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: CFLAGS = $LDAP_CFLAGS" >&5
+ $as_echo " CFLAGS = $LDAP_CFLAGS" >&6; }
+ fi
+--
+1.8.1.4
+
Added: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2013-05-02 10:04:33 UTC (rev 20934)
@@ -0,0 +1,2 @@
+#!/bin/sh
+svccfg import /var/opt/csw/svc/manifest/network/netatalk.xml
Added: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove 2013-05-02 10:04:33 UTC (rev 20934)
@@ -0,0 +1,2 @@
+#!/bin/sh
+svccfg delete netatalk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list