name = curl
version = 7.24.0
-release = 1
+release = 2
groups = Application/Internet
url = http://www.curl.haxx.se/
groff
libidn-devel
libssh2-devel
- libtool
+ libtool-devel
+ net-tools
nss-devel
openldap-devel
- pkg-config
zlib-devel
end
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
--- /dev/null
+ 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])
name = docbook-dtds
version = 1.0
-release = 4
+release = 5
arch = noarch
groups = Applications/Text
-- ...................................................................... --
+ -- 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"
+
+ -- ...................................................................... --
###############################################################################
name = gnutls
-version = 3.0.9
-release = 1
+version = 3.0.13
+release = 2
groups = System/Libraries
url = http://www.gnu.org/software/gnutls/
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
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
packages
package %{name}
requires
- nettle>=2.4
- p11-kit>=0.4
+ nettle >= 2.4
+ p11-kit >= 0.4
end
end
--- /dev/null
+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
+
###############################################################################
name = l7-protocols
-version = 2007-11-22
+version = 2009-05-28
release = 1
arch = noarch
of port.
end
-source_dl =
+source_dl = http://sourceforge.net/projects/l7-filter/files/Protocol%20definitions/%{version}/
build
build
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
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
name = libcgroup
version = 0.35.1
-release = 1
+release = 2
groups = Development/Libraries
url = http://libcg.sourceforge.net/
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
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
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
###############################################################################
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" \
+++ /dev/null
-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.
name = net-snmp
version = 5.7.1
-release = 2
+release = 3
groups = Networking/Daemons
url = http://net-snmp.sourceforge.net
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 \
# XXX Although we don't want to build perl modules,
# we have this requirement?!
filter_requires
- perl\(NetSNMP::TrapReceiver\)
+ ^perl
end
end
name = net-tools
version = 1.60
-release = 2
+release = 3
groups = System/Base
url = http://net-tools.berlios.de/
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
name = openvpn
version = 2.2.1
-release = 1
+release = 2
groups = Networking/VPN
url = http://openvpn.net/
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
name = paxtest
version = 0.9.9
-release = 3
+release = 4
groups = Security/Tools
url = http://pax.grsecurity.org/
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
name = ppp
version = 2.4.5
-release = 2
+release = 3
groups = System/Daemons
url = ftp://ftp.samba.org/pub/ppp/
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@" \
packages
package %{name}
- end
package %{name}-devel
template DEVEL
name = rsyslog
version = 5.8.6
-release = 2
+release = 3
groups = System/Daemons
url = http://www.rsyslog.com/
-DSYSLOGD_PIDNAME=\"syslogd.pid\"
configure_options += \
- --exec-prefix= \
- --libdir=/lib \
--with-systemdsystemunitdir=/lib/systemd/system \
--disable-static \
--disable-testbench \
name = tcpdump
version = 4.1.1
-release = 1
+release = 2
groups = Networking/Sniffer
url = http://www.tcpdump.org/
build
requires
+ chrpath
libpcap-devel
openssl-devel
end
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
# 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
libnetfilter_conntrack-devel
libnetfilter_log-devel
libpcap-devel
- pkg-config
sqlite-devel
end
packages
package %{name}
- end
package %{name}-debuginfo
template DEBUGINFO
name = upower
version = 0.9.2
-release = 1
+release = 2
groups = System/Libraries
url = http://upower.freedesktop.org/
dbus-devel
dbus-glib-devel
glib2-devel
- gettext intltool
+ gettext
+ intltool
perl-XML-Parser
pkg-config
polkit-devel
packages
package %{name}
- requires = udev util-linux
+ requires
+ udev
+ util-linux
+ end
end
package %{name}-libs
# 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
build
requires
- autoconf
- automake
libX11-devel
- pkg-config
+ xorg-x11-util-macros
end
end
projects / people / stevee / ipfire-3.x.git / commitdiff
