From 182e0b144e85a85020ec7afdc39dfbd4559c6e5d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 19 Oct 2012 00:36:39 +0000 Subject: [PATCH] procps: updated to 3.3.3 and aligned with upstream. Cleaned cross patches. --- procps/.footprint | 29 +++++++++++++++++++++++------ procps/.md5sum | 4 +--- procps/Pkgfile | 43 +++++++++++++++++++++++++++---------------- 3 files changed, 51 insertions(+), 25 deletions(-) diff --git a/procps/.footprint b/procps/.footprint index 8468836..ced1fc7 100644 --- a/procps/.footprint +++ b/procps/.footprint @@ -3,25 +3,44 @@ drwxr-xr-x root/root bin/ drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/sysctl.conf drwxr-xr-x root/root lib/ --rwxr-xr-x root/root lib/libproc-3.2.8.so +lrwxrwxrwx root/root lib/libprocps.so.0 -> libprocps.so.0.0.1 +-rwxr-xr-x root/root lib/libprocps.so.0.0.1 drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/sysctl drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/free -rwxr-xr-x root/root usr/bin/pgrep -lrwxrwxrwx root/root usr/bin/pkill -> pgrep +-rwxr-xr-x root/root usr/bin/pkill -rwxr-xr-x root/root usr/bin/pmap -rwxr-xr-x root/root usr/bin/pwdx --rwxr-xr-x root/root usr/bin/skill -rwxr-xr-x root/root usr/bin/slabtop -lrwxrwxrwx root/root usr/bin/snice -> skill -rwxr-xr-x root/root usr/bin/tload -rwxr-xr-x root/root usr/bin/top -rwxr-xr-x root/root usr/bin/uptime -rwxr-xr-x root/root usr/bin/vmstat -rwxr-xr-x root/root usr/bin/w -rwxr-xr-x root/root usr/bin/watch +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/proc/ +-rw-r--r-- root/root usr/include/proc/alloc.h +-rw-r--r-- root/root usr/include/proc/devname.h +-rw-r--r-- root/root usr/include/proc/escape.h +-rw-r--r-- root/root usr/include/proc/procps.h +-rw-r--r-- root/root usr/include/proc/pwcache.h +-rw-r--r-- root/root usr/include/proc/readproc.h +-rw-r--r-- root/root usr/include/proc/sig.h +-rw-r--r-- root/root usr/include/proc/slab.h +-rw-r--r-- root/root usr/include/proc/sysinfo.h +-rw-r--r-- root/root usr/include/proc/version.h +-rw-r--r-- root/root usr/include/proc/wchan.h +-rw-r--r-- root/root usr/include/proc/whattime.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libprocps.a +-rwxr-xr-x root/root usr/lib/libprocps.la +lrwxrwxrwx root/root usr/lib/libprocps.so -> ../../lib/libprocps.so.0.0.1 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/libprocps.pc drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/free.1.gz @@ -30,9 +49,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/pmap.1.gz -rw-r--r-- root/root usr/man/man1/ps.1.gz -rw-r--r-- root/root usr/man/man1/pwdx.1.gz --rw-r--r-- root/root usr/man/man1/skill.1.gz -rw-r--r-- root/root usr/man/man1/slabtop.1.gz --rw-r--r-- root/root usr/man/man1/snice.1.gz -rw-r--r-- root/root usr/man/man1/tload.1.gz -rw-r--r-- root/root usr/man/man1/top.1.gz -rw-r--r-- root/root usr/man/man1/uptime.1.gz diff --git a/procps/.md5sum b/procps/.md5sum index a97fd77..1f119c0 100644 --- a/procps/.md5sum +++ b/procps/.md5sum @@ -1,4 +1,2 @@ -d47bdc30ef97d52659929acfed49c3cf procps-3.2.8-linux-ver-init.patch -46e344e5ebc243d185a6abd708430ac8 procps-3.2.8.patch -9532714b6846013ca9898984ba4cd7e0 procps-3.2.8.tar.gz +a236660cc09ad36e0e8a378f448161c3 procps_3.3.3.orig.tar.xz 9875c218e1b14bee8f9f5800403a8a24 sysctl.conf diff --git a/procps/Pkgfile b/procps/Pkgfile index 16088ff..eb3e078 100644 --- a/procps/Pkgfile +++ b/procps/Pkgfile @@ -5,25 +5,36 @@ # Depends on: ncurses name=procps -version=3.2.8 -release=3 -source=(http://procps.sourceforge.net/$name-$version.tar.gz \ - sysctl.conf \ - $name-$version.patch \ - $name-$version-linux-ver-init.patch) +version=3.3.3 +release=1 +source=(http://ftp.de.debian.org/debian/pool/main/p/$name/${name}_$version.orig.tar.xz \ + sysctl.conf) build() { - cd $name-$version - patch -p1 -i $SRC/$name-$version.patch - patch -p0 -i $SRC/$name-$version-linux-ver-init.patch + cd $name-ng-$version + + cat > config.cache << EOF +ac_cv_func_malloc_0_nonnull=yes +ac_cv_func_realloc_0_nonnull=yes +EOF + + ./configure --build=$CHOST \ + --host=$CTARGET \ + --prefix=/usr \ + --exec-prefix=/ \ + --libdir=/usr/lib \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --disable-kill \ + --cache-file=config.cache make - make DESTDIR=$PKG \ - ldconfig=true \ - man1=$PKG/usr/man/man1/ \ - man5=$PKG/usr/man/man5/ \ - man8=$PKG/usr/man/man8/ \ - install + make DESTDIR=$PKG install + + install -d $PKG/{lib,etc} + mv $PKG/usr/lib/libprocps.so.* $PKG/lib + ln -sf ../../lib/$(readlink $PKG/lib/libprocps.so.0) $PKG/usr/lib/libprocps.so + install -m 0644 $SRC/sysctl.conf $PKG/etc/sysctl.conf - install -D -m644 ../sysctl.conf $PKG/etc/sysctl.conf + rm -r $PKG/usr/share } -- 2.26.2