Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

diff --git a/ed/ed.nm b/ed/ed.nm
index 54aea7a24cb5a4b3c54e3a4e69221c13fa9c743e..4697f5f17d93985a0ee41ebbd360f6d95ceedddf 100644 (file)
--- a/ed/ed.nm
+++ b/ed/ed.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = ed
-version    = 1.11
+version    = 1.12
 release    = 1
 
 groups     = Application/Text
@@ -26,6 +26,11 @@ build
        requires
                lzip
        end
+
+       configure_options += \
+               CFLAGS="%{CFLAGS}" \
+               CPPFLAGS="%{CPPFLAGS}" \
+               LDFLAGS="%{LDFLAGS}"
 end
 
 packages

diff --git a/gettext/gettext.nm b/gettext/gettext.nm
index e2c50c3a0fca9595479c5fd7ccb582f99c82c91c..22f45f667a6b2465dd6b05ea1a045abed082caa8 100644 (file)
--- a/gettext/gettext.nm
+++ b/gettext/gettext.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = gettext
-version    = 0.19.3
+version    = 0.19.5
 release    = 1
 
 groups     = System/Base

diff --git a/gnupg2/gnupg2.nm b/gnupg2/gnupg2.nm
index e59e378ced6940cda16e3ff3027eb20b0756b1a6..b930a64d98716670c8ee572fc7ecba1de64d3a23 100644 (file)
--- a/gnupg2/gnupg2.nm
+++ b/gnupg2/gnupg2.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = gnupg2
-version    = 2.0.21
+version    = 2.1.6
 release    = 1
 thisapp    = gnupg-%{version}
 
@@ -31,8 +31,8 @@ build
                libgpg-error >= 1.11
                libgcrypt-devel
                libksba-devel
+               npth-devel
                pinentry
-               pth-devel
                zlib-devel
        end
 

diff --git a/npth/npth.nm b/npth/npth.nm
new file mode 100644 (file)
index 0000000..ac2d987
--- /dev/null
+++ b/npth/npth.nm
@@ -0,0 +1,41 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = npth
+version    = 1.2
+release    = 1
+
+url        = http://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git
+license    = LGPLv3+
+summary    = The New GNU Portable Threads library
+
+description
+       nPth is a non-preemptive threads implementation using an API very similar
+       to the one known from GNU Pth. It has been designed as a replacement of
+       GNU Pth for non-ancient operating systems. In contrast to GNU Pth is is
+       based on the system's standard threads implementation. Thus nPth allows
+       the use of libraries which are not compatible to GNU Pth.
+end
+
+source_dl  = ftp://ftp.gnupg.org/gcrypt/npth/
+sources    = %{thisapp}.tar.bz2
+
+build
+       test
+               make check
+       end
+end
+
+packages
+       package %{name}
+
+       package %{name}-devel
+               template DEVEL
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end