diff options
| author | Andrew Manison <amanison@byrd-vm.localdomain> | 2010-04-04 16:51:44 -0400 |
|---|---|---|
| committer | Andrew Manison <amanison@byrd-vm.localdomain> | 2010-04-04 16:51:44 -0400 |
| commit | c9214a0549042005267e97080de0cac812deb8ab (patch) | |
| tree | fe9ad881f0c93849647ec984a5f920ce45fac594 /main/procps | |
| parent | 8b35a9ab83a841ab17ead4606f647a3158c274fe (diff) | |
| download | aports-c9214a0549042005267e97080de0cac812deb8ab.tar.bz2 aports-c9214a0549042005267e97080de0cac812deb8ab.tar.xz | |
Changes to package builds to fix missing/changed/broken source archives.
Diffstat (limited to 'main/procps')
| -rw-r--r-- | main/procps/01-fix-install-options-for-busybox.patch | 65 | ||||
| -rw-r--r-- | main/procps/APKBUILD | 13 |
2 files changed, 75 insertions, 3 deletions
diff --git a/main/procps/01-fix-install-options-for-busybox.patch b/main/procps/01-fix-install-options-for-busybox.patch new file mode 100644 index 000000000..792a78155 --- /dev/null +++ b/main/procps/01-fix-install-options-for-busybox.patch @@ -0,0 +1,65 @@ +--- orig/procps-3.2.8/Makefile ++++ src/procps-3.2.8/Makefile +@@ -27,7 +27,7 @@ + ldconfig := ldconfig + ln_f := ln -f + ln_sf := ln -sf +-install := install -D --owner 0 --group 0 ++install := install -D -o 0 -g 0 + + # Lame x86-64 /lib64 and /usr/lib64 abomination: + lib64 := lib$(shell [ -d /lib64 ] && echo 64) +@@ -222,10 +222,10 @@ + ###### install + + $(BINFILES) : all +- $(install) --mode a=rx $(notdir $@) $@ ++ $(install) -m a=rx $(notdir $@) $@ + + $(MANFILES) : all +- $(install) --mode a=r $(notdir $@) $@ ++ $(install) -m a=r $(notdir $@) $@ + + install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) + cd $(usr/bin) && $(ln_f) skill snice +--- orig/procps-3.2.8/proc/module.mk ++++ src/procps-3.2.8/proc/module.mk +@@ -96,7 +96,7 @@ + #################### install rules ########################### + + $(lib)$(SOFILE) : proc/$(SONAME) +- $(install) --mode a=rx $< $@ ++ $(install) -m a=rx $< $@ + + ifneq ($(SOLINK),$(SOFILE)) + .PHONY: $(lib)$(SOLINK) +@@ -115,14 +115,14 @@ + $(ldconfig) + + $(usr/lib)$(ANAME) : proc/$(ANAME) +- $(install) --mode a=r $< $@ ++ $(install) -m a=r $< $@ + + # Junk anyway... supposed to go in /usr/include/$(NAME) + #INSTALL += $(addprefix $(include),$(HDRFILES)) + # + #$(addprefix $(include),$(HDRFILES)): $(include)% : proc/% + #$(include)% : proc/% +-# $(install) --mode a=r $< $@ ++# $(install) -m a=r $< $@ + + ################################################################## + +--- orig/procps-3.2.8/ps/module.mk ++++ src/procps-3.2.8/ps/module.mk +@@ -33,8 +33,8 @@ + + + $(bin)ps: ps/ps +- $(install) --mode a=rx $< $@ ++ $(install) -m a=rx $< $@ + + $(man1)ps.1 : ps/ps.1 +- $(install) --mode a=r $< $@ ++ $(install) -m a=r $< $@ + -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz diff --git a/main/procps/APKBUILD b/main/procps/APKBUILD index 83204ad1b..f0f169779 100644 --- a/main/procps/APKBUILD +++ b/main/procps/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=procps pkgver=3.2.8 -pkgrel=0 +pkgrel=1 pkgdesc="Utilities for monitoring your system and processes on your system" url="http://procps.sourceforge.net/" license="GPL LGPL" @@ -9,7 +9,13 @@ depends= # needs fancy install makedepends="ncurses-dev coreutils" subpackages="$pkgname-dev $pkgname-doc libproc" -source="http://$pkgname.sourceforge.net/$pkgname-$pkgver.tar.gz" +source="http://$pkgname.sourceforge.net/$pkgname-$pkgver.tar.gz + 01-fix-install-options-for-busybox.patch" + +prepare() { + cd "$srcdir" + patch -p1 -i "$srcdir"/01-fix-install-options-for-busybox.patch || return 1 +} build() { cd "$srcdir"/$pkgname-$pkgver @@ -30,4 +36,5 @@ libproc() { ln -s libproc-$pkgver.so "$subpkgdir"/lib/libproc.so } -md5sums="9532714b6846013ca9898984ba4cd7e0 procps-3.2.8.tar.gz" +md5sums="9532714b6846013ca9898984ba4cd7e0 procps-3.2.8.tar.gz +2b821e841acd08620789d5ffd19d58e9 01-fix-install-options-for-busybox.patch" |