* [ptxdist] [PATCH] gnupg: update to current upstream version
@ 2012-12-22 22:37 Jan Luebbe
0 siblings, 0 replies; only message in thread
From: Jan Luebbe @ 2012-12-22 22:37 UTC (permalink / raw)
To: ptxdist; +Cc: Jan Luebbe
From: Jan Luebbe <jlu@pengutronix.de>
The old versions did not compile with GCC 4.7, the new ones work fine.
The libgpg-error patch was updated to apply agains the new version.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
patches/libgcrypt-1.4.5/libgcrypt-config.in.diff | 40 -----------------
patches/libgcrypt-1.4.5/series | 1 -
...nable-SYSROOT-support-in-libgcrypt-config.patch | 40 +++++++++++++++++
patches/libgcrypt-1.5.0/series | 4 ++
...nable-SYSROOT-support-in-gpg-error-config.patch | 45 ++++++++++++++++++++
patches/libgpg-error-1.10/series | 4 ++
patches/libgpg-error-1.7/gpg-error-config.in.diff | 36 ----------------
patches/libgpg-error-1.7/series | 1 -
rules/gnupg.make | 4 +-
rules/libassuan.make | 4 +-
rules/libgcrypt.make | 4 +-
rules/libgpg-error.make | 4 +-
rules/libksba.make | 4 +-
13 files changed, 103 insertions(+), 88 deletions(-)
delete mode 100644 patches/libgcrypt-1.4.5/libgcrypt-config.in.diff
delete mode 100644 patches/libgcrypt-1.4.5/series
create mode 100644 patches/libgcrypt-1.5.0/0001-Enable-SYSROOT-support-in-libgcrypt-config.patch
create mode 100644 patches/libgcrypt-1.5.0/series
create mode 100644 patches/libgpg-error-1.10/0001-Enable-SYSROOT-support-in-gpg-error-config.patch
create mode 100644 patches/libgpg-error-1.10/series
delete mode 100644 patches/libgpg-error-1.7/gpg-error-config.in.diff
delete mode 100644 patches/libgpg-error-1.7/series
diff --git a/patches/libgcrypt-1.4.5/libgcrypt-config.in.diff b/patches/libgcrypt-1.4.5/libgcrypt-config.in.diff
deleted file mode 100644
index e0542ef..0000000
--- a/patches/libgcrypt-1.4.5/libgcrypt-config.in.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Erwin Rol <erwin@erwinrol.com>
-Subject: Enable SYSROOT support in libgcrypt-config
-
-Enable SYSROOT support in libgcrypt-config script to prevent pulling
-in /usr/lib and /usr/include
-
-Signed-off-by: Erwin Rol <erwin@erwinrol.com>
-[mkl: some cleanups in libgcrypt-config]
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
- src/libgcrypt-config.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: libgcrypt-1.4.5/src/libgcrypt-config.in
-===================================================================
---- libgcrypt-1.4.5.orig/src/libgcrypt-config.in
-+++ libgcrypt-1.4.5/src/libgcrypt-config.in
-@@ -126,8 +126,8 @@ if test "$echo_cflags" = "yes"; then
- cflags_final="$cflags"
-
- # Set up `includes'.
-- if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
-- includes="-I$includedir"
-+ if test "x${SYSROOT}$includedir" != "x/usr/include" -a "x${SYSROOT}$includedir" != "x/include"; then
-+ includes="-I${SYSROOT}$includedir"
- fi
- # Set up `cflags_final'.
- cflags_final="$cflags_final $gpg_error_cflags"
-@@ -146,8 +146,8 @@ if test "$echo_libs" = "yes"; then
- libs_final="$libs"
-
- # Set up `libdirs'.
-- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
-- libdirs="-L$libdir"
-+ if test "x${SYSROOT}$libdir" != "x/usr/lib" -a "x${SYSROOT}$libdir" != "x/lib"; then
-+ libdirs="-L${SYSROOT}$libdir"
- fi
-
- # Set up `libs_final'.
diff --git a/patches/libgcrypt-1.4.5/series b/patches/libgcrypt-1.4.5/series
deleted file mode 100644
index 0522c7b..0000000
--- a/patches/libgcrypt-1.4.5/series
+++ /dev/null
@@ -1 +0,0 @@
-libgcrypt-config.in.diff
diff --git a/patches/libgcrypt-1.5.0/0001-Enable-SYSROOT-support-in-libgcrypt-config.patch b/patches/libgcrypt-1.5.0/0001-Enable-SYSROOT-support-in-libgcrypt-config.patch
new file mode 100644
index 0000000..976aa24
--- /dev/null
+++ b/patches/libgcrypt-1.5.0/0001-Enable-SYSROOT-support-in-libgcrypt-config.patch
@@ -0,0 +1,40 @@
+From: Erwin Rol <erwin@erwinrol.com>
+Date: Sat, 22 Dec 2012 19:57:28 +0100
+Subject: [PATCH] Enable SYSROOT support in libgcrypt-config
+
+Enable SYSROOT support in libgcrypt-config script to prevent pulling
+in /usr/lib and /usr/include
+
+Signed-off-by: Erwin Rol <erwin@erwinrol.com>
+[mkl: some cleanups in libgcrypt-config]
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ src/libgcrypt-config.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in
+index c052638..de89117 100644
+--- a/src/libgcrypt-config.in
++++ b/src/libgcrypt-config.in
+@@ -134,8 +134,8 @@ if test "$echo_cflags" = "yes"; then
+ cflags_final="$cflags"
+
+ # Set up `includes'.
+- if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
+- includes="-I$includedir"
++ if test "x${SYSROOT}$includedir" != "x/usr/include" -a "x${SYSROOT}$includedir" != "x/include"; then
++ includes="-I${SYSROOT}$includedir"
+ fi
+ # Set up `cflags_final'.
+ cflags_final="$cflags_final $gpg_error_cflags"
+@@ -154,8 +154,8 @@ if test "$echo_libs" = "yes"; then
+ libs_final="$libs"
+
+ # Set up `libdirs'.
+- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+- libdirs="-L$libdir"
++ if test "x${SYSROOT}$libdir" != "x/usr/lib" -a "x${SYSROOT}$libdir" != "x/lib"; then
++ libdirs="-L${SYSROOT}$libdir"
+ fi
+
+ # Set up `libs_final'.
diff --git a/patches/libgcrypt-1.5.0/series b/patches/libgcrypt-1.5.0/series
new file mode 100644
index 0000000..639f08c
--- /dev/null
+++ b/patches/libgcrypt-1.5.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Enable-SYSROOT-support-in-libgcrypt-config.patch
+# 0bce0a2be76c6f41a549c31add15119b - git-ptx-patches magic
diff --git a/patches/libgpg-error-1.10/0001-Enable-SYSROOT-support-in-gpg-error-config.patch b/patches/libgpg-error-1.10/0001-Enable-SYSROOT-support-in-gpg-error-config.patch
new file mode 100644
index 0000000..d43ad5d
--- /dev/null
+++ b/patches/libgpg-error-1.10/0001-Enable-SYSROOT-support-in-gpg-error-config.patch
@@ -0,0 +1,45 @@
+From: Erwin Rol <erwin@erwinrol.com>
+Date: Sat, 22 Dec 2012 20:00:05 +0100
+Subject: [PATCH] Enable SYSROOT support in gpg-error-config
+
+Enable SYSROOT support in gpg-error-config script to prevent pulling
+in /usr/lib and /usr/include
+
+Signed-off-by: Erwin Rol <erwin@erwinrol.com>
+[mkl: make it work correctly]
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+[jlu: update for version 1.10]
+Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
+---
+ src/gpg-error-config.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/gpg-error-config.in b/src/gpg-error-config.in
+index 4be0343..6829f38 100644
+--- a/src/gpg-error-config.in
++++ b/src/gpg-error-config.in
+@@ -58,19 +58,19 @@ while test $# -gt 0; do
+ exit 0
+ ;;
+ --cflags)
+- if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
+- output="$output -I$includedir"
++ if test "x${SYSROOT}$includedir" != "x/usr/include" -a "x${SYSROOT}$includedir" != "x/include"; then
++ output="$output -I${SYSROOT}$includedir"
+ fi
+ # Note: -idirafter is a gcc extension. It is only used on
+ # systems where gcc is the only compiler we support.
+ for i in $isubdirafter; do
+- output="$output -idirafter ${includedir}/${i}"
++ output="$output -idirafter ${SYSROOT}${includedir}/${i}"
+ done
+ output="$output @GPG_ERROR_CONFIG_CFLAGS@"
+ ;;
+ --libs)
+- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+- output="$output -L$libdir"
++ if test "x${SYSROOT}$libdir" != "x/usr/lib" -a "x${SYSROOT}$libdir" != "x/lib"; then
++ output="$output -L${SYSROOT}$libdir"
+ fi
+ output="$output @GPG_ERROR_CONFIG_LIBS@"
+ ;;
diff --git a/patches/libgpg-error-1.10/series b/patches/libgpg-error-1.10/series
new file mode 100644
index 0000000..2d7fbd5
--- /dev/null
+++ b/patches/libgpg-error-1.10/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Enable-SYSROOT-support-in-gpg-error-config.patch
+# 5152212b46914dd222ae67d42d36c05b - git-ptx-patches magic
diff --git a/patches/libgpg-error-1.7/gpg-error-config.in.diff b/patches/libgpg-error-1.7/gpg-error-config.in.diff
deleted file mode 100644
index d2d30f2..0000000
--- a/patches/libgpg-error-1.7/gpg-error-config.in.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Erwin Rol <erwin@erwinrol.com>
-Subject: Enable SYSROOT support in gpg-error-config
-
-Enable SYSROOT support in gpg-error-config script to prevent pulling
-in /usr/lib and /usr/include
-
-Signed-off-by: Erwin Rol <erwin@erwinrol.com>
-[mkl: make it work correctly]
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
- src/gpg-error-config.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: libgpg-error-1.7/src/gpg-error-config.in
-===================================================================
---- libgpg-error-1.7.orig/src/gpg-error-config.in
-+++ libgpg-error-1.7/src/gpg-error-config.in
-@@ -57,13 +57,13 @@ while test $# -gt 0; do
- exit 0
- ;;
- --cflags)
-- if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
-- output="$output -I$includedir"
-+ if test "x${SYSROOT}$includedir" != "x/usr/include" -a "x${SYSROOT}$includedir" != "x/include"; then
-+ output="$output -I${SYSROOT}$includedir"
- fi
- ;;
- --libs)
-- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
-- output="$output -L$libdir"
-+ if test "x${SYSROOT}$libdir" != "x/usr/lib" -a "x${SYSROOT}$libdir" != "x/lib"; then
-+ output="$output -L${SYSROOT}$libdir"
- fi
- output="$output -lgpg-error"
- ;;
diff --git a/patches/libgpg-error-1.7/series b/patches/libgpg-error-1.7/series
deleted file mode 100644
index 771c79a..0000000
--- a/patches/libgpg-error-1.7/series
+++ /dev/null
@@ -1 +0,0 @@
-gpg-error-config.in.diff
diff --git a/rules/gnupg.make b/rules/gnupg.make
index 0ee87ef..528a609 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPG) += gnupg
#
# Paths and names
#
-GNUPG_VERSION := 2.0.15
-GNUPG_MD5 := c1286e85b66349879dc4b760dd83e2f1
+GNUPG_VERSION := 2.0.19
+GNUPG_MD5 := 6a8589381ca1b0c1a921e9955f42b016
GNUPG := gnupg-$(GNUPG_VERSION)
GNUPG_SUFFIX := tar.bz2
GNUPG_URL := ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
diff --git a/rules/libassuan.make b/rules/libassuan.make
index 8ac09b1..f2642ca 100644
--- a/rules/libassuan.make
+++ b/rules/libassuan.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBASSUAN) += libassuan
#
# Paths and names
#
-LIBASSUAN_VERSION := 2.0.0
-LIBASSUAN_MD5 := 59bc0ae7194c412d7a522029005684b2
+LIBASSUAN_VERSION := 2.0.3
+LIBASSUAN_MD5 := 179d1918325fdb928c7bd90b8a514fc7
LIBASSUAN := libassuan-$(LIBASSUAN_VERSION)
LIBASSUAN_SUFFIX := tar.bz2
LIBASSUAN_URL := ftp://ftp.gnupg.org/gcrypt/libassuan/$(LIBASSUAN).$(LIBASSUAN_SUFFIX)
diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make
index 73e2062..18595b7 100644
--- a/rules/libgcrypt.make
+++ b/rules/libgcrypt.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt
#
# Paths and names
#
-LIBGCRYPT_VERSION := 1.4.5
-LIBGCRYPT_MD5 := cc2017ad09b4543f8b3b5e9a53cfd89d
+LIBGCRYPT_VERSION := 1.5.0
+LIBGCRYPT_MD5 := 693f9c64d50c908bc4d6e01da3ff76d8
LIBGCRYPT := libgcrypt-$(LIBGCRYPT_VERSION)
LIBGCRYPT_SUFFIX := tar.bz2
LIBGCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index 600ee87..7f3d62d 100644
--- a/rules/libgpg-error.make
+++ b/rules/libgpg-error.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error
#
# Paths and names
#
-LIBGPG_ERROR_VERSION := 1.7
-LIBGPG_ERROR_MD5 := 62c0d09d1e76c5b6da8fff92314c4665
+LIBGPG_ERROR_VERSION := 1.10
+LIBGPG_ERROR_MD5 := 736a03daa9dc5873047d4eb4a9c22a16
LIBGPG_ERROR := libgpg-error-$(LIBGPG_ERROR_VERSION)
LIBGPG_ERROR_SUFFIX := tar.bz2
LIBGPG_ERROR_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
diff --git a/rules/libksba.make b/rules/libksba.make
index 3a3efae..f52882e 100644
--- a/rules/libksba.make
+++ b/rules/libksba.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBKSBA) += libksba
#
# Paths and names
#
-LIBKSBA_VERSION := 1.0.7
-LIBKSBA_MD5 := eebce521a90600369c33c5fa6b9bbbd8
+LIBKSBA_VERSION := 1.3.0
+LIBKSBA_MD5 := cd86fad9c9d360b2cf80449f8a4a4075
LIBKSBA := libksba-$(LIBKSBA_VERSION)
LIBKSBA_SUFFIX := tar.bz2
LIBKSBA_URL := ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX)
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-12-22 22:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-22 22:37 [ptxdist] [PATCH] gnupg: update to current upstream version Jan Luebbe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox