From ed68667b918805c7fbef54e9a4fe0a75bf06f22f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 5 Mar 2010 16:54:43 +0100 Subject: netatalk: Upgrade from 2.0.3 to 2.0.5 Addresses CVE-2008-5718. netatalk-2.0.3-db43.patch: Done differently. netatalk-2.0.3-xfs.patch: Drop as the config switch was not used netatalk-2.0.3-setXid.patch: Was not used. --- .../netatalk-2.0.3/netatalk-2.0.3-db43.patch | 32 --------------- .../netatalk-2.0.3/netatalk-2.0.3-newerdb.patch | 28 ------------- .../netatalk-2.0.3/netatalk-2.0.3-setXid.patch | 14 ------- .../netatalk-2.0.3/netatalk-2.0.3-xfs.patch | 22 ----------- recipes/netatalk/netatalk-2.0.5/netatalk-dbd.patch | 35 ++++++++++++++++ recipes/netatalk/netatalk_2.0.3.bb | 46 ---------------------- recipes/netatalk/netatalk_2.0.5.bb | 46 ++++++++++++++++++++++ 7 files changed, 81 insertions(+), 142 deletions(-) delete mode 100644 recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-db43.patch delete mode 100644 recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-newerdb.patch delete mode 100644 recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-setXid.patch delete mode 100644 recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-xfs.patch create mode 100644 recipes/netatalk/netatalk-2.0.5/netatalk-dbd.patch delete mode 100644 recipes/netatalk/netatalk_2.0.3.bb create mode 100644 recipes/netatalk/netatalk_2.0.5.bb (limited to 'recipes/netatalk') diff --git a/recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-db43.patch b/recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-db43.patch deleted file mode 100644 index 93d3e4b9ea..0000000000 --- a/recipes/netatalk/netatalk-2.0.3/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/recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-newerdb.patch b/recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-newerdb.patch deleted file mode 100644 index f64c8cf5eb..0000000000 --- a/recipes/netatalk/netatalk-2.0.3/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/recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-setXid.patch b/recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-setXid.patch deleted file mode 100644 index 70170c134d..0000000000 --- a/recipes/netatalk/netatalk-2.0.3/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/recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-xfs.patch b/recipes/netatalk/netatalk-2.0.3/netatalk-2.0.3-xfs.patch deleted file mode 100644 index e91ebcebd2..0000000000 --- a/recipes/netatalk/netatalk-2.0.3/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/recipes/netatalk/netatalk-2.0.5/netatalk-dbd.patch b/recipes/netatalk/netatalk-2.0.5/netatalk-dbd.patch new file mode 100644 index 0000000000..6d6d03e36b --- /dev/null +++ b/recipes/netatalk/netatalk-2.0.5/netatalk-dbd.patch @@ -0,0 +1,35 @@ +Move back to AC_TRY_LINK... + +Index: netatalk-2.0.5/macros/db3-check.m4 +=================================================================== +--- netatalk-2.0.5.orig/macros/db3-check.m4 2010-03-05 17:57:14.000000000 +0100 ++++ netatalk-2.0.5/macros/db3-check.m4 2010-03-05 18:33:08.000000000 +0100 +@@ -33,25 +33,13 @@ + for lib in $atalk_cv_bdb_try_libs ; do + LIBS="$lib $savedlibs" + AC_MSG_CHECKING([Berkeley DB library ($lib)]) +- AC_TRY_RUN([ ++ AC_TRY_LINK([ + #include + #include +- int main(void) { +- int major, minor, patch; ++ ], [ ++ int minor, major, patch; + char *version_str; + version_str = db_version(&major, &minor, &patch); +- if (major < DB_MAJOR_REQ || minor < DB_MINOR_REQ || patch < DB_PATCH_REQ) { +- printf("linking wrong library version (%d.%d.%d), ",major, minor, patch); +- return (2); +- } +- if ( major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR || patch != DB_VERSION_PATCH) { +- printf("header/library version mismatch (%d.%d.%d/%d.%d.%d), ", +- DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH, major, minor, patch); +- return (3); +- } +- printf("%d.%d.%d ... ",major, minor, patch); +- return (0); +- } + ],[ + + AC_MSG_RESULT(yes) diff --git a/recipes/netatalk/netatalk_2.0.3.bb b/recipes/netatalk/netatalk_2.0.3.bb deleted file mode 100644 index 0ed580d6f1..0000000000 --- a/recipes/netatalk/netatalk_2.0.3.bb +++ /dev/null @@ -1,46 +0,0 @@ -SECTION = "net" -PR = "r1" -LICENSE = "GPL" - -DEPENDS = "cups db openssl" - -SRC_URI = "http://ovh.dl.sourceforge.net/sourceforge/netatalk/netatalk-${PV}.tar.gz \ - file://netatalk-2.0.3-db43.patch;patch=1 \ - file://netatalk-2.0.3-newerdb.patch;patch=1 \ - file://netatalk-2.0.3-xfs.patch;patch=1 \ - file://netatalk.conf \ - file://init" - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "atalk" -INITSCRIPT_PARAMS = "defaults 65" - -PACKAGES = "${PN}-atalkd ${PN}-pap ${PN}-timelord ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev" - -RRECOMMENDS_${PN}-atalkd = "kernel-module-appletalk" - -FILES_${PN}-atalkd += "${sysconfdir}/netatalk/atalkd.conf \ - /usr/sbin/atalkd" -FILES_${PN}-pap += "/usr/bin/pap \ - ${sysconfdir}/netatalk/papd.conf \ - /usr/sbin/papd \ - /usr/bin/papstatus" -FILES_${PN}-timelord += "/usr/sbin/timelord" -FILES_${PN}-dbg += "${sysconfdir}/netatalk/uams/.debug" - -EXTRA_OECONF += "ac_cv_path_KRB5_CONFIG=no \ - ac_cv_header_rpcsvc_rquota_h=no \ - --with-bdb=${STAGING_DIR_TARGET}${layout_exec_prefix} \ - --enable-timelord \ - --without-shadow \ - --enable-static=no \ - --disable-srvloc \ - --without-pam \ - --with-ssl-dir=${STAGING_DIR_TARGET}${layout_exec_prefix}" -LDFLAGS += "-lpthread -L${STAGING_LIBDIR}" - -do_install_append() { - install -D -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/atalk - install -D -m 0644 ${WORKDIR}/netatalk.conf ${D}${sysconfdir}/netatalk/netatalk.conf -} diff --git a/recipes/netatalk/netatalk_2.0.5.bb b/recipes/netatalk/netatalk_2.0.5.bb new file mode 100644 index 0000000000..8971f07bed --- /dev/null +++ b/recipes/netatalk/netatalk_2.0.5.bb @@ -0,0 +1,46 @@ +SECTION = "net" +PR = "r1" +LICENSE = "GPL" + +DEPENDS = "cups db openssl" + +SRC_URI = "http://ovh.dl.sourceforge.net/sourceforge/netatalk/netatalk-${PV}.tar.gz;name=src \ + file://netatalk-dbd.patch;patch=1 \ + file://netatalk.conf \ + file://init" +SRC_URI[src.md5sum] = "f35cd7a4ce26c780de380cd2bcae5ce6" +SRC_URI[src.sha256sum] = "7e02b0d2849ec83459c65d240809ff95ee4a857a3ba38af2cafbbe3717d0c672" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "atalk" +INITSCRIPT_PARAMS = "defaults 65" + +PACKAGES = "${PN}-atalkd ${PN}-pap ${PN}-timelord ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev" + +RRECOMMENDS_${PN}-atalkd = "kernel-module-appletalk" + +FILES_${PN}-atalkd += "${sysconfdir}/netatalk/atalkd.conf \ + /usr/sbin/atalkd" +FILES_${PN}-pap += "/usr/bin/pap \ + ${sysconfdir}/netatalk/papd.conf \ + /usr/sbin/papd \ + /usr/bin/papstatus" +FILES_${PN}-timelord += "/usr/sbin/timelord" +FILES_${PN}-dbg += "${sysconfdir}/netatalk/uams/.debug" + +EXTRA_OECONF += "ac_cv_path_KRB5_CONFIG=no \ + ac_cv_header_rpcsvc_rquota_h=no \ + --with-bdb=${STAGING_DIR_TARGET}${layout_exec_prefix} \ + --enable-timelord \ + --without-shadow \ + --enable-static=no \ + --disable-srvloc \ + --without-pam \ + --with-ssl-dir=${STAGING_DIR_TARGET}${layout_exec_prefix}" +LDFLAGS += "-lpthread -L${STAGING_LIBDIR}" + +do_install_append() { + install -D -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/atalk + install -D -m 0644 ${WORKDIR}/netatalk.conf ${D}${sysconfdir}/netatalk/netatalk.conf +} -- cgit v1.2.3