Commit dcd5b5be authored by Carlo Landmeter's avatar Carlo Landmeter

Merge commit 'ncopa/master'

parents f9e13216 a2e7b004
*.apk
*.gz
*.bz2
src
pkg
pkg-*
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
pkgver=1.8
pkgrel=0
url=http://dev.alpinelinux.org/cgit/cgit.cgi/abuild/
source="http://dev.alpinelinux.org/cgit/cgit.cgi/abuild/snapshot/abuild-$pkgver.tar.bz2
"
depends="fakeroot file sudo"
license=GPL-2
build() {
cd "$srcdir/$pkgname-$pkgver"
make install DESTDIR="$pkgdir"
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
}
md5sums="9e9365f749858b8ee98ebba3e337f8f6 abuild-1.8.tar.bz2"
pkgname=alpine-baselayout
pkgver=2.0_alpha3
pkgrel=0
pkgdesc="Alpine base dir structure and init scripts"
url=http://git.alpinelinux.org/cgit/alpine-baselayout
depends="uclibc"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
license=GPL-2
_gitname=$pkgname
_gitroot=git://dev.alpinelinux.org/$_gitname
build() {
cd "$srcdir"/$pkgname-$pkgver
# msg "Connecting to GIT server..."
# if [ -d $_gitname ]; then
# cd $_gitname && git pull
# else
# git clone $_gitroot
# fi
# cd $srcdir/$_gitname
# git checkout -b $pkgver @{`echo $pkgver | tr . -`} || return 1
make
make install PREFIX= DESTDIR="$pkgdir" || return 1
}
md5sums="2ecfbc1e70c0fdffa70bc9c3339ce01b alpine-baselayout-2.0_alpha3.tar.bz2"
pkgname=alpine-conf
pkgver=1.7.1
pkgdesc="Alpine configuration management scripts"
url=http://dev.alpinelinux.org/alpine/alpine-conf
source=http://dev.alpinelinux.org/alpine/$pkgname/$pkgname-$pkgver.tar.gz
license=gpl-2
build() {
cd "$srcdir/$pkgname-$pkgver"
make PREFIX= || return 1
make install PREFIX= DESTDIR="$pkgdir"
ln -s lbu "$pkgdir"/sbin/lbu_commit
ln -s lbu "$pkgdir"/sbin/lbu_exclude
ln -s lbu "$pkgdir"/sbin/lbu_include
ln -s lbu "$pkgdir"/sbin/lbu_status
ln -s lbu "$pkgdir"/sbin/lbu_update
}
md5sums="a64bea2e8a0de933bfed4c3ebecb88bc alpine-conf-1.7.1.tar.gz"
pkgname=alpine-sdk
pkgver=0.2
url=http://dev.alpinelinux.org/cgit
pkgdesc="Alpine Software Development Kit meta package"
depends="abuild build-base git"
license=GPL-2
build() {
# meta package
mkdir -p $pkgdir
}
pkgname=apk-tools
pkgver=2.0_pre7
pkgrel=0
pkgdesc="Alpine Package Keeper - package manager for alpine"
depends="uclibc"
makedepends="zlib-dev"
source="http://dev.alpinelinux.org/cgit/cgit.cgi/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
url="http://dev.alpinelinux.org/cgit/cgit.cgi/apk-tools/"
license=GPL-2
build() {
cd "$srcdir/$pkgname"
make
make DESTDIR="$pkgdir" install
cd "$pkgdir/sbin"
ln -s apk apk_add
ln -s apk apk_audit
ln -s apk apk_del
ln -s apk apk_index
ln -s apk apk_info
ln -s apk apk_version
}
md5sums="1fcfad238c148262dfe61874fe475f65 apk-tools-2.0_pre7.tar.bz2"
pkgname=autoconf
pkgver=2.63
pkgrel=1
pkgdesc="A GNU tool for automatically configuring source code"
arch=i486
license="GPL2 GPL3"
url="http://www.gnu.org/software/autoconf"
depends="m4 perl"
source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
subpackages="$pkgname-doc"
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr
make || return 1
make DESTDIR=${pkgdir} install || return 1
rm -f ${pkgdir}/usr/share/info/dir
# conflict with bintuils
rm -f ${pkgdir}/usr/share/info/standards.info
}
md5sums='43d76649fb86cd21d64f68c48d5abdcf autoconf-2.63.tar.gz'
pkgname=automake
pkgver=1.10.1
pkgrel=0
pkgdesc="A GNU tool for automatically creating Makefiles"
arch=i486
license=GPL
url="http://www.gnu.org/software/automake"
source=ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
makedepends="autoconf perl"
subpackages="$pkgname-doc"
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr
make || return 1
make DESTDIR=$pkgdir install
}
md5sums="a0acfd1b167ba55a256f0c1af2983975 automake-1.10.1.tar.gz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bash
_patchlevel=039
pkgver=3.2_p$_patchlevel
pkgrel=3
pkgdesc="The GNU Bourne Again shell"
license='GPL'
url="http://www.gnu.org/software/bash/bash.html"
makedepends="readline-dev ncurses-dev"
depends='readline ncurses uclibc'
source="http://ftp.gnu.org/gnu/bash/bash-3.2.tar.gz
bash-noinfo.patch
"
for _i in $(seq 1 $_patchlevel); do
# seq -w unsupported by busybox
_p=$(printf "%0.3i" $_i)
source="$source http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-$_p"
done
subpackages="$pkgname-doc"
build() {
local p
cd ${startdir}/src/${pkgname}-3.2
for p in ../bash32-??? ../*.patch; do
msg "applying patch ${p##*/}"
patch -p0 -i $p || return 1
done
./configure --prefix=/usr \
--with-curses \
--enable-readline \
--without-bash-malloc \
--with-installed-readline \
--bindir=/bin \
--mandir=/usr/share/man \
--infodir=/usr/share/info
make -j1 || return 1
make DESTDIR=${pkgdir} install
rm -r "$pkgdir"/usr/share/locale
}
md5sums="00bfa16d58e034e3c2aa27f390390d30 bash-3.2.tar.gz
80fec5f3d60a63756a4999c877e31a8e bash-noinfo.patch
d8e10c754f477e3f3a581af566b89301 bash32-001
d38a5288b2f0ea6c9ac76b66cc74ef7d bash32-002
0b90d37911827d8cb95f3b4353cc225e bash32-003
8062f3a59631f58d78b180d83759b68a bash32-004
585b5943fadf0875ced243b245adde58 bash32-005
1d5732e01ea938aeed42f3def131fa4d bash32-006
dcd0cc5d801607827f7c851e72b0eabc bash32-007
bb3c7dd11198c0ab93d0e960bebf6256 bash32-008
434a6f29b0ca5f1ab784b2437ae8eaed bash32-009
2efff04dd246fcf63bd4b99f77c9a081 bash32-010
1dd104342f6920dfaf5efb3131e922e0 bash32-011
4f24b696ab78bdfae4f9cb7eb59b835d bash32-012
7c40addbf1187a26ae1c8373ed383442 bash32-013
28e88c9f8679e99ac590d4a4a8227c56 bash32-014
7c17d29675bd0d49470f162774385f80 bash32-015
a1edaa98b4449fe2205fa75448b7b105 bash32-016
889ed119bbf9d363660b9a0127f35efa bash32-017
a7d3f85fa687d2c1b5a134839f6d395d bash32-018
f0399da4007e46fc5820ce25d07425b9 bash32-019
b76602281c3104d904fd064510fe0c21 bash32-020
923374ae4403c92820f711e62e1d01a5 bash32-021
c82d3bd14e373878b2a680dce18d1596 bash32-022
987c949a77b4b0ffe4a2597141e77635 bash32-023
5a2b976e761ab83f0fc7daae11451b86 bash32-024
08668dc2825f65eced9cac6b09ce1b45 bash32-025
f35b2b217f088ff009f956894550d41d bash32-026
b5ff2b9610c61290f773c4b02cc1a37d bash32-027
016f5b56c93404d32aea09385f0fc13e bash32-028
a81420626d4d88d0dce2ffac0ac56341 bash32-029
11f91baf970c132949f9072ee93f2ea6 bash32-030
f6bbc1e8ec0246740731c728ef476191 bash32-031
8180ec936770579bce69f0816c2dd878 bash32-032
3cec33c3711860c4c6b7614afeec7870 bash32-033
7bc6c5b5f38b7027152f8db0458a2e14 bash32-034
a2db61fe90e39371d0e6cd2285ec9208 bash32-035
95c70c7ae9de5bd3659c86284be7fb76 bash32-036
62b876a3d7cd192cc8db2476fbb6b7b9 bash32-037
aca3afc341bd3e5a0d8a3b4ca40dbb3f bash32-038
e240c34f979b64bcb83c5f6567110bb1 bash32-039"
diff -Naur doc/Makefile.in.orig doc/Makefile.in
--- doc/Makefile.in.orig 2004-07-27 05:57:48.000000000 -0700
+++ doc/Makefile.in 2005-02-11 22:44:49.000000000 -0800
@@ -220,7 +220,7 @@
$(SHELL) $(SUPPORT_SRCDIR)/mkinstalldirs $(DESTDIR)$(htmldir) ; \
fi
-install: info installdirs bash.info
+install: installdirs
-$(INSTALL_DATA) $(srcdir)/bash.1 $(DESTDIR)$(man1dir)/bash${man1ext}
-$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext}
# uncomment the next line to install the builtins man page
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bbsuid
pkgver=0.3
pkgrel=0
pkgdesc="Busybox SUID root application wrapper"
url="http://git.alpinelinux.org/cgit/bbsuid"
license="GPL-2"
depends="uclibc busybox"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
build() {
cd "$srcdir/$pkgname-$pkgver"
make || return 1
make install DESTDIR="$pkgdir"
}
md5sums="80bbdf219d82c9478d2080211fcd8ed1 bbsuid-0.3.tar.bz2"
#!/bin/sh
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=beecrypt
pkgver=4.1.2
pkgdesc="general-purpose cryptography library"
url="http://sourceforge.net/projects/beecrypt"
license="LGPL"
depends=uclibc
subpackages="$pkgname-dev"
source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-threads \
--enable-shared \
--without-java \
--without-python \
--without-cplusplus
make || return 1
make DESTDIR="$pkgdir" install
}
md5sums="820d26437843ab0a6a8a5151a73a657c beecrypt-4.1.2.tar.gz"
pkgname=binutils
pkgver=2.19.50.0.1
pkgdesc="Tools necessary to build programs"
url=http://sources.redhat.com/binutils
source=ftp://ftp.kernel.org/pub/linux/devel/binutils/$pkgname-$pkgver.tar.bz2
depends="uclibc zlib"
makedepends="bison flex texinfo zlib-dev"
license=GPL
subpackages="$pkgname-doc"
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
--mandir /usr/share/man \
--build ${CHOST:-i486-alpine-linux-uclibc}
--infodir /usr/share/info \
--enable-shared \
--enable-64-bit-bfd \
--disable-werror \
--disable-nls
# check build env
make configure-host || return 1
make || return 1
make install DESTDIR="$pkgdir"
}
md5sums="c71bf140587a5662bd1fa9d5a19556ed binutils-2.19.50.0.1.tar.bz2"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bison
pkgver=2.3
pkgrel=5
pkgdesc="The GNU general-purpose parser generator"
license="GPL"
url="http://www.gnu.org/software/bison/bison.html"
depends="uclibc m4"
source="ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.gz"
subpackages="$pkgname-doc"
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
--datadir=/usr/share \
--infodir=/usr/share/info \
--mandir=/usr/share/man
make || return 1
make DESTDIR="$pkgdir" install
}
md5sums='22327efdd5080e2b1acb6e560a04b43a bison-2.3.tar.gz'
pkgname=build-base
pkgver=0.1
url=http://dev.alpinelinux.org/cgit
pkgdesc="Meta package for build base"
depends="binutils gcc make patch uclibc-dev"
license=none
build() {
# meta package
mkdir -p "$pkgdir"
}
pkgname=busybox
pkgver=1.13.2
pkgrel=2
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
license=GPL-2
depends=uclibc
source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
$pkgname-1.12.1-vi-path.patch
$pkgname-1.11.1-bb.patch
busybox-1.13.2-depmod.patch
busybox-1.13.2-init.patch
busybox-1.13.2-mdev.patch
busybox-1.13.2-modprobe.patch
busybox-1.13.2-tar.patch
busyboxconfig"
build() {
cd $srcdir/$pkgname-$pkgver
#patches
for i in ../*.patch; do
msg "Applying $i"
if ! patch -p1 -i $i; then
error "$i failed"
return 1
fi
done
cp ../busyboxconfig .config
make silentoldconfig || return 1
make || return 1
make install DESTDIR=$pkgdir
}
md5sums="9e2a604d18bef219a5a6bf3acf78b9e1 busybox-1.13.2.tar.bz2
f5a8ae3145aa249868c1a1abc319c228 busybox-1.12.1-vi-path.patch
4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch
7c9dfb5dcd66a1d6e837e72ad0cb05d4 busybox-1.13.2-depmod.patch
7afb3a1b474742bc198b3c8450ab9a7e busybox-1.13.2-init.patch
a72d169e9545e26257032e0e367feb95 busybox-1.13.2-mdev.patch
6eeb6efcd71e57082d6654a9a6a368eb busybox-1.13.2-modprobe.patch
90d093817855bc63ad16fbb8524f80df busybox-1.13.2-tar.patch
7da47c98607834ca9c47a22bf3fe4b6e busyboxconfig"
diff -ru busybox-1.11.1.orig/shell/ash.c busybox-1.11.1/shell/ash.c
--- busybox-1.11.1.orig/shell/ash.c 2008-07-28 09:04:29 +0000
+++ busybox-1.11.1/shell/ash.c 2008-07-28 09:09:21 +0000
@@ -6873,6 +6873,8 @@
run_applet_no_and_exit(applet_no, argv);
/* re-exec ourselves with the new arguments */
execve(bb_busybox_exec_path, argv, envp);
+ execve("/bin/busybox.static",argv,envp);
+ execve("/bin/busybox",argv,envp);
/* If they called chroot or otherwise made the binary no longer
* executable, fall through */
}
--- busybox-1.12.1.orig/include/applets.h Tue Oct 14 08:10:32 2008
+++ busybox-1.12.1/include/applets.h Tue Oct 14 08:11:16 2008
@@ -389,7 +389,7 @@
USE_UUDECODE(APPLET(uudecode, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_UUENCODE(APPLET(uuencode, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_VCONFIG(APPLET(vconfig, _BB_DIR_SBIN, _BB_SUID_NEVER))
-USE_VI(APPLET(vi, _BB_DIR_BIN, _BB_SUID_NEVER))
+USE_VI(APPLET(vi, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_VLOCK(APPLET(vlock, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
USE_WATCH(APPLET(watch, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_WATCHDOG(APPLET(watchdog, _BB_DIR_SBIN, _BB_SUID_NEVER))
--- busybox-1.13.2/modutils/depmod.c Sun Nov 9 18:28:03 2008
+++ busybox-1.13.2-depmod/modutils/depmod.c Mon Jan 12 23:12:59 2009
@@ -33,7 +33,7 @@
enum {
ARG_a = (1<<0), /* All modules, ignore mods in argv */
ARG_A = (1<<1), /* Only emit .ko that are newer than modules.dep file */
- ARG_b = (1<<2), /* not /lib/modules/$(uname -r)/ but this base-dir */
+ ARG_b = (1<<2), /* base directory when modules are in staging area */
ARG_e = (1<<3), /* with -F, print unresolved symbols */
ARG_F = (1<<4), /* System.map that contains the symbols */
ARG_n = (1<<5) /* dry-run, print to stdout only */
@@ -57,7 +57,7 @@
*first = info;
info->dnext = info->dprev = info;
- info->name = xstrdup(fname);
+ info->name = xasprintf("/%s", fname);
info->modname = filename2modname(fname, NULL);
for (ptr = image; ptr < image + len - 10; ptr++) {
if (strncmp(ptr, "depends=", 8) == 0) {
@@ -123,44 +123,61 @@
}
}
+static void xfreopen_write(const char *file, FILE *f)
+{
+ if (freopen(file, "w", f) == NULL)
+ bb_perror_msg_and_die("can't open '%s'", file);
+}
+
int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int depmod_main(int argc UNUSED_PARAM, char **argv)
{
module_info *modules = NULL, *m, *dep;
- char *moddir_base = (char *)CONFIG_DEFAULT_MODULES_DIR;
+ const char *moddir_base = "/";
+ char *moddir, *version;
+ struct utsname uts;
int tmp;
getopt32(argv, "aAb:eF:n", &moddir_base, NULL);
argv += optind;
/* goto modules location */
+ xchdir(moddir_base);
/* If a version is provided, then that kernel version's module directory
* is used, rather than the current kernel version (as returned by
* "uname -r"). */
- xchdir(moddir_base);
- if (*argv && (sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3)) {
- xchdir(*argv++);
+ if (*argv && sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3) {
+ version = *argv++;
} else {
- struct utsname uts;
uname(&uts);
- xchdir(uts.release);