wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-08 08:03:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

debootstrap: verify signatures, patch for --include=sysvinit-core --exclude=systemd-sysv,systemd

Browse source
This commit is contained in:
Christian Neukirchen 2014-11-19 20:37:32 +01:00
parent e5bdea0d1e
commit e38eef278f
2 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
srcpkgs/debootstrap/files/bug-668001.patch Normal file
View file

@ -0,0 +1,39 @@
--- usr/bin/debootstrap 2014-09-25 13:44:06.000000000 +0900
+++ usr/bin/debootstrap 2014-10-17 11:57:17.000000000 +0900
@@ -50,7 +50,7 @@
DEF_MIRROR="http://ftp.us.debian.org/debian"
DEF_HTTPS_MIRROR="https://mirrors.kernel.org/debian"
-export LANG USE_COMPONENTS
+export LANG USE_COMPONENTS EXCLUDE
umask 022
###########################################################################
--- usr/share/debootstrap/functions 2014-09-15 18:23:00.000000000 +0900
+++ usr/share/debootstrap/functions 2014-10-17 11:57:59.000000000 +0900
@@ -1171,6 +1171,8 @@
perl -e '
$prevpkg = "";
@d = ();
+my %exclude;
+$exclude{$_} = 1 for split(" ", $ENV{"EXCLUDE"});
while (<STDIN>) {
chomp;
if (/^Package: (.*)$/) {
@@ -1187,9 +1189,13 @@
$in = 0 if (/^$/);
if ($in and (/^Depends: (.*)$/ or /^Pre-Depends: (.*)$/)) {
for $d (split /\s*,\s*/, $1) {
- $d =~ s/\s*[|].*$//;
- $d =~ s/\s*[(].*[)]\s*//;
- push @d, $d;
+ for $p (split /\s*\|\s*/, $d) {
+ $p =~ s/\s*[(].*[)]\s*//;
+ if (!$exclude{$p}) {
+ push @d, $p;
+ last;
+ }
+ }
}
}
}

14
srcpkgs/debootstrap/template
View file

@ -1,20 +1,24 @@
# Template file for 'debootstrap' # Template file for 'debootstrap'
pkgname=debootstrap pkgname=debootstrap
version=1.0.65 version=1.0.65
revision=1 revision=2
build_style=fetch build_style=fetch
depends="wget" depends="wget gnupg"
short_desc="Bootstrap a basic Debian system" short_desc="Bootstrap a basic Debian system"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>" maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="custom" license="custom"
homepage="http://packages.qa.debian.org/d/debootstrap.html" homepage="http://packages.qa.debian.org/d/debootstrap.html"
update_ignore="*~*" update_ignore="*~*"
distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb" distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
checksum=72c797416b0f04cd846ff1099e5ecb0aa47d01e4b688585e237d597b2c1746bc ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2014.1_all.deb"
checksum="72c797416b0f04cd846ff1099e5ecb0aa47d01e4b688585e237d597b2c1746bc
baae1c8253416575180ce8a1d2de3a21bd6a82c31bc89b2ec0bff0406531e9f1"
do_install() { do_install() {
ar p ${pkgname}_${version}_all.deb data.tar.xz | tar xJf - -C ${DESTDIR} ar p ${pkgname}_${version}_all.deb data.tar.xz | tar xvJf - -C ${DESTDIR}
ar p debian-archive-keyring_2014.1_all.deb data.tar.xz | tar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg
mv ${DESTDIR}/usr/sbin ${DESTDIR}/usr/bin mv ${DESTDIR}/usr/sbin ${DESTDIR}/usr/bin
patch -d ${DESTDIR} -Np0 <${FILESDIR}/bug-668001.patch
sed -i 's|export PATH|export PATH="/usr/sbin:/sbin:/usr/bin:/bin"|' ${DESTDIR}/usr/bin/debootstrap sed -i 's|export PATH|export PATH="/usr/sbin:/sbin:/usr/bin:/bin"|' ${DESTDIR}/usr/bin/debootstrap
vlicense ${DESTDIR}/usr/share/doc/debootstrap/copyright LICENSE vlicense ${DESTDIR}/usr/share/doc/debootstrap/copyright LICENSE
rm ${DESTDIR}/usr/share/doc/debootstrap/copyright rm ${DESTDIR}/usr/share/doc/debootstrap/copyright