diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-05-02 17:13:25 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-05-02 17:13:25 +0000 |
commit | e8f444edb5e4d3aa4cee0b3236094988427da483 (patch) | |
tree | 183cbaa4b8be37c7f45ebd5ff200c61dad21260a /net-fs/netatalk | |
parent | dev-util/pkgconfig -> virtual/pkgconfig (diff) | |
download | historical-e8f444edb5e4d3aa4cee0b3236094988427da483.tar.gz historical-e8f444edb5e4d3aa4cee0b3236094988427da483.tar.bz2 historical-e8f444edb5e4d3aa4cee0b3236094988427da483.zip |
net-fs/netatalk: Version Bump
Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64
Diffstat (limited to 'net-fs/netatalk')
-rw-r--r-- | net-fs/netatalk/ChangeLog | 8 | ||||
-rw-r--r-- | net-fs/netatalk/Manifest | 19 | ||||
-rw-r--r-- | net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch | 86 | ||||
-rw-r--r-- | net-fs/netatalk/metadata.xml | 24 | ||||
-rw-r--r-- | net-fs/netatalk/netatalk-2.2.2.ebuild | 153 |
5 files changed, 267 insertions, 23 deletions
diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog index e650ee45be3e..e2b0391a8362 100644 --- a/net-fs/netatalk/ChangeLog +++ b/net-fs/netatalk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-fs/netatalk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.81 2012/04/24 12:43:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.82 2012/05/02 17:13:24 jlec Exp $ + +*netatalk-2.2.2 (02 May 2012) + + 02 May 2012; Justin Lecher <jlec@gentoo.org> +netatalk-2.2.2.ebuild, + +files/netatalk-2.2.2-gentoo.patch, metadata.xml: + Version Bump 24 Apr 2012; Agostino Sarubbo <ago@gentoo.org> netatalk-2.2.1-r3.ebuild: Stable for amd64, wrt bug #411291 diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest index 1b0dbaeb9933..72f4e6f7b3b0 100644 --- a/net-fs/netatalk/Manifest +++ b/net-fs/netatalk/Manifest @@ -7,20 +7,19 @@ AUX atalkd.init 947 RMD160 390b0da96fbe2ff829485760b4a9249f0348992d SHA1 9077f80 AUX cnid_metad.init.2 408 RMD160 34897aabebe36541d3ec69f60c8bb0698bf61131 SHA1 a3e37a38ef5aeb0d9f39875ed52e3e053370c8e7 SHA256 60fca490208ac2e5331da8384b4353a869e345b6bd8d99c275f54b8d179e53b5 AUX netatalk-2.0.5-control-pam.patch 997 RMD160 a7b11647dd7827288517fa3c7696a37182ec219e SHA1 113f318c15870c6638da6a8a76033d954ca6b41a SHA256 4cf74450782f9f6395436d1d433d4d4662ea63fad48961dacec76adafdd35f47 AUX netatalk-2.2.1-gentoo.patch 3476 RMD160 fd9cde22f6c949091e329e452cb92d27a65c5973 SHA1 d3b8b989e0ec128d3d378fc41f75ad5fc703f96e SHA256 23fd2cb02789191ddc38b867f3cc76373e096a9a1150c64563534afa8922b529 +AUX netatalk-2.2.2-gentoo.patch 3562 RMD160 2aaa95c9a71a84f9111475a1ee6f3dd16ca734b5 SHA1 26f1b06f89e6c50622319dd137c71503783376f8 SHA256 74b82bcd703a381016e87c67af24243a52ebc0672101adfec3434a621cc0df10 DIST netatalk-2.0.5.tar.bz2 993882 RMD160 47247d376bf421652d9f9897c75853424215ae0a SHA1 a38f98abc123b02d26628543e393a4de04481e4f SHA256 aa11b26ad5c6cfb6043458fc849ed82b13b6d13219191a6335fce1bc76288b37 DIST netatalk-2.2.1.tar.bz2 1227602 RMD160 bc55a591fe134d3bf05ca442aa5b5246fd766b8c SHA1 e588b89eced7769f65e213bc4b1b1e4f8035c8b3 SHA256 3ab81c6335f8c33fd01ae599459a26c8cfe3b975009ce73640cae823ddc78bbf +DIST netatalk-2.2.2.tar.bz2 1239433 RMD160 cdedd5ff4b8bae7cf90f8c444c39db850fc210e7 SHA1 d43c75d04a66ad59c5b0c797ffa1e6e3e13b2105 SHA256 443031b90d9dd6270d98659d210f408437d8e71e8094d6f0b71706a5c481e3a0 EBUILD netatalk-2.0.5-r1.ebuild 2958 RMD160 160a50569cf92f9ed740c2df67bb56801514b352 SHA1 29d1695783bac4deebca891cabe4fbb5c37cad25 SHA256 118c0091d6cec839697db7e160ab02c26c142bd9cab7f34c5073795d13aabbd0 EBUILD netatalk-2.2.1-r3.ebuild 4397 RMD160 8659156c722ad22a21f25cf483f3900cc7b989ef SHA1 765eb86af7701c44bbc2d15649905a0ea7055cf5 SHA256 1f0e37ed2a941deabdffa263afcdddb3f3dd285b302d4f8b745f2ef5207597d7 -MISC ChangeLog 13776 RMD160 5e5c337fec7c4d06e038d9fa34fc2c65e26eb10d SHA1 ac177b893b6b0755a77fa95465ab75ced7f7e430 SHA256 271f980f90566ab3dc00d9b521b56615c3a71778ea8f777f89c98db02b4ca877 -MISC metadata.xml 1193 RMD160 6304fb244d9b7c84f8cb205271d39cd76870374d SHA1 f7a1f8c01d001ec1f35e2a8d760dfb21f33090b4 SHA256 fd546310c3a5e7267926e3a90cc7a6392d642c9178bf68d7f8a620deed27dc25 +EBUILD netatalk-2.2.2.ebuild 4400 RMD160 9e53ccb45f85c53cb291b3f643a1f4a4d6388985 SHA1 d468198e45559935b7138eade8c8037f81a1d728 SHA256 99b1b12f318024806f80ec741aaa9072a126d274aec8479829a1699ae87fffe6 +MISC ChangeLog 13947 RMD160 26ed1545fac13e812eed47f95317695a43e8c04b SHA1 21f1f1d5e6257d2110540a67e37170b11da340b6 SHA256 695316fffd400a6601eceee9b0399d9da1acf7765cee31913521eb5a33297e79 +MISC metadata.xml 1174 RMD160 ce4e78e2bf60ca4388e66519c5a072a76c0bdeee SHA1 c6897fcce78da2f7a4d5ce0e8136b554ad360f36 SHA256 273ebca84443f0d75b36f8058bfab412888b090d003cf6acd78a9d6ce681d92b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCgAGBQJPlp/dAAoJEOTDgjZ80txdBKAH/1WLOrABGi5mlzj9+3yZcmJP -YvSGlLUMhsQac9iBgt51qJr/PfUeEO1ldVKm042U4xPuWzwP0CKZbFdvHPbaGAEK -wz0LRZ6CyljuZtECLtxHtGyaYHs2nqfYZEwB3mCHlsgWG2hNoQirWiZSUCEYxfcF -pi0YjSjB8O9zUVsey5xQSGNZjLcj7yQIUFsSMaD8ZfJkhy5U4+C+9S0TicX57weJ -8IU7VSvBT8N4xJorkjqsLWWMD0Aah+i56RTydaMDIIe74xBzgWnSdonZV6+jjke0 -aECMhOzpliUrT1dtUgFDvjw692PKvQRdc/m95u4wqF788stKZ1dBKFWpn4asGP0= -=uP13 +iEYEAREKAAYFAk+hazoACgkQgAnW8HDreRaaVgCfQOVo1u9byyH9XF/J0f4Mozl1 +IJIAnAmKVmSfsSipWukDC5VAicKzjKqm +=Q36R -----END PGP SIGNATURE----- diff --git a/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch b/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch new file mode 100644 index 000000000000..6939c127d6c6 --- /dev/null +++ b/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch @@ -0,0 +1,86 @@ + etc/afpd/afp_avahi.c | 2 +- + etc/uams/Makefile.am | 20 ++++++++++---------- + libatalk/Makefile.am | 2 -- + libatalk/dsi/Makefile.am | 1 + + libatalk/vfs/Makefile.am | 1 + + 5 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c +index 351e001..6ed695f 100644 +--- a/etc/afpd/afp_avahi.c ++++ b/etc/afpd/afp_avahi.c +@@ -177,8 +177,8 @@ static void register_stuff(void) { + return; + + fail: +- time(NULL); + // avahi_threaded_poll_quit(ctx->threaded_poll); ++ return; + } + + /* Called when publishing of service data completes */ +diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am +index dbe304a..8570a46 100644 +--- a/etc/uams/Makefile.am ++++ b/etc/uams/Makefile.am +@@ -97,16 +97,16 @@ uams_dhx_pam_la_CFLAGS = @SSL_CFLAGS@ @PAM_CFLAGS@ + uams_dhx2_pam_la_CFLAGS = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@ + uams_gss_la_CFLAGS = @GSSAPI_CFLAGS@ + +-uams_guest_la_LDFLAGS = -module -avoid-version +-uams_randnum_la_LDFLAGS = -module -avoid-version @SSL_LIBS@ +-uams_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ +-uams_pam_la_LDFLAGS = -module -avoid-version @PAM_LIBS@ +-uams_pgp_la_LDFLAGS = -module -avoid-version @SSL_LIBS@ +-uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ +-uams_dhx_pam_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@ +-uams_dhx2_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@ +-uams_dhx2_pam_la_LDFLAGS = -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@ +-uams_gss_la_LDFLAGS = -module -avoid-version @GSSAPI_LIBS@ ++uams_guest_la_LDFLAGS = -shared -module -avoid-version ++uams_randnum_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@ ++uams_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ ++uams_pam_la_LDFLAGS = -shared -module -avoid-version @PAM_LIBS@ ++uams_pgp_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@ ++uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ ++uams_dhx_pam_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@ ++uams_dhx2_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@ ++uams_dhx2_pam_la_LDFLAGS = -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@ ++uams_gss_la_LDFLAGS = -shared -module -avoid-version @GSSAPI_LIBS@ + + # + # module compilation +diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am +index a241d94..513d5f6 100644 +--- a/libatalk/Makefile.am ++++ b/libatalk/Makefile.am +@@ -29,8 +29,6 @@ libatalk_la_DEPENDENCIES = \ + unicode/libunicode.la \ + vfs/libvfs.la + +-libatalk_la_LDFLAGS = -static +- + if USE_APPLETALK + SUBDIRS += asp atp nbp netddp + libatalk_la_LIBADD += \ +diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am +index d64cbed..5a07c94 100644 +--- a/libatalk/dsi/Makefile.am ++++ b/libatalk/dsi/Makefile.am +@@ -7,5 +7,6 @@ LIBS = @LIBS@ + noinst_LTLIBRARIES = libdsi.la + + libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c ++libdsi_la_LIBADD = $(WRAP_LIBS) + + noinst_HEADERS = dsi_private.h +diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am +index 9b8d143..1cc83ec 100644 +--- a/libatalk/vfs/Makefile.am ++++ b/libatalk/vfs/Makefile.am +@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea.c sys_ea.c ea_sys.c + + if HAVE_ACLS + libvfs_la_SOURCES += acl.c ++libvfs_la_LIBADD = $(ACL_LIBS) + endif diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml index 1ed760601ea7..ad276f9f2b14 100644 --- a/net-fs/netatalk/metadata.xml +++ b/net-fs/netatalk/metadata.xml @@ -1,33 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>net-fs</herd> - <maintainer restrict=">=net-fs/netatalk-2.2.1-r1"> - <email>flameeyes@gentoo.org</email> - <description> + <herd>net-fs</herd> + <maintainer restrict=">=net-fs/netatalk-2.2.1-r1"> + <email>flameeyes@gentoo.org</email> + <description> CC me on the bugs so I can take a look at them. I actually use this software and I know how it is supposed to work, at least partially. </description> - </maintainer> - <use> - <flag name='appletalk'> + </maintainer> + <use> + <flag name="appletalk"> Build support for Apple's AppleTalk (DDP) protocol and its utilities (atalkd, timelord, papd). </flag> - <flag name='cups'> + <flag name="cups"> Add support for <pkg>net-print/cups</pkg> printers in papd. This flag is only considered if appletalk USE flag is enabled, and is otherwise ignored. </flag> - <flag name='quota'> + <flag name="quota"> Add support for user quota on various filesystems. </flag> - <flag name='ssl'> + <flag name="ssl"> Use <pkg>dev-libs/openssl</pkg> to provide DHX User Access Modules. These are not used with most recent versions of OS X and can be kept disabled without risks. </flag> - <flag name='xfs'>Enable support for XFS Quota</flag> - </use> + <flag name="xfs">Enable support for XFS Quota</flag> + </use> </pkgmetadata> diff --git a/net-fs/netatalk/netatalk-2.2.2.ebuild b/net-fs/netatalk/netatalk-2.2.2.ebuild new file mode 100644 index 000000000000..fef148e46f42 --- /dev/null +++ b/net-fs/netatalk/netatalk-2.2.2.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.2.ebuild,v 1.1 2012/05/02 17:13:24 jlec Exp $ + +EAPI="4" + +inherit pam flag-o-matic multilib autotools + +RESTRICT="test" +DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities" +HOMEPAGE="http://netatalk.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd" + +RDEPEND=">=sys-libs/db-4.2.52 + avahi? ( net-dns/avahi[dbus] ) + cracklib? ( sys-libs/cracklib ) + pam? ( virtual/pam ) + ssl? ( dev-libs/openssl ) + tcpd? ( sys-apps/tcp-wrappers ) + slp? ( net-libs/openslp ) + kerberos? ( virtual/krb5 ) + >=sys-apps/coreutils-7.1 + !app-text/yudit + dev-libs/libgcrypt + appletalk? ( + cups? ( net-print/cups ) + ) + acl? ( + sys-apps/attr + sys-apps/acl + ) + ldap? ( + net-nds/openldap + ) + " +DEPEND="${RDEPEND}" +RDEPEND="sys-apps/openrc" + +REQUIRED_USE="ldap? ( acl )" + +DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk ) + +src_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.patch + eautoreconf +} + +src_configure() { + local myconf= + + if use appletalk; then + myconf+=" --enable-ddp --enable-timelord $(use_enable cups)" + else + myconf+=" --disable-ddp --disable-timelord --disable-cups" + fi + + if use acl; then + myconf+=" --with-acls $(use_with ldap)" + else + myconf+=" --without-acls --without-ldap" + fi + + append-flags -fno-strict-aliasing + + # Ignore --enable-gentoo, we install the init.d by hand and we avoid having + # to sed the Makefiles to not do rc-update. + econf \ + $(use_enable avahi zeroconf) \ + $(use_enable debug) \ + $(use_enable kerberos krbV-uam) \ + $(use_enable quota) \ + $(use_enable slp srvloc) \ + $(use_enable static-libs static) \ + $(use_enable tcpd tcp-wrappers) \ + $(use_with cracklib) \ + $(use_with pam) \ + $(use_with ssl ssl-dir) \ + --disable-krb4-uam \ + --disable-afs \ + --enable-fhs \ + --with-bdb=/usr \ + ${myconf} +} + +src_install() { + default + + newinitd "${FILESDIR}"/afpd.init.3 afpd + newinitd "${FILESDIR}"/cnid_metad.init.2 cnid_metad + + if use appletalk; then + newinitd "${FILESDIR}"/atalkd.init atalkd + newinitd "${FILESDIR}"/atalk_service.init.2 timelord + newinitd "${FILESDIR}"/atalk_service.init.2 papd + fi + + use avahi || sed -i -e '/need avahi-daemon/d' "${D}"/etc/init.d/afpd + use slp || sed -i -e '/need slpd/d' "${D}"/etc/init.d/afpd + + use ldap || rm "${D}"/etc/netatalk/afp_ldap.conf + + rm "${D}"/etc/netatalk/netatalk.conf + + # The pamd file isn't what we need, use pamd_mimic_system + rm -rf "${D}/etc/pam.d" + pamd_mimic_system netatalk auth account password session + + # Move /usr/include/netatalk to /usr/include/netatalk2 to avoid collisions + # with /usr/include/netatalk/at.h provided by glibc (strange, uh?) + # Packages that wants to link to netatalk should then probably change the + # includepath then, but right now, nothing uses netatalk. + # On a side note, it also solves collisions with freebsd-lib and other libcs + mv "${D}"/usr/include/netatalk{,2} || die + sed -i \ + -e 's/include <netatalk/include <netatalk2/g' \ + "${D}"usr/include/{netatalk2,atalk}/* || die + + # These are not used at all, as the uams are loaded with their .so + # extension. + rm "${D}"/usr/$(get_libdir)/netatalk/*.la + + use static-libs || rm "${D}"/usr/$(get_libdir)/*.la +} + +pkg_postinst() { + elog "Starting from version 2.2.1-r1 the netatalk init script has been split" + elog "into different services depending on what you need to start." + elog "This was done to make sure that all services are started and reported" + elog "properly." + elog "" + elog "The new services are:" + elog " cnid_metad" + elog " afpd" + if use appletalk; then + elog " atalkd" + elog " timelord" + elog " papd" + fi + elog "" + elog "Dependencies should be resolved automatically depending on settings" + elog "but please report issues with this on https://bugs.gentoo.org/ if" + elog "you find any." + elog "" + elog "The old configuration file /etc/netatalk/netatalk.conf is no longer" + elog "installed, and will be ignored. The new configuration is supposed" + elog "to be done through individual /etc/conf.d files, for everything that" + elog "cannot be set already through their respective configuration files." +} |