Permalink
Browse files

[packages] gnupg: update to 1.4.12, remove obsolete patch

git-svn-id: svn://svn.openwrt.org/openwrt/packages@31827 3c298f89-4303-0410-b956-a3cf2f4a3e73
  • Loading branch information...
1 parent f4269ce commit 6a520552ed91b6454e1d26c3cfe64928f08a83ec swalker committed May 20, 2012
Showing with 3 additions and 89 deletions.
  1. +3 −3 utils/gnupg/Makefile
  2. +0 −86 utils/gnupg/patches/001-mips_gcc4.4.patch
View
6 utils/gnupg/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gnupg
-PKG_VERSION:=1.4.11
+PKG_VERSION:=1.4.12
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg \
ftp://ftp.gnupg.org/gcrypt/gnupg
-PKG_MD5SUM:=411744e1ef8ce90b87938c4203f001f1
+PKG_MD5SUM:=ce3742e5c7912559cab7894ad8ba7f6b
PKG_INSTALL:=1
View
86 utils/gnupg/patches/001-mips_gcc4.4.patch
@@ -1,86 +0,0 @@
---- a/mpi/longlong.h
-+++ b/mpi/longlong.h
-@@ -710,12 +710,13 @@ extern USItype __udiv_qrnnd ();
- ************** MIPS *****************
- ***************************************/
- #if defined (__mips__) && W_TYPE_SIZE == 32
--#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR >= 4 )
--#define umul_ppmm(w1, w0, u, v) \
-+#if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+#define umul_ppmm(w1, w0, u, v) \
- do { \
-- UDItype __ll = (UDItype)(u) * (v); \
-- w1 = __ll >> 32; \
-- w0 = __ll; \
-+ UDItype _r; \
-+ _r = (UDItype) u * v; \
-+ (w1) = _r >> 32; \
-+ (w0) = (USItype) _r; \
- } while (0)
- #elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-@@ -727,8 +728,8 @@ extern USItype __udiv_qrnnd ();
- #else
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("multu %2,%3 \n" \
-- "mflo %0 \n" \
-- "mfhi %1" \
-+ "mflo %0 \n" \
-+ "mfhi %1" \
- : "=d" ((USItype)(w0)), \
- "=d" ((USItype)(w1)) \
- : "d" ((USItype)(u)), \
-@@ -742,25 +743,34 @@ extern USItype __udiv_qrnnd ();
- ************** MIPS/64 **************
- ***************************************/
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 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
--#define umul_ppmm(w1, w0, u, v) \
-- __asm__ ("dmultu %2,%3 \n" \
-- "mflo %0 \n" \
-- "mfhi %1" \
-- : "=d" ((UDItype)(w0)), \
-- "=d" ((UDItype)(w1)) \
-- : "d" ((UDItype)(u)), \
-- "d" ((UDItype)(v)))
--#endif
--#define UMUL_TIME 20
--#define UDIV_TIME 140
-+# if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+ typedef unsigned int UTItype __attribute__ ((mode (TI)));
-+# define umul_ppmm(w1, w0, u, v) \
-+ do { \
-+ UTItype _r; \
-+ _r = (UTItype) u * v; \
-+ (w1) = _r >> 64; \
-+ (w0) = (UDItype) _r; \
-+ } while (0)
-+# elif if __GNUC__ > 2 || __GNUC_MINOR__ >= 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
-+# define umul_ppmm(w1, w0, u, v) \
-+ __asm__ ("dmultu %2,%3 \n" \
-+ "mflo %0 \n" \
-+ "mfhi %1" \
-+ : "=d" ((UDItype)(w0)), \
-+ "=d" ((UDItype)(w1)) \
-+ : "d" ((UDItype)(u)), \
-+ "d" ((UDItype)(v)))
-+# endif
-+# define UMUL_TIME 20
-+# define UDIV_TIME 140
- #endif /* __mips__ */
-
-

0 comments on commit 6a52055

Please sign in to comment.