[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4632c604374836e57b9461ce0dfa4abc4ab71259

2 Mar 2012

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
       via  4632c604374836e57b9461ce0dfa4abc4ab71259 (commit)
       via  b0fffcc08d77b769faf9ab3646d3dbf698e34bb7 (commit)
       via  8980e4b7370efd15bdc75ac44cef34dc62e6d9cf (commit)
       via  f1de85a82225dad838d1d72950106c2e74523776 (commit)
       via  d28271c161c0df7b6491711027c9a889c99a9bd6 (commit)
       via  ee9a6aa60bec9da00966a141b430f5e050f0565c (commit)
       via  6b4fc2335de5ce1e34b8eaef713840b47e9e0e79 (commit)
       via  5f539e00385a3af65b40eb19a13b6b9f5dfc755e (commit)
       via  4b050c7744e69e025eb7c4820e8d43b24613254b (commit)
       via  722a2ade877383fef73ada3d82880ccbf4eee5f4 (commit)
       via  ea8a355cb2b9171f2d99d486e194cffd49a705d9 (commit)
       via  4d7768039a0e3e8533a8eff5d998e4bc0008d3de (commit)
       via  f0b9361889fa64fe2ec2b111644443d27ecdfbde (commit)
       via  598d937dc6c1584ff3db0863db092f6b79dbf863 (commit)
       via  3ec0d1383362e1c96fb56341311717da23b568a2 (commit)
       via  12a96ed05cea52de3e59b84536edb7f6145b7d18 (commit)
       via  d924a8409b21f325322771ab0fc391b34cb00c41 (commit)
       via  19ab4e40ee479991ba7532746f9ac17a792de990 (commit)
       via  900ca389bfcdac2711624601c0458cfb559701bd (commit)
       via  c22b07daf669f9c6f176f88df2c1713c1c19fd28 (commit)
       via  a5c63e06785c376d7e3a2c8bc68d35607d57dccc (commit)
       via  b26c3b1cf9c4a02c9af5e8b28e554379cc0a8167 (commit)
      from  6fb1272597398adf618a185018e1041e73c29e5c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4632c604374836e57b9461ce0dfa4abc4ab71259
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:44:37 2012 +0100
l7-protocols: Update to 2009-05-28.
Avoids an error with debuginfo extraction.
commit b0fffcc08d77b769faf9ab3646d3dbf698e34bb7
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:43:39 2012 +0100
upower: Fix syntax errors in makefiles (dependencies).
commit 8980e4b7370efd15bdc75ac44cef34dc62e6d9cf
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:40:52 2012 +0100
gnutls: Add forgotten patch file.
commit f1de85a82225dad838d1d72950106c2e74523776
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:39:39 2012 +0100
libsolv: Remove -Werror from gcc command line.
commit d28271c161c0df7b6491711027c9a889c99a9bd6
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:39:06 2012 +0100
net-snmp: Install libs to right location.
commit ee9a6aa60bec9da00966a141b430f5e050f0565c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:38:43 2012 +0100
libcgroup: Install lib to /usr.
commit 6b4fc2335de5ce1e34b8eaef713840b47e9e0e79
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:38:11 2012 +0100
libatasmart: Install libs to /usr.
commit 5f539e00385a3af65b40eb19a13b6b9f5dfc755e
Merge: 722a2ad 4b050c7
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:31:32 2012 +0100
Merge remote-tracking branch 'stevee/lsof'
commit 4b050c7744e69e025eb7c4820e8d43b24613254b
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Mar 2 16:23:56 2012 +0100
lsof: Update to 4.85.
commit 722a2ade877383fef73ada3d82880ccbf4eee5f4
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:20:56 2012 +0100
net-tools: Do not build in parallel mode.
commit ea8a355cb2b9171f2d99d486e194cffd49a705d9
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:11:19 2012 +0100
paxtest: Install libs to right location on x86_64.
commit 4d7768039a0e3e8533a8eff5d998e4bc0008d3de
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 16:08:47 2012 +0100
openvpn: Install plugins to right directory on x86_64.
commit f0b9361889fa64fe2ec2b111644443d27ecdfbde
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Mar 2 16:07:43 2012 +0100
lsof: Fix build error.
Never use any hardcoded path's in DIR_APP!
commit 598d937dc6c1584ff3db0863db092f6b79dbf863
Merge: 3ec0d13 b26c3b1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 15:57:59 2012 +0100
Merge remote-tracking branch 'stevee/docbook-dtds'
commit 3ec0d1383362e1c96fb56341311717da23b568a2
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 15:56:29 2012 +0100
xorg-x11-xinit: Fix package name.
commit 12a96ed05cea52de3e59b84536edb7f6145b7d18
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 15:55:50 2012 +0100
ppp: Fix build error on x86_64.
However, the code was not compiled with the -fPIC flag.
commit d924a8409b21f325322771ab0fc391b34cb00c41
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 15:55:19 2012 +0100
tcpdump: Fix build by removing RPATH from the binary.
commit 19ab4e40ee479991ba7532746f9ac17a792de990
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 15:54:44 2012 +0100
rsyslog: Make package work on x86_64.
Also moves the package to /usr.
commit 900ca389bfcdac2711624601c0458cfb559701bd
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 15:54:03 2012 +0100
ulogd2: Fix package name.
commit c22b07daf669f9c6f176f88df2c1713c1c19fd28
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 15:52:46 2012 +0100
curl: Disable testsuite.
The testsuite ran remote tests which do not work very well
    in PBS.
commit a5c63e06785c376d7e3a2c8bc68d35607d57dccc
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 2 15:51:03 2012 +0100
gnutls: Update to 3.0.13.
Fixes a lot of minor bugs.
commit b26c3b1cf9c4a02c9af5e8b28e554379cc0a8167
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Mar 2 15:40:56 2012 +0100
docbook-dtds: Fix typo in 4.5 xml dtd catalog.
Fixes #10034
-----------------------------------------------------------------------
Summary of changes:
 curl/curl.nm                                       |   15 ++-
 curl/patches/curl-7.21.2-debug.patch               |   58 +++++++++
 docbook-dtds/docbook-dtds.nm                       |    2 +-
 .../patches/docbook-sgml-systemrewrite.patch       |    2 +-
 gnutls/gnutls.nm                                   |   16 ++-
 ...gnutls-3.0.13-force-kill-of-child-process.patch |   24 ++++
 l7-protocols/l7-protocols.nm                       |    4 +-
 libatasmart/libatasmart.nm                         |   15 +--
 libcgroup/libcgroup.nm                             |   13 +--
 libsolv/libsolv.nm                                 |    5 +-
 lsof/lsof.nm                                       |   15 +--
 lsof/patches/lsof_4.81-threads.patch               |  129 --------------------
 net-snmp/net-snmp.nm                               |    7 +-
 net-tools/net-tools.nm                             |    5 +-
 openvpn/openvpn.nm                                 |    6 +-
 paxtest/paxtest.nm                                 |   12 ++-
 ppp/ppp.nm                                         |    6 +-
 rsyslog/rsyslog.nm                                 |    4 +-
 tcpdump/tcpdump.nm                                 |   12 ++-
 ulogd2/ulogd2.nm                                   |    7 +-
 upower/upower.nm                                   |   10 +-
 xorg-x11-xinit/xorg-x11-xinit.nm                   |    7 +-
 22 files changed, 163 insertions(+), 211 deletions(-)
 create mode 100644 curl/patches/curl-7.21.2-debug.patch
 create mode 100644 gnutls/patches/gnutls-3.0.13-force-kill-of-child-process.patch
 delete mode 100644 lsof/patches/lsof_4.81-threads.patch
Difference in files:

diff --git a/curl/curl.nm b/curl/curl.nm
index b171ecf..a35ff76 100644
--- a/curl/curl.nm
+++ b/curl/curl.nm
@@ -5,7 +5,7 @@
name       = curl
 version    = 7.24.0
-release    = 1
+release    = 2
groups     = Application/Internet
 url        = http://www.curl.haxx.se/
@@ -29,10 +29,10 @@ build
    	groff
    	libidn-devel
    	libssh2-devel
-		libtool
+		libtool-devel
+		net-tools
    	nss-devel
    	openldap-devel
-		pkg-config
    	zlib-devel
    end
@@ -53,9 +53,12 @@ build
    	autoreconf -vfi
    end
-	test
-		make check
-	end
+	# The testsuite runs services which bind to ports and
+	# sends queries to the internet. This may fail in some
+	# occasions.
+	#test
+	#	make check
+	#end
 end
packages
diff --git a/curl/patches/curl-7.21.2-debug.patch b/curl/patches/curl-7.21.2-debug.patch
new file mode 100644
index 0000000..7691826
--- /dev/null
+++ b/curl/patches/curl-7.21.2-debug.patch
@@ -0,0 +1,58 @@
+ configure            |   15 ++++-----------
+ m4/curl-compilers.m4 |   15 ++++-----------
+ 2 files changed, 8 insertions(+), 22 deletions(-)
+
+diff --git a/configure b/configure
+index d3ecf69..6d8f085 100755
+--- a/configure
++++ b/configure
+@@ -15040,18 +15040,11 @@ $as_echo "yes" >&6; }
+     gccvhi=`echo $gccver | cut -d . -f1`
+     gccvlo=`echo $gccver | cut -d . -f2`
+     compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
+-    flags_dbg_all="-g -g0 -g1 -g2 -g3"
+-    flags_dbg_all="$flags_dbg_all -ggdb"
+-    flags_dbg_all="$flags_dbg_all -gstabs"
+-    flags_dbg_all="$flags_dbg_all -gstabs+"
+-    flags_dbg_all="$flags_dbg_all -gcoff"
+-    flags_dbg_all="$flags_dbg_all -gxcoff"
+-    flags_dbg_all="$flags_dbg_all -gdwarf-2"
+-    flags_dbg_all="$flags_dbg_all -gvms"
++    flags_dbg_all=""
+     flags_dbg_yes="-g"
+-    flags_dbg_off="-g0"
+-    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
+-    flags_opt_yes="-O2"
++    flags_dbg_off=""
++    flags_opt_all=""
++    flags_opt_yes=""
+     flags_opt_off="-O0"
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
+index 1ea4d17..868d65a 100644
+--- a/m4/curl-compilers.m4
++++ b/m4/curl-compilers.m4
+@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
+     gccvhi=`echo $gccver | cut -d . -f1`
+     gccvlo=`echo $gccver | cut -d . -f2`
+     compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
+-    flags_dbg_all="-g -g0 -g1 -g2 -g3"
+-    flags_dbg_all="$flags_dbg_all -ggdb"
+-    flags_dbg_all="$flags_dbg_all -gstabs"
+-    flags_dbg_all="$flags_dbg_all -gstabs+"
+-    flags_dbg_all="$flags_dbg_all -gcoff"
+-    flags_dbg_all="$flags_dbg_all -gxcoff"
+-    flags_dbg_all="$flags_dbg_all -gdwarf-2"
+-    flags_dbg_all="$flags_dbg_all -gvms"
++    flags_dbg_all=""
+     flags_dbg_yes="-g"
+-    flags_dbg_off="-g0"
+-    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
+-    flags_opt_yes="-O2"
++    flags_dbg_off=""
++    flags_opt_all=""
++    flags_opt_yes=""
+     flags_opt_off="-O0"
+   else
+     AC_MSG_RESULT([no])
diff --git a/docbook-dtds/docbook-dtds.nm b/docbook-dtds/docbook-dtds.nm
index 37b15ba..027da2f 100644
--- a/docbook-dtds/docbook-dtds.nm
+++ b/docbook-dtds/docbook-dtds.nm
@@ -5,7 +5,7 @@
name       = docbook-dtds
 version    = 1.0
