diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-05-08 17:34:09 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-05-08 17:34:09 +0000 |
commit | 47eb80bc394537252024374cd1e0bcf9abd39f95 (patch) | |
tree | bb4c1f8985e33e7ec6fc400aca2eb17cd1d09be7 /net-fs/netatalk | |
parent | bumping in prep for new version of net-fs/coda (diff) | |
download | gentoo-2-47eb80bc394537252024374cd1e0bcf9abd39f95.tar.gz gentoo-2-47eb80bc394537252024374cd1e0bcf9abd39f95.tar.bz2 gentoo-2-47eb80bc394537252024374cd1e0bcf9abd39f95.zip |
old
Diffstat (limited to 'net-fs/netatalk')
-rw-r--r-- | net-fs/netatalk/files/netatalk-2.0.3-db43.patch | 32 | ||||
-rw-r--r-- | net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch | 28 | ||||
-rw-r--r-- | net-fs/netatalk/files/netatalk-2.0.3-setXid.patch | 14 | ||||
-rw-r--r-- | net-fs/netatalk/files/netatalk-2.0.3-xfs.patch | 22 | ||||
-rw-r--r-- | net-fs/netatalk/netatalk-2.0.3-r4.ebuild | 94 | ||||
-rw-r--r-- | net-fs/netatalk/netatalk-2.0.5.ebuild | 91 |
6 files changed, 0 insertions, 281 deletions
diff --git a/net-fs/netatalk/files/netatalk-2.0.3-db43.patch b/net-fs/netatalk/files/netatalk-2.0.3-db43.patch deleted file mode 100644 index 93d3e4b9ea3b..000000000000 --- a/net-fs/netatalk/files/netatalk-2.0.3-db43.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: netatalk-2.0.3/bin/cnid/cnid_index.c -=================================================================== ---- netatalk-2.0.3.orig/bin/cnid/cnid_index.c -+++ netatalk-2.0.3/bin/cnid/cnid_index.c -@@ -274,7 +274,11 @@ static int dbif_count(const int dbi, u_i - DB_BTREE_STAT *sp; - DB *db = db_table[dbi].db; - -+#if DB_VERSION_MAJOR > 4 || ( DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3 ) -+ ret = db->stat(db, db_txn, &sp, 0); -+#else - ret = db->stat(db, &sp, 0); -+#endif - - if (ret) { - LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -Index: netatalk-2.0.3/etc/cnid_dbd/dbif.c -=================================================================== ---- netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c -+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c -@@ -514,7 +514,11 @@ int dbif_count(const int dbi, u_int32_t - DB_BTREE_STAT *sp; - DB *db = db_table[dbi].db; - -+#if DB_VERSION_MAJOR > 4 || ( DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3 ) -+ ret = db->stat(db, db_txn, &sp, 0); -+#else - ret = db->stat(db, &sp, 0); -+#endif - - if (ret) { - LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); diff --git a/net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch b/net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch deleted file mode 100644 index f64c8cf5eb45..000000000000 --- a/net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: netatalk-2.0.3/macros/db3-check.m4 -=================================================================== ---- netatalk-2.0.3.orig/macros/db3-check.m4 -+++ netatalk-2.0.3/macros/db3-check.m4 -@@ -115,6 +115,14 @@ int main(void) { - AC_DEFUN([NETATALK_BERKELEY_LINK], - [ - atalk_cv_lib_db=no -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_4,[-ldb-4.4]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db44,[-ldb44]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_44,[-ldb-44]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_4,[-ldb-4-4]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db43,[-ldb43]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_43,[-ldb-43]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_3,[-ldb-4-3]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42]) -@@ -134,7 +142,7 @@ AC_DEFUN([AC_PATH_BDB], - trybdbdir="" - dobdbsearch=yes - bdb_search_dirs="/usr/local/include /usr/include" -- search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /" -+ search_subdirs="/db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41 /db4 /" - - dnl required BDB version - DB_MAJOR_REQ=4 diff --git a/net-fs/netatalk/files/netatalk-2.0.3-setXid.patch b/net-fs/netatalk/files/netatalk-2.0.3-setXid.patch deleted file mode 100644 index 70170c134d2c..000000000000 --- a/net-fs/netatalk/files/netatalk-2.0.3-setXid.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: netatalk-2.0.3/bin/afppasswd/Makefile.am -=================================================================== ---- netatalk-2.0.3.orig/bin/afppasswd/Makefile.am -+++ netatalk-2.0.3/bin/afppasswd/Makefile.am -@@ -12,7 +12,8 @@ afppasswd_SOURCES = afppasswd.c - afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la @SSL_LIBS@ - - CFLAGS = @CFLAGS@ @SSL_CFLAGS@ -I$(top_srcdir)/sys \ -- -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" -+ -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \ -+ @BINDNOW_FLAGS@ - - install-exec-hook: - if USE_DHX diff --git a/net-fs/netatalk/files/netatalk-2.0.3-xfs.patch b/net-fs/netatalk/files/netatalk-2.0.3-xfs.patch deleted file mode 100644 index e91ebcebd225..000000000000 --- a/net-fs/netatalk/files/netatalk-2.0.3-xfs.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: netatalk-2.0.3/configure.in -=================================================================== ---- netatalk-2.0.3.orig/configure.in -+++ netatalk-2.0.3/configure.in -@@ -694,12 +694,16 @@ fi - # AC_MSG_RESULT([enabling quotactl wrapper]) - # ) - -+AC_ARG_WITH([xfs], -+ AS_HELP_STRING([--without-xfs], [Build without XFS filesystem quota support])) -+ -+if test "x$with_xfs" != "xno"; then - # For quotas on Linux XFS filesystems - AC_CHECK_HEADERS(linux/xqm.h linux/xfs_fs.h) - AC_CHECK_HEADERS(xfs/libxfs.h xfs/xqm.h xfs/xfs_fs.h) - # For linux > 2.5.56 - AC_CHECK_HEADERS(linux/dqblk_xfs.h) -- -+fi - - dnl ----- as far as I can tell, dbtob always does the wrong thing - dnl ----- on every single version of linux I've ever played with. diff --git a/net-fs/netatalk/netatalk-2.0.3-r4.ebuild b/net-fs/netatalk/netatalk-2.0.3-r4.ebuild deleted file mode 100644 index 9a7105f9e994..000000000000 --- a/net-fs/netatalk/netatalk-2.0.3-r4.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r4.ebuild,v 1.5 2009/05/21 20:24:33 ranger Exp $ - -inherit eutils pam autotools - -DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite" -HOMEPAGE="http://netatalk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib xfs" - -RDEPEND=">=sys-libs/db-4.2.52 - cracklib? ( sys-libs/cracklib ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl ) - tcpd? ( sys-apps/tcp-wrappers ) - slp? ( net-libs/openslp ) - cups? ( net-print/cups ) - kerberos? ( virtual/krb5 ) - krb4? ( virtual/krb5 ) - >=sys-apps/coreutils-7.1" -DEPEND="${RDEPEND} - xfs? ( sys-fs/xfsprogs <sys-kernel/linux-headers-2.6.16 )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # until someone that understands their config script build - # system gets a patch pushed upstream to make - # --enable-srvloc passed to configure also add slpd to the - # use line on the initscript, we'll need to do it this way - if use slp; then - myconf="${myconf} --enable-srvloc" - sed -i -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \ - "${S}"/distrib/initscripts/rc.atalk.gentoo.tmpl - fi - - epatch "${FILESDIR}"/${P}-db43.patch - epatch "${FILESDIR}"/${P}-newerdb.patch - epatch "${FILESDIR}"/${P}-xfs.patch - eautoreconf -} - -src_compile() { - # 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_with pam) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable tcpd tcp-wrappers) \ - $(use_enable kerberos krbV-uam) \ - $(use_enable krb4 krb4-uam) \ - $(use_enable slp srvloc) \ - $(use_with ssl ssl-dir) \ - $(use_with cracklib) \ - $(use_with elibc_glibc shadow) \ - $(use_with xfs) \ - --disable-afs \ - --enable-fhs \ - --with-bdb=/usr - emake || die "netatalk emake failed" - - # Create the init script manually (it's more messy to --enable-gentoo) - cd "${S}"/distrib/initscripts - emake rc.atalk.gentoo -} - -src_install() { - emake DESTDIR="${D}" install || die "netatalk make install failed" - - dodoc CONTRIBUTORS NEWS README TODO VERSION - - newinitd "${S}"/distrib/initscripts/rc.atalk.gentoo atalk - - # 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} - - # Remove files conflicting with coreutils-7.1 - rm "${D}"/usr/bin/timeout "${D}"/usr/share/man/man1/timeout.1 || die -} diff --git a/net-fs/netatalk/netatalk-2.0.5.ebuild b/net-fs/netatalk/netatalk-2.0.5.ebuild deleted file mode 100644 index 39024ccf3b88..000000000000 --- a/net-fs/netatalk/netatalk-2.0.5.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.5.ebuild,v 1.1 2010/01/10 23:10:39 vapier Exp $ - -inherit eutils pam autotools - -DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite" -HOMEPAGE="http://netatalk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib xfs" - -RDEPEND=">=sys-libs/db-4.2.52 - cracklib? ( sys-libs/cracklib ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl ) - tcpd? ( sys-apps/tcp-wrappers ) - slp? ( net-libs/openslp ) - cups? ( net-print/cups ) - kerberos? ( virtual/krb5 ) - krb4? ( virtual/krb5 ) - >=sys-apps/coreutils-7.1 - !app-text/yudit" -DEPEND="${RDEPEND} - xfs? ( sys-fs/xfsprogs <sys-kernel/linux-headers-2.6.16 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-control-pam.patch - - # until someone that understands their config script build - # system gets a patch pushed upstream to make - # --enable-srvloc passed to configure also add slpd to the - # use line on the initscript, we'll need to do it this way - if use slp ; then - sed -i -e '/^[[:space:]]*use\>/s:$: slpd:' \ - distrib/initscripts/rc.atalk.gentoo.tmpl || die - fi -} - -src_compile() { - if ! use xfs ; then - eval $(printf '%s\n' {linux,xfs}/{dqblk_xfs,libxfs,xqm,xfs_fs}.h | \ - sed -e 's:[/.]:_:g' -e 's:^:export ac_cv_header_:' -e 's:$:=no:') - fi - - # Ignore --enable-gentoo, we install the init.d by hand and we avoid having to - # sed the Makefiles to not do rc-update. - # --enable-shadow: let build system detect shadow.h in toolchain - econf \ - $(use_with pam) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable tcpd tcp-wrappers) \ - $(use_enable kerberos krbV-uam) \ - $(use_enable krb4 krb4-uam) \ - $(use_enable slp srvloc) \ - $(use_with ssl ssl-dir) \ - $(use_with cracklib) \ - $(use_with slp srvloc) \ - $(use_with xfs) \ - --disable-afs \ - --enable-fhs \ - --with-bdb=/usr - emake || die - - # Create the init script manually (it's more messy to --enable-gentoo) - emake -C distrib/initscripts rc.atalk.gentoo || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc CONTRIBUTORS NEWS README TODO VERSION - - newinitd distrib/initscripts/rc.atalk.gentoo atalk || die - - # 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 -} |