In order for Mac OS X 10.7 to authenticate with netatalk, netatalk needs
DHX2 support (10.6 and earlier worked without DHX2, 10.7 requires it).
Netatalk needs libgcrypt compiled with CAST5 cipher, and in turn libgcrypt
needs libgpg-error >= 1.8 for CAST5. The following patches update all that is
required to enable Netatalk with Mac OS X 10.7.
- Updates netatalk to 2.1.3 => 2.1.5
- Updates libgpg-error 1.7 = > 1.9
- Updates libgcrypt 1.4.5 => 1.5.0
- Refreshes libgcrypt patches, removes obsolete patch, updates the docs/test
makefile patch.
- Enables parallel build on libgpg-error also.
Regards,
Joe
Signed-off-by: Your Joe Roback <[email protected]>
---
Index: feeds/packages/libs/libgpg-error/Makefile
===================================================================
--- feeds/packages/libs/libgpg-error/Makefile (revision 27590)
+++ feeds/packages/libs/libgpg-error/Makefile (working copy)
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libgpg-error
-PKG_VERSION:=1.7
+PKG_VERSION:=1.9
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -16,9 +16,10 @@
http://mirrors.rootmode.com/ftp.gnupg.org/libgpg-error/ \
http://gulus.usherbrooke.ca/pub/appl/GnuPG/libgpg-error/ \
http://gnupg.unixmexico.org/ftp/libgpg-error/
-PKG_MD5SUM:=62c0d09d1e76c5b6da8fff92314c4665
+PKG_MD5SUM:=521b98aa9395e7eaf0ef2236233a0796
PKG_FIXUP:=libtool
+PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
Index: feeds/packages/libs/libgcrypt/patches/001-no_docs_tests.patch
===================================================================
--- feeds/packages/libs/libgcrypt/patches/001-no_docs_tests.patch (revision
0)
+++ feeds/packages/libs/libgcrypt/patches/001-no_docs_tests.patch (revision
0)
@@ -0,0 +1,30 @@
+Index: libgcrypt-1.5.0/Makefile.am
+===================================================================
+--- libgcrypt-1.5.0.orig/Makefile.am 2011-02-04 12:08:18.000000000 -0700
++++ libgcrypt-1.5.0/Makefile.am 2011-07-11 12:08:03.000000000 -0600
+@@ -22,8 +22,8 @@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
+
--enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
+
+-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
+-SUBDIRS = compat mpi cipher random src doc tests
++DIST_SUBDIRS = m4 compat mpi cipher random src
++SUBDIRS = compat mpi cipher random src
+ EXTRA_DIST = autogen.sh README.SVN
+ DISTCLEANFILES =
+
+Index: libgcrypt-1.5.0/Makefile.in
+===================================================================
+--- libgcrypt-1.5.0.orig/Makefile.in 2011-06-29 02:58:01.000000000 -0600
++++ libgcrypt-1.5.0/Makefile.in 2011-07-11 12:08:30.000000000 -0600
+@@ -281,8 +281,8 @@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
+
--enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
+
+-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
+-SUBDIRS = compat mpi cipher random src doc tests
++DIST_SUBDIRS = m4 compat mpi cipher random src
++SUBDIRS = compat mpi cipher random src
+ EXTRA_DIST = autogen.sh README.SVN
+ DISTCLEANFILES =
+ all: config.h
Index: feeds/packages/libs/libgcrypt/patches/002-no_docs_tests.patch
===================================================================
--- feeds/packages/libs/libgcrypt/patches/002-no_docs_tests.patch (revision
27590)
+++ feeds/packages/libs/libgcrypt/patches/002-no_docs_tests.patch (working
copy)
@@ -1,26 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -22,8 +22,8 @@ AUTOMAKE_OPTIONS = dist-bzip2
- DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
-
--enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
-
--DIST_SUBDIRS = m4 mpi cipher random src doc tests
--SUBDIRS = mpi cipher random src doc tests
-+DIST_SUBDIRS = m4 mpi cipher random src
-+SUBDIRS = mpi cipher random src
- EXTRA_DIST = autogen.sh README.SVN
- DISTCLEANFILES =
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -239,8 +239,8 @@ AUTOMAKE_OPTIONS = dist-bzip2
- DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
-
--enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
-
--DIST_SUBDIRS = m4 mpi cipher random src doc tests
--SUBDIRS = mpi cipher random src doc tests
-+DIST_SUBDIRS = m4 mpi cipher random src
-+SUBDIRS = mpi cipher random src
- EXTRA_DIST = autogen.sh README.SVN
- DISTCLEANFILES =
- all: config.h
Index: feeds/packages/libs/libgcrypt/patches/001-mips-h-constraint.patch
===================================================================
---
feeds/packages/libs/libgcrypt/patches/001-mips-h-constraint.patch (revision
27590)
+++
feeds/packages/libs/libgcrypt/patches/001-mips-h-constraint.patch (working
copy)
@@ -1,70 +0,0 @@
-The MIPS port for GCC-4.4 no longer recognizes the h asm constraint.
-Patch from: https://forum.openwrt.org/viewtopic.php?id=20520
-
---- a/mpi/longlong.h
-+++ b/mpi/longlong.h
-@@ -710,18 +710,35 @@ extern USItype __udiv_qrnnd ();
- #endif /* __m88110__ */
- #endif /* __m88000__ */
-
-+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
-+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
-+#define __GNUC_PREREQ(maj, min) \
-+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+#else
-+#define __GNUC_PREREQ(maj, min) 0
-+#endif
-+
- /***************************************
- ************** MIPS *****************
- ***************************************/
- #if defined (__mips__) && W_TYPE_SIZE == 32
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if __GNUC_PREREQ (4,4)
-+#define umul_ppmm(w1, w0, u, v) \
-+ do { \
-+ UDItype __ll = (UDItype)(u) * (v); \
-+ w1 = __ll >> 32; \
-+ w0 = __ll; \
-+ } while (0)
-+#endif
-+#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("multu %2,%3" \
- : "=l" ((USItype)(w0)), \
- "=h" ((USItype)(w1)) \
- : "d" ((USItype)(u)), \
- "d" ((USItype)(v)))
--#else
-+#endif
-+#if !defined (umul_ppmm)
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("multu %2,%3 \n" \
- "mflo %0 \n" \
-@@ -739,14 +756,24 @@ extern USItype __udiv_qrnnd ();
- ************** MIPS/64 **************
- ***************************************/
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if __GNUC_PREREQ (4,4)
-+#define umul_ppmm(w1, w0, u, v) \
-+ do { \
-+ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \
-+ __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \
-+ w1 = __ll >> 64; \
-+ w0 = __ll; \
-+ } while (0)
-+#endif
-+#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("dmultu %2,%3" \
- : "=l" ((UDItype)(w0)), \
- "=h" ((UDItype)(w1)) \
- : "d" ((UDItype)(u)), \
- "d" ((UDItype)(v)))
--#else
-+#endif
-+#if !defined (umul_ppmm)
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("dmultu %2,%3 \n" \
- "mflo %0 \n" \
Index: feeds/packages/libs/libgcrypt/Makefile
===================================================================
--- feeds/packages/libs/libgcrypt/Makefile (revision 27590)
+++ feeds/packages/libs/libgcrypt/Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libgcrypt
-PKG_VERSION:=1.4.5
+PKG_VERSION:=1.5.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-PKG_MD5SUM:=cc2017ad09b4543f8b3b5e9a53cfd89d
+PKG_MD5SUM:=693f9c64d50c908bc4d6e01da3ff76d8
PKG_FIXUP:=libtool no-autoreconf
PKG_INSTALL:=1
@@ -32,11 +32,11 @@
define Package/libgcrypt/description
This is a general purpose cryptographic library based on the code from
GnuPG. It provides functions for all cryptograhic building blocks:
- symmetric ciphers (AES, DES, Arcfour), hash algorithms (MD5, SHA-1,
+ symmetric ciphers (AES, DES, Arcfour, CAST5), hash algorithms (MD5, SHA-1,
RIPE-MD160, SHA-224/256, SHA-384/512), MACs (HMAC for all hash
algorithms), public key algorithms (RSA, DSA), large integer functions,
random numbers and a lot of supporting functions. Some algorithms have
- been disabled to reduce size (Blowfish, CAST5, Twofish, Serpent,
+ been disabled to reduce size (Blowfish, Twofish, Serpent,
RC2, SEED, Camellia, CRC, MD4, TIGER-192, Whirlpool, ElGamal, ECC).
endef
@@ -46,7 +46,7 @@
--disable-asm \
--with-gpg-error-prefix="$(STAGING_DIR)/usr" \
--enable-digests="md5 rmd160 sha1 sha256 sha512" \
- --enable-ciphers="arcfour des aes" \
+ --enable-ciphers="arcfour des aes cast5" \
--enable-pubkey-ciphers="rsa dsa" \
TARGET_CFLAGS += $(FPIC)
Index: feeds/packages/net/netatalk/Makefile
===================================================================
--- feeds/packages/net/netatalk/Makefile (revision 27590)
+++ feeds/packages/net/netatalk/Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=netatalk
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.1.5
PKG_RELEASE:=1
-PKG_SOURCE:=netatalk-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=netatalk-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/netatalk/
PKG_BUILD_PARALLEL:=1
-PKG_MD5SUM:=785e287f5b5e5c9cce9397f9bce02a22
+PKG_MD5SUM:=2495f832643cef131bc3032274fbf926
include $(INCLUDE_DIR)/package.mk
Index: feeds/packages/libs/libgpg-error/Makefile
===================================================================
--- feeds/packages/libs/libgpg-error/Makefile (revision 27590)
+++ feeds/packages/libs/libgpg-error/Makefile (working copy)
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libgpg-error
-PKG_VERSION:=1.7
+PKG_VERSION:=1.9
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -16,9 +16,10 @@
http://mirrors.rootmode.com/ftp.gnupg.org/libgpg-error/ \
http://gulus.usherbrooke.ca/pub/appl/GnuPG/libgpg-error/ \
http://gnupg.unixmexico.org/ftp/libgpg-error/
-PKG_MD5SUM:=62c0d09d1e76c5b6da8fff92314c4665
+PKG_MD5SUM:=521b98aa9395e7eaf0ef2236233a0796
PKG_FIXUP:=libtool
+PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
Index: feeds/packages/libs/libgcrypt/patches/001-no_docs_tests.patch
===================================================================
--- feeds/packages/libs/libgcrypt/patches/001-no_docs_tests.patch (revision 0)
+++ feeds/packages/libs/libgcrypt/patches/001-no_docs_tests.patch (revision 0)
@@ -0,0 +1,30 @@
+Index: libgcrypt-1.5.0/Makefile.am
+===================================================================
+--- libgcrypt-1.5.0.orig/Makefile.am 2011-02-04 12:08:18.000000000 -0700
++++ libgcrypt-1.5.0/Makefile.am 2011-07-11 12:08:03.000000000 -0600
+@@ -22,8 +22,8 @@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
+ --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
+
+-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
+-SUBDIRS = compat mpi cipher random src doc tests
++DIST_SUBDIRS = m4 compat mpi cipher random src
++SUBDIRS = compat mpi cipher random src
+ EXTRA_DIST = autogen.sh README.SVN
+ DISTCLEANFILES =
+
+Index: libgcrypt-1.5.0/Makefile.in
+===================================================================
+--- libgcrypt-1.5.0.orig/Makefile.in 2011-06-29 02:58:01.000000000 -0600
++++ libgcrypt-1.5.0/Makefile.in 2011-07-11 12:08:30.000000000 -0600
+@@ -281,8 +281,8 @@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
+ --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
+
+-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
+-SUBDIRS = compat mpi cipher random src doc tests
++DIST_SUBDIRS = m4 compat mpi cipher random src
++SUBDIRS = compat mpi cipher random src
+ EXTRA_DIST = autogen.sh README.SVN
+ DISTCLEANFILES =
+ all: config.h
Index: feeds/packages/libs/libgcrypt/patches/002-no_docs_tests.patch
===================================================================
--- feeds/packages/libs/libgcrypt/patches/002-no_docs_tests.patch (revision 27590)
+++ feeds/packages/libs/libgcrypt/patches/002-no_docs_tests.patch (working copy)
@@ -1,26 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -22,8 +22,8 @@ AUTOMAKE_OPTIONS = dist-bzip2
- DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
- --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
-
--DIST_SUBDIRS = m4 mpi cipher random src doc tests
--SUBDIRS = mpi cipher random src doc tests
-+DIST_SUBDIRS = m4 mpi cipher random src
-+SUBDIRS = mpi cipher random src
- EXTRA_DIST = autogen.sh README.SVN
- DISTCLEANFILES =
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -239,8 +239,8 @@ AUTOMAKE_OPTIONS = dist-bzip2
- DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
- --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
-
--DIST_SUBDIRS = m4 mpi cipher random src doc tests
--SUBDIRS = mpi cipher random src doc tests
-+DIST_SUBDIRS = m4 mpi cipher random src
-+SUBDIRS = mpi cipher random src
- EXTRA_DIST = autogen.sh README.SVN
- DISTCLEANFILES =
- all: config.h
Index: feeds/packages/libs/libgcrypt/patches/001-mips-h-constraint.patch
===================================================================
--- feeds/packages/libs/libgcrypt/patches/001-mips-h-constraint.patch (revision 27590)
+++ feeds/packages/libs/libgcrypt/patches/001-mips-h-constraint.patch (working copy)
@@ -1,70 +0,0 @@
-The MIPS port for GCC-4.4 no longer recognizes the h asm constraint.
-Patch from: https://forum.openwrt.org/viewtopic.php?id=20520
-
---- a/mpi/longlong.h
-+++ b/mpi/longlong.h
-@@ -710,18 +710,35 @@ extern USItype __udiv_qrnnd ();
- #endif /* __m88110__ */
- #endif /* __m88000__ */
-
-+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
-+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
-+#define __GNUC_PREREQ(maj, min) \
-+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+#else
-+#define __GNUC_PREREQ(maj, min) 0
-+#endif
-+
- /***************************************
- ************** MIPS *****************
- ***************************************/
- #if defined (__mips__) && W_TYPE_SIZE == 32
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if __GNUC_PREREQ (4,4)
-+#define umul_ppmm(w1, w0, u, v) \
-+ do { \
-+ UDItype __ll = (UDItype)(u) * (v); \
-+ w1 = __ll >> 32; \
-+ w0 = __ll; \
-+ } while (0)
-+#endif
-+#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("multu %2,%3" \
- : "=l" ((USItype)(w0)), \
- "=h" ((USItype)(w1)) \
- : "d" ((USItype)(u)), \
- "d" ((USItype)(v)))
--#else
-+#endif
-+#if !defined (umul_ppmm)
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("multu %2,%3 \n" \
- "mflo %0 \n" \
-@@ -739,14 +756,24 @@ extern USItype __udiv_qrnnd ();
- ************** MIPS/64 **************
- ***************************************/
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if __GNUC_PREREQ (4,4)
-+#define umul_ppmm(w1, w0, u, v) \
-+ do { \
-+ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \
-+ __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \
-+ w1 = __ll >> 64; \
-+ w0 = __ll; \
-+ } while (0)
-+#endif
-+#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("dmultu %2,%3" \
- : "=l" ((UDItype)(w0)), \
- "=h" ((UDItype)(w1)) \
- : "d" ((UDItype)(u)), \
- "d" ((UDItype)(v)))
--#else
-+#endif
-+#if !defined (umul_ppmm)
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("dmultu %2,%3 \n" \
- "mflo %0 \n" \
Index: feeds/packages/libs/libgcrypt/Makefile
===================================================================
--- feeds/packages/libs/libgcrypt/Makefile (revision 27590)
+++ feeds/packages/libs/libgcrypt/Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libgcrypt
-PKG_VERSION:=1.4.5
+PKG_VERSION:=1.5.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-PKG_MD5SUM:=cc2017ad09b4543f8b3b5e9a53cfd89d
+PKG_MD5SUM:=693f9c64d50c908bc4d6e01da3ff76d8
PKG_FIXUP:=libtool no-autoreconf
PKG_INSTALL:=1
@@ -32,11 +32,11 @@
define Package/libgcrypt/description
This is a general purpose cryptographic library based on the code from
GnuPG. It provides functions for all cryptograhic building blocks:
- symmetric ciphers (AES, DES, Arcfour), hash algorithms (MD5, SHA-1,
+ symmetric ciphers (AES, DES, Arcfour, CAST5), hash algorithms (MD5, SHA-1,
RIPE-MD160, SHA-224/256, SHA-384/512), MACs (HMAC for all hash
algorithms), public key algorithms (RSA, DSA), large integer functions,
random numbers and a lot of supporting functions. Some algorithms have
- been disabled to reduce size (Blowfish, CAST5, Twofish, Serpent,
+ been disabled to reduce size (Blowfish, Twofish, Serpent,
RC2, SEED, Camellia, CRC, MD4, TIGER-192, Whirlpool, ElGamal, ECC).
endef
@@ -46,7 +46,7 @@
--disable-asm \
--with-gpg-error-prefix="$(STAGING_DIR)/usr" \
--enable-digests="md5 rmd160 sha1 sha256 sha512" \
- --enable-ciphers="arcfour des aes" \
+ --enable-ciphers="arcfour des aes cast5" \
--enable-pubkey-ciphers="rsa dsa" \
TARGET_CFLAGS += $(FPIC)
Index: feeds/packages/net/netatalk/Makefile
===================================================================
--- feeds/packages/net/netatalk/Makefile (revision 27590)
+++ feeds/packages/net/netatalk/Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=netatalk
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.1.5
PKG_RELEASE:=1
-PKG_SOURCE:=netatalk-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=netatalk-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/netatalk/
PKG_BUILD_PARALLEL:=1
-PKG_MD5SUM:=785e287f5b5e5c9cce9397f9bce02a22
+PKG_MD5SUM:=2495f832643cef131bc3032274fbf926
include $(INCLUDE_DIR)/package.mk
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
