Merge remote-tracking branch 'stevee/openldap-update'

diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm
index 425cd207e114bb27f98be3b375a394e29b1cdec8..c176834dc653333c5d8b7f6683cc3d77d9094125 100644 (file)
--- a/isdn4k-utils/isdn4k-utils.nm
+++ b/isdn4k-utils/isdn4k-utils.nm
@@ -6,7 +6,7 @@
 name       = isdn4k-utils
 version    = 3.2
 devel_ver  = CVS-2010-05-01
-release    = 7
+release    = 8
 thisapp    = %{name}-%{devel_ver}-patched
 
 groups     = Networking/Tools

diff --git a/isdn4k-utils/patches/isdn4k-utils-0202131200-true.patch b/isdn4k-utils/patches/001-isdn4k-utils-0202131200-true.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-0202131200-true.patch
rename to isdn4k-utils/patches/001-isdn4k-utils-0202131200-true.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-CVS-2004-11-18-autoconf25x.patch b/isdn4k-utils/patches/002-isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
rename to isdn4k-utils/patches/002-isdn4k-utils-CVS-2004-11-18-autoconf25x.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-CVS-2006-07-20-capi.patch b/isdn4k-utils/patches/003-isdn4k-utils-CVS-2006-07-20-capi.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-CVS-2006-07-20-capi.patch
rename to isdn4k-utils/patches/003-isdn4k-utils-CVS-2006-07-20-capi.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-CVS-2009-10-20-ipfire.patch b/isdn4k-utils/patches/004-isdn4k-utils-CVS-2009-10-20-ipfire.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-CVS-2009-10-20-ipfire.patch
rename to isdn4k-utils/patches/004-isdn4k-utils-CVS-2009-10-20-ipfire.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi.patch b/isdn4k-utils/patches/005-isdn4k-utils-CVS-2010-05-01-capi.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi.patch
rename to isdn4k-utils/patches/005-isdn4k-utils-CVS-2010-05-01-capi.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi-soname.patch b/isdn4k-utils/patches/006-isdn4k-utils-CVS-2010-05-01-capi-soname.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi-soname.patch
rename to isdn4k-utils/patches/006-isdn4k-utils-CVS-2010-05-01-capi-soname.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-autoconf-2.6.4-quoting.patch b/isdn4k-utils/patches/007-isdn4k-utils-autoconf-2.6.4-quoting.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-autoconf-2.6.4-quoting.patch
rename to isdn4k-utils/patches/007-isdn4k-utils-autoconf-2.6.4-quoting.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-capiinit.patch b/isdn4k-utils/patches/008-isdn4k-utils-capiinit.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-capiinit.patch
rename to isdn4k-utils/patches/008-isdn4k-utils-capiinit.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-man.patch b/isdn4k-utils/patches/009-isdn4k-utils-man.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-man.patch
rename to isdn4k-utils/patches/009-isdn4k-utils-man.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-misc-overflow-in-capi-subsystem.patch b/isdn4k-utils/patches/010-isdn4k-utils-misc-overflow-in-capi-subsystem.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-misc-overflow-in-capi-subsystem.patch
rename to isdn4k-utils/patches/010-isdn4k-utils-misc-overflow-in-capi-subsystem.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch b/isdn4k-utils/patches/011-isdn4k-utils-pppcapiplugin-libdir.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch
rename to isdn4k-utils/patches/011-isdn4k-utils-pppcapiplugin-libdir.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-sh-linux.patch b/isdn4k-utils/patches/012-isdn4k-utils-sh-linux.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-sh-linux.patch
rename to isdn4k-utils/patches/012-isdn4k-utils-sh-linux.patch

diff --git a/isdn4k-utils/patches/isdn4k-utils-statfs.patch b/isdn4k-utils/patches/013-isdn4k-utils-statfs.patch
similarity index 100%
rename from isdn4k-utils/patches/isdn4k-utils-statfs.patch
rename to isdn4k-utils/patches/013-isdn4k-utils-statfs.patch

diff --git a/isdn4k-utils/patches/ppp-userpass.patch b/isdn4k-utils/patches/014-ppp-userpass.patch
similarity index 100%
rename from isdn4k-utils/patches/ppp-userpass.patch
rename to isdn4k-utils/patches/014-ppp-userpass.patch

diff --git a/isdn4k-utils/patches/015-isdn4k-utils-fix-ipppd.patch b/isdn4k-utils/patches/015-isdn4k-utils-fix-ipppd.patch
new file mode 100644 (file)
index 0000000..ebe9e8e
--- /dev/null
+++ b/isdn4k-utils/patches/015-isdn4k-utils-fix-ipppd.patch
@@ -0,0 +1,23 @@
+*** isdn4k-utils-CVS-2010-05-01-patched/ipppd.org/main.c       1969-12-31 20:03:58.571929416 -0500
+--- isdn4k-utils-CVS-2010-05-01-patched/ipppd/main.c   2012-07-18 05:46:07.636040971 -0400
+***************
+*** 1301,1309 ****
+           * XXX We assume a va_list is either a pointer or an array, so
+           * what gets passed for a va_list is like a void * in some sense.
+           */
+          a = va_arg(args, void *);
+! #if defined(__alpha__) || defined(__sh__)       /* always do this? */
+       n = fmtmsg(buf, buflen + 1, f, a);
+  #else
+       n = vfmtmsg(buf, buflen + 1, f, a);
+  #endif
+--- 1301,1309 ----
+           * XXX We assume a va_list is either a pointer or an array, so
+           * what gets passed for a va_list is like a void * in some sense.
+           */
+          a = va_arg(args, void *);
+! #if defined(__alpha__) || defined(__sh__) || defined ( __arm__ )      /* always do this? */
+       n = fmtmsg(buf, buflen + 1, f, a);
+  #else
+       n = vfmtmsg(buf, buflen + 1, f, a);
+  #endif

diff --git a/pkg-config/patches/pkg-config-0.25-autoconf-1.patch b/pkg-config/patches/pkg-config-0.25-autoconf-1.patch
deleted file mode 100644 (file)
index 8df41fc..0000000
--- a/pkg-config/patches/pkg-config-0.25-autoconf-1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pkg-config-0.25/pkg.m4.~1~ 2009-12-06 21:39:02.000000000 +0100
-+++ pkg-config-0.25/pkg.m4 2010-07-07 10:07:12.000000000 +0200
-@@ -135,7 +135,7 @@ 258871_PKG_ERRORS
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
--_PKG_TEXT])dnl
-+_PKG_TEXT])
-         ])
- elif test  = untried; then
-       AC_MSG_RESULT([no])
-@@ -146,7 +146,7 @@ path to pkg-config.
-
- _PKG_TEXT
-
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
-         ])
- else
-  []_CFLAGS=[][]_CFLAGS   

diff --git a/pkg-config/pkg-config.nm b/pkg-config/pkg-config.nm
index bc36a26c1b57ba5cdcbd4fef7d429337307a0985..cc3a3f5e21ae0ffdbb957c23d8a9ea8f50f644e9 100644 (file)
--- a/pkg-config/pkg-config.nm
+++ b/pkg-config/pkg-config.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = pkg-config
-version    = 0.25
-release    = 2
+version    = 0.27.1
+release    = 1
 
 groups     = Development/Tools
 url        = http://pkg-config.freedesktop.org/
@@ -18,17 +18,19 @@ description
        compiler and linker flags.
 end
 
-source_dl  =
+source_dl  = http://pkgconfig.freedesktop.org/releases/
+sources    = %{thisapp}.tar.gz
 
 build
        requires
                m4
-               popt-devel
+               glib2-devel
                sed
        end
 
        configure_options += \
-               --with-installed-popt
+               --disable-shared \
+               --with-installed-glib
 
        test
                make check