-release    = 4
+release    = 5
 arch       = noarch
groups     = Applications/Text
diff --git a/docbook-dtds/patches/docbook-sgml-systemrewrite.patch b/docbook-dtds/patches/docbook-sgml-systemrewrite.patch
index 4adbc50..cb8dffe 100644
--- a/docbook-dtds/patches/docbook-sgml-systemrewrite.patch
+++ b/docbook-dtds/patches/docbook-sgml-systemrewrite.patch
@@ -201,7 +201,7 @@ diff -urNp docbook-dtds-1.0-orig/4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/do
    -- ...................................................................... --
 +  -- SYSTEM rewrite of web URL .............. ............................. --
 +
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
 +       "docbookx.dtd"
 +
 +  -- ...................................................................... --
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index 2b2912e..64b8a3f 100644
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -4,8 +4,8 @@
 ###############################################################################
name       = gnutls
-version    = 3.0.9
-release    = 1
+version    = 3.0.13
+release    = 2
groups     = System/Libraries
 url        = http://www.gnu.org/software/gnutls/
@@ -25,9 +25,9 @@ sources    = %{thisapp}.tar.xz
 build
    requires
    	libtasn1-devel
-		nettle-devel>=2.4
+		nettle-devel >= 2.4
    	perl
-		p11-kit-devel>=0.4
+		p11-kit-devel >= 0.4
    	zlib-devel
    end
@@ -36,9 +36,11 @@ build
configure_options += \
    	--with-included-libcfg \
-		--disable-srp-authentication
+		--disable-srp-authentication \
+		--disable-openssl-compatibility
test
+		export LD_LIBRARY_PATH=$(pwd)/lib/.libs
    	make check
    end
 end
@@ -46,8 +48,8 @@ end
 packages
    package %{name}
    	requires
-			nettle>=2.4
-			p11-kit>=0.4
+			nettle >= 2.4
+			p11-kit >= 0.4
    	end
    end
diff --git a/gnutls/patches/gnutls-3.0.13-force-kill-of-child-process.patch b/gnutls/patches/gnutls-3.0.13-force-kill-of-child-process.patch
new file mode 100644
index 0000000..7c871bb
--- /dev/null
+++ b/gnutls/patches/gnutls-3.0.13-force-kill-of-child-process.patch
@@ -0,0 +1,24 @@
+From 642e6b5ca996325dc0ca6401a3b87039408b2585 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos nmav@gnutls.org
+Date: Sun, 19 Feb 2012 19:51:06 +0100
+Subject: [PATCH] force kill of child process.
+
+---
+ tests/mini-loss-time.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/tests/mini-loss-time.c b/tests/mini-loss-time.c
+index 17f6d3f..cc01dcd 100644
+--- a/tests/mini-loss-time.c
++++ b/tests/mini-loss-time.c
+@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
+     {
+       /* parent */
+       server (fd[0], server_packet);
++      kill(child, SIGTERM);
+     }
+   else 
+     {
+-- 
+1.7.2.5
+
diff --git a/l7-protocols/l7-protocols.nm b/l7-protocols/l7-protocols.nm
index 31e8e99..6e244ef 100644
--- a/l7-protocols/l7-protocols.nm
+++ b/l7-protocols/l7-protocols.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = l7-protocols
-version    = 2007-11-22
+version    = 2009-05-28
 release    = 1
 arch       = noarch
@@ -20,7 +20,7 @@ description
    of port.
 end
-source_dl  =
+source_dl  = http://sourceforge.net/projects/l7-filter/files/Protocol%20definitions/%%7Bv...
build
    build
diff --git a/libatasmart/libatasmart.nm b/libatasmart/libatasmart.nm
index 78c510e..e3d8c93 100644
--- a/libatasmart/libatasmart.nm
+++ b/libatasmart/libatasmart.nm
@@ -13,7 +13,7 @@ license    = LGPLv2+
 summary    = ATA S.M.A.R.T. Disk Health Monitoring Library.
description
-	A scmall and lightweight parser library for ATA S.M.A.R.T. hard disk \
+	A scmall and lightweight parser library for ATA S.M.A.R.T. hard disk
    health monitoring.
 end
@@ -23,24 +23,11 @@ sources    = %{thisapp}.tar.gz
 build
    requires
    	libudev-devel
-		pkg-config
-	end
-
-	configure_options += \
-		--libdir=/lib
-
-	install_cmds
-		-mkdir -pv %{BUILDROOT}/usr/lib
-		mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
-
-		rm -vf %{BUILDROOT}/lib/libatasmart.so
-		ln -svf ../../lib/libatasmart.so.4 %{BUILDROOT}/usr/lib/libatasmart.so
    end
 end
packages
    package %{name}
-	end
package %{name}-devel
    	template DEVEL
diff --git a/libcgroup/libcgroup.nm b/libcgroup/libcgroup.nm
index 33a01f3..88f06df 100644
--- a/libcgroup/libcgroup.nm
+++ b/libcgroup/libcgroup.nm
@@ -5,7 +5,7 @@
name       = libcgroup
 version    = 0.35.1
-release    = 1
+release    = 2
groups     = Development/Libraries
 url        = http://libcg.sourceforge.net/
@@ -29,27 +29,20 @@ build
    end
configure_options += \
-		--libdir=/lib \
    	--disable-pam \
    	--disable-tools \
    	--disable-daemon
-	#define test
-	#	make check
-	#endef
+	# The testsuite is disabled because it does not
+	# run very smoothly in PBS.
install_cmds
    	rm -rf %{BUILDROOT}/etc
-
-		mkdir -pv %{BUILDROOT}/usr/lib
-		rm -vf %{BUILDROOT}/lib/libcgroup.so
-		ln -svf ../../lib/libcgroup.so.1 %{BUILDROOT}/usr/lib/libcgroup.so
    end
 end
packages
    package %{name}
-	end
package %{name}-devel
    	template DEVEL
diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm
index aade3f9..2750d22 100644
--- a/libsolv/libsolv.nm
+++ b/libsolv/libsolv.nm
@@ -6,7 +6,7 @@
 name       = libsolv
 version    = 0.0.0
 git_ver    = 0db9d7f
-release    = 2.git%{git_ver}
+release    = 3.git%{git_ver}
maintainer = Michael Tremer michael.tremer@ipfire.org
 groups     = System/Libraries
@@ -33,6 +33,9 @@ build
    end
prepare_cmds
+		# Remove -Werror from gcc command line.
+		find . -name CMakeLists.txt | xargs sed -e "s/-Werror//g" -i
+
    	# Do not build bindings, examples and tools.
    	sed "/bindings/d" -i CMakeLists.txt
    	sed "/examples/d" -i CMakeLists.txt
diff --git a/lsof/lsof.nm b/lsof/lsof.nm
index bff08ab..b10421c 100644
--- a/lsof/lsof.nm
+++ b/lsof/lsof.nm
@@ -4,30 +4,27 @@
 ###############################################################################
name       = lsof
-version    = 4.82
-release    = 2
+version    = 4.85
+release    = 1
groups     = Development/Debuggers
-url        = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof
+url        = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 license    = zlib
 summary    = A utility which lists open files on a Linux/UNIX system.
description
-	Lsof stands for LiSt Open Files, and it does just that: \
-	it lists information about files that are open by the \
+	Lsof stands for LiSt Open Files, and it does just that:
+	it lists information about files that are open by the
    processes running on a system.
 end
-source_dl  =
-sources    = %{name}_%{version}_src.tar.gz
+thisapp    = %{name}_%{version}_src
build
    requires
    	libselinux-devel
    end
-	DIR_APP = /usr/src/%{name}_%{version}_src
-
    build
    	LINUX_BASE=/proc \
    	LSOF_VSTR="2.6.16" \
diff --git a/lsof/patches/lsof_4.81-threads.patch b/lsof/patches/lsof_4.81-threads.patch
deleted file mode 100644
index 399819f..0000000
--- a/lsof/patches/lsof_4.81-threads.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -up lsof_4.81-rh/dialects/linux/dproc.c.kzak lsof_4.81-rh/dialects/linux/dproc.c
---- lsof_4.81-rh/dialects/linux/dproc.c.kzak	2008-10-21 18:17:25.000000000 +0200
-+++ lsof_4.81-rh/dialects/linux/dproc.c	2008-12-02 10:54:54.000000000 +0100
-@@ -89,7 +89,8 @@ _PROTOTYPE(static void process_proc_map,
- _PROTOTYPE(static int process_id,(char *idp, int idpl, char *cmd, UID_ARG uid,
- 				  int pid, int ppid, int pgid));
- _PROTOTYPE(static int statEx,(char *p, struct stat *s, int *ss));
-- 
-+_PROTOTYPE(static int get_other_thread,(int pid, char **tid));
-+
- 
- #if	defined(HASSELINUX)
- _PROTOTYPE(static int cmp_cntx_eq,(char *pcntx, char *ucntx));
-@@ -159,6 +160,7 @@ gather_proc_info()
- 	struct dirent *dp;
- 	struct stat sb;
- 	int lwp, n, nl, pgid, pid, ppid, rv, tx;
-+	char *tid = NULL;
- 	static char *lwppath = (char *)NULL;
- 	static int lwppathl = 0;
- 	static char *path = (char *)NULL;
-@@ -252,6 +254,13 @@ gather_proc_info()
- 	while ((dp = readdir(ps))) {
- 	    if (nm2id(dp->d_name, &pid, &n))
- 		continue;
-+
-+	    tid = NULL;
-+	    if (get_other_thread(pid, &tid) < 0)
-+		continue;
-+	    if (tid)
-+		n += sizeof("task/") + strlen(tid);
-+
- 	/*
- 	 * Build path to PID's directory.
- 	 */
-@@ -265,7 +274,14 @@ gather_proc_info()
- 		    Exit(1);
- 		}
- 	    }
--	    (void) snpf(pidpath + pidx, pidpathl - pidx, "%s/", dp->d_name);
-+	    if (tid) {
-+		/* /proc/<pid> is useless (zombie), we have to use /proc/<pid>/task/<tid>
-+		 * where is still running thread
-+		 */
-+		(void) snpf(pidpath + pidx, pidpathl - pidx, "%s/task/%s/", dp->d_name, tid);
-+		free(tid);
-+	    } else
-+		(void) snpf(pidpath + pidx, pidpathl - pidx, "%s/", dp->d_name);
- 	    n += (pidx + 1);
- 	/*
- 	 * Process the PID's stat info.
-@@ -1007,6 +1023,64 @@ process_id(idp, idpl, cmd, uid, pid, ppi
- 	return(0);
- }
- 
-+/* fill tid if the initial thread is zombie,
-+ * but other thread still alive
-+ *
-+ * returns -1=error, 0=nothing, 1=ok
-+ */
-+static int
-+get_other_thread(pid, tid)
-+	int pid;
-+	char **tid;
-+{
-+	char path[MAXPATHLEN];
-+	DIR *tdp;
-+	struct dirent *td;
-+	char pstate;
-+	FILE *f;
-+	int _pid;
-+	int re = 0, x;
-+
-+	snpf(path, sizeof(path), "%s/%d/stat", PROCFS, pid);
-+	if (!(f = fopen(path, "r")))
-+		return -1;
-+	x = fscanf(f, "%d %*s %c", &_pid, &pstate);
-+	fclose(f);
-+	if (x!=2)
-+		return -1;
-+	if (_pid != pid)
-+		return -1;		/* corrupted /proc? */
-+	if (pstate!='Z')
-+		return 0;		/* ignore normal proceses */
-+
-+	snpf(path, sizeof(path), "%s/%d/task", PROCFS, pid);
-+
-+	/* open /proc/<pid>/task */
-+	if (!(tdp = opendir(path)))
-+		return 0;		/* kernel < 2.6.x */
-+
-+	/* look for first alive thread */
-+	while ((td = readdir(tdp))) {
-+		if (strcmp(td->d_name, ".")==0 || strcmp(td->d_name, "..")==0)
-+			continue;
-+
-+		/* /proc/<pid>/task/<tid>/stat */
-+		snpf(path, sizeof(path), "%s/%d/task/%s/stat", PROCFS, pid, td->d_name);
-+		if (!(f = fopen(path, "r")))
-+			continue;
-+		x = fscanf(f, "%*d %*s %c", &pstate);
-+		fclose(f);
-+		if (x!=1)
-+			continue;
-+		if (pstate!='Z') {
-+			re = 1;
-+			*tid = strdup(td->d_name);
-+			break;
-+		}
-+	}
-+	closedir(tdp);
-+	return re;
-+}
- 
- /*
-  * process_proc_map() - process the memory map of a process
-@@ -1250,12 +1324,6 @@ read_id_stat(ty, p, id, cmd, ppid, pgid)
- 	    return(1);
- 	}
- /*
-- * Convert the first field to an integer; its conversion must match the
-- * ID argument.
-- */
--	if (!fp[0] || (atoi(fp[0]) != id))
--	    return(1);
--/*
-  * Get the command name from the second field.  Strip a starting '(' and
-  * an ending ')'.  Allocate space to hold the result and return the space
-  * pointer.
diff --git a/net-snmp/net-snmp.nm b/net-snmp/net-snmp.nm
index 863fedb..4f89074 100644
--- a/net-snmp/net-snmp.nm
+++ b/net-snmp/net-snmp.nm
@@ -5,7 +5,7 @@

 name       = net-snmp
 version    = 5.7.1
-release    = 2
+release    = 3

 groups     = Networking/Daemons
 url        = http://net-snmp.sourceforge.net
@@ -29,9 +29,6 @@ build
    PARALLELISMFLAGS = # No parallel build

    configure_options += \
-		--sysconfdir=/etc \
-		--libdir=/usr/lib \
-		--mandir=/usr/share/man \
    	--with-default-snmp-version=2 \
    	--with-sys-contact=root@ \
    	--with-sys-location=localhost \
@@ -51,7 +48,7 @@ packages
    	# XXX Although we don't want to build perl modules,
    	# we have this requirement?!
    	filter_requires
-			perl(NetSNMP::TrapReceiver)
+			^perl
    	end
    end

diff --git a/net-tools/net-tools.nm b/net-tools/net-tools.nm
index 10ce626..1ae43ff 100644
--- a/net-tools/net-tools.nm
+++ b/net-tools/net-tools.nm
@@ -5,7 +5,7 @@

 name       = net-tools
 version    = 1.60
-release    = 2
+release    = 3

 groups     = System/Base
 url        = http://net-tools.berlios.de/
@@ -124,6 +124,9 @@ build
    make_build_targets += \
    	 CC=gcc

+	# Compiling in parallel mode is unsafe for this pkg.
+	PARALLELISMFLAGS =
+
    build_cmds
    	# Compile ether-wake
    	gcc %{CFLAGS} -o ether-wake ether-wake.c
diff --git a/openvpn/openvpn.nm b/openvpn/openvpn.nm
index 3d4bbe2..5605145 100644
--- a/openvpn/openvpn.nm
+++ b/openvpn/openvpn.nm
@@ -5,7 +5,7 @@

 name       = openvpn
 version    = 2.2.1
-release    = 1
+release    = 2

 groups     = Networking/VPN
 url        = http://openvpn.net/
@@ -43,10 +43,10 @@ build
    end

    install_cmds
-		mkdir -pv %{BUILDROOT}/usr/lib/%{name}/plugin/lib
+		mkdir -pv %{BUILDROOT}%{libdir}/%{name}/plugin/lib
    	for plugin in %{PLUGINS}; do
    		install -m 0755 plugin/$plugin/openvpn-$plugin.so \
-				%{BUILDROOT}/usr/lib/%{name}/plugin/lib/openvpn-$plugin.so
+				%{BUILDROOT}%{libdir}/%{name}/plugin/lib/openvpn-$plugin.so
    	done
    end
 end
diff --git a/paxtest/paxtest.nm b/paxtest/paxtest.nm
index 662e49b..cae3a7c 100644
--- a/paxtest/paxtest.nm
+++ b/paxtest/paxtest.nm
@@ -5,7 +5,7 @@

 name       = paxtest
 version    = 0.9.9
-release    = 3
+release    = 4

 groups     = Security/Tools
 url        = http://pax.grsecurity.org/
@@ -22,20 +22,24 @@ sources    = %{thisapp}.tgz

 build
    build
-		make -f Makefile.psm RUNDIR=/usr/lib/paxtest \
+		make -f Makefile.psm RUNDIR=%{libdir}/paxtest \
    		%{PARALLELISMFLAGS}
    end

    install
    	make -f Makefile.psm install DESTDIR=%{BUILDROOT} \
-			RUNDIR=/usr/lib/paxtest BINDIR=/usr/bin
+			RUNDIR=%{libdir}/paxtest BINDIR=%{bindir}
    end

+	# Ignore errors on extract-debuginfo, because this
+	# package contains wrong/broken/unoptimized files by
+	# intention.
+	debuginfo_options = || :
 end

 quality-agent
    whitelist_execstack
-		/usr/lib/paxtest
+		%{libdir}/paxtest
    end
 end

diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index 8930a92..f82be75 100644
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -5,7 +5,7 @@

 name       = ppp
 version    = 2.4.5
-release    = 2
+release    = 3

 groups     = System/Daemons
 url        = ftp://ftp.samba.org/pub/ppp/
@@ -30,6 +30,9 @@ build
    	pam-devel
    end

+	# Explicitely add -fPIC to CFLAGS.
+	CFLAGS += -fPIC
+
    prepare_cmds
    	sed -e "s@^RUNDIR .*@RUNDIR = /var/run/ppp@" \
    		-e "s@^LOGDIR .*@LOGDIR = /var/log/ppp@" \
@@ -60,7 +63,6 @@ end

 packages
    package %{name}
-	end

    package %{name}-devel
    	template DEVEL
diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm
index 1f2aef3..70ceb94 100644
--- a/rsyslog/rsyslog.nm
+++ b/rsyslog/rsyslog.nm
@@ -5,7 +5,7 @@

 name       = rsyslog
 version    = 5.8.6
-release    = 2
+release    = 3

 groups     = System/Daemons
 url        = http://www.rsyslog.com/
@@ -35,8 +35,6 @@ build
    	-DSYSLOGD_PIDNAME="syslogd.pid"

    configure_options += \
-		--exec-prefix= \
-		--libdir=/lib \
    	--with-systemdsystemunitdir=/lib/systemd/system \
    	--disable-static \
    	--disable-testbench \
diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm
index d491340..2a81d25 100644
--- a/tcpdump/tcpdump.nm
+++ b/tcpdump/tcpdump.nm
@@ -5,7 +5,7 @@

 name       = tcpdump
 version    = 4.1.1
-release    = 1
+release    = 2

 groups     = Networking/Sniffer
 url        = http://www.tcpdump.org/
@@ -25,6 +25,7 @@ CFLAGS    += -fno-strict-aliasing

 build
    requires
+		chrpath
    	libpcap-devel
    	openssl-devel
    end
@@ -32,11 +33,18 @@ build
    configure_options += \
    	--with-crypto \
    	--without-smi
+
+	install_cmds
+		# Remove duplicated binary.
+		rm -vf %{BUILDROOT}%{sbindir}/tcpdump.%{version}
+
+		# Remove RPATH.
+		chrpath --delete %{BUILDROOT}%{sbindir}/tcpdump
+	end
 end

 packages
    package %{name}
-	end

    package %{name}-debuginfo
    	template DEBUGINFO
diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm
index fd1a789..f583b3f 100644
--- a/ulogd2/ulogd2.nm
+++ b/ulogd2/ulogd2.nm
@@ -3,9 +3,10 @@
 # Copyright (C) - IPFire Development Team info@ipfire.org                   #
 ###############################################################################

-name       = ulogd
+name       = ulogd2
 version    = 2.0.0beta3
-release    = 2
+release    = 3
+thisapp    = ulogd-%{version}

 groups     = Networking/Statistics
 url        = http://netfilter.org/projects/ulogd/index.html
@@ -29,7 +30,6 @@ build
    	libnetfilter_conntrack-devel
    	libnetfilter_log-devel
    	libpcap-devel
-		pkg-config
    	sqlite-devel
    end

@@ -47,7 +47,6 @@ end

 packages
    package %{name}
-	end

    package %{name}-debuginfo
    	template DEBUGINFO
diff --git a/upower/upower.nm b/upower/upower.nm
index 67949dd..57e2155 100644
--- a/upower/upower.nm
+++ b/upower/upower.nm
@@ -5,7 +5,7 @@

 name       = upower
 version    = 0.9.2
-release    = 1
+release    = 2

 groups     = System/Libraries
 url        = http://upower.freedesktop.org/
@@ -25,7 +25,8 @@ build
    	dbus-devel
    	dbus-glib-devel
    	glib2-devel
-		gettext intltool
+		gettext
+		intltool
    	perl-XML-Parser
    	pkg-config
    	polkit-devel
@@ -39,7 +40,10 @@ end

 packages
    package %{name}
-		requires = udev util-linux
+		requires
+			udev
+			util-linux
+		end
    end

    package %{name}-libs
diff --git a/xorg-x11-xinit/xorg-x11-xinit.nm b/xorg-x11-xinit/xorg-x11-xinit.nm
index cd82436..c9991fb 100644
--- a/xorg-x11-xinit/xorg-x11-xinit.nm
+++ b/xorg-x11-xinit/xorg-x11-xinit.nm
@@ -3,9 +3,10 @@
 # Copyright (C) - IPFire Development Team info@ipfire.org                   #
 ###############################################################################

-name       = xinit
+name       = xorg-x11-xinit
 version    = 1.2.1
 release    = 1
+thisapp    = xinit-%{version}

 groups     = X/Server
 url        = http://www.x.org
@@ -20,10 +21,8 @@ source_dl = http://ftp.x.org/pub/individual/app/

 build
    requires
-		autoconf
-		automake
    	libX11-devel
-		pkg-config
+		xorg-x11-util-macros
    end
 end



hooks/post-receive
--
IPFire 3.x development tree

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4632c604374836e57b9461ce0dfa4abc4ab71259