February 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-547-gc0835ff
by allan＠archlinux.org 07 Feb '13

07 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via c0835ff08e3228c748c57784869401d50421930c (commit) via defa56155828c3f8c8fb5a08a90190532aed2ca9 (commit) via fc0ec7644ca55f16c81b2f037cfccbfe79679019 (commit) via 2d832adf08ea428a956cf9e070a347fc01fb67de (commit) via 2f137fdd39d1441f961757ccb1f1e6f6670ac72a (commit) via 1631255357c248ed827c14ce51e3648c74d0adbf (commit) via ec339969d9479d21256ac3954d9292fa83f9a017 (commit) via 7956441350f0de11394de9afdcf95a54d608bc47 (commit) via 5c5cdb0eb964e1806c868e4deb84afa04c13bb75 (commit) via f170a94c137d355cfebb7d1623b685f34a09081b (commit) via 274c3890b07bdb6faae7bbbd7535f73c26565f24 (commit) via 529cf928ab10050fb43935f5065f5052496438aa (commit) via 66171822295741fea7d00500ca4924c187f7bb4c (commit) via 7edd262a060c508a3a08b73dc18158eeac16c053 (commit) via 05d83c46fd0ae6fce3e220dd77d113cb448e068f (commit) via 33b3b6d9b854687f0fc3030eba134aad1485546f (commit) from 3aece8f0eedd703349bcd7bd6bf4b221d9f5775c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c0835ff08e3228c748c57784869401d50421930c Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 5 11:35:47 2013 +1000 Additions to .mailmap Standardize on the most common name for email addresses with multiple name variants. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit defa56155828c3f8c8fb5a08a90190532aed2ca9 Author: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Date: Sun Feb 3 14:46:05 2013 +1000 Document fakeroot and fakechroot as dependencies Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fc0ec7644ca55f16c81b2f037cfccbfe79679019 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 3 14:36:53 2013 +1000 Remove outdated instructions in pactest README Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d832adf08ea428a956cf9e070a347fc01fb67de Author: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Date: Thu Jan 31 22:24:23 2013 -0500 Remove conditional checks for fakechroot from test files We don't want test files to do any checks for fakechroot since we will print a warning if it is not found. Signed-off-by: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2f137fdd39d1441f961757ccb1f1e6f6670ac72a Author: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Date: Thu Jan 31 22:24:22 2013 -0500 Print a warning if fakechroot is not found Fixes FS#33551. Signed-off-by: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1631255357c248ed827c14ce51e3648c74d0adbf Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Feb 2 10:16:19 2013 -0500 use strtok_r to parse multi-value config options This prevents multiple spaces between values from being parsed as empty values. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ec339969d9479d21256ac3954d9292fa83f9a017 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 29 21:38:48 2013 -0500 document that stdin must not be a tty to read from it Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7956441350f0de11394de9afdcf95a54d608bc47 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 2 19:58:50 2013 +1000 Better error message with "-" is specified without stdin Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5c5cdb0eb964e1806c868e4deb84afa04c13bb75 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 2 12:40:01 2013 +1000 doc: update PKGBUILD man page Rearrange the functions section of the PKGBUILD man package. Clarify that the package() function is a requirement and the rest are all optional. Note that $pkgdir should only be used in the package() function. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f170a94c137d355cfebb7d1623b685f34a09081b Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 2 12:13:41 2013 +1000 makepkg: make $pkgdir non-accessible during build() The idea of having separate build() and package() functions is that build() is run as a normal uses and package() as (fake)root. Any files placed in $pkgdir during build() can have the wrong permissions. Restrict access to $pkgdir during build() - unless there is no package() function. Also, set $pkgdir to something "useful" during build(). For split packages, this uses "<path>/pkg/$pkgbase" because it is not obvious which $pkgdir is being referred to. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 274c3890b07bdb6faae7bbbd7535f73c26565f24 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Jan 30 20:33:09 2013 -0500 make test/scripts/human_to_size.sh executable Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 529cf928ab10050fb43935f5065f5052496438aa Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 29 21:23:31 2013 -0500 add missing utilities to contrib/README Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 66171822295741fea7d00500ca4924c187f7bb4c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 29 21:23:30 2013 -0500 unset executable bit on updpkgsums.sh.in No other contrib script is executable. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7edd262a060c508a3a08b73dc18158eeac16c053 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jan 29 09:25:18 2013 -0500 inline libarchive compat wrappers Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 05d83c46fd0ae6fce3e220dd77d113cb448e068f Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 5 10:55:55 2013 +1000 Document LocalFileSigLevel and RemoteFileSigLevel Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 33b3b6d9b854687f0fc3030eba134aad1485546f Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 22 20:19:18 2011 +1000 Add configuration option for Upgrade operation SigLevel Add LocalFileSigLevel and RemoteFileSigLevel to control the signature checking for "pacman -U <file>" and "pacman -U <url>" operations respectively. The starting value for both these options is SigLevel, if it is specified in the [options] section, or the built-in system default. The specified values override and/or supplement this initial value. Note there is no distinction between setting "Required" and "PackageRequired" as there are no database options for Upgrade operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .mailmap | 4 ++ contrib/README | 18 +++++-- doc/PKGBUILD.5.txt | 101 ++++++++++++++++++++------------------ doc/pacman.8.txt | 4 +- doc/pacman.conf.5.txt | 8 +++ lib/libalpm/Makefile.am | 2 +- lib/libalpm/alpm.h | 9 ++++ lib/libalpm/handle.c | 52 +++++++++++++++++--- lib/libalpm/handle.h | 4 ++ lib/libalpm/libarchive-compat.c | 65 ------------------------ lib/libalpm/libarchive-compat.h | 60 ++++++++++++++++++---- scripts/makepkg.sh.in | 42 +++++++++------- src/pacman/conf.c | 67 +++++++++++++++++++++---- src/pacman/conf.h | 2 + src/pacman/pacman.c | 95 ++++++++++++++++++----------------- src/pacman/upgrade.c | 21 ++++++-- test/pacman/README | 23 +++------ test/pacman/pmtest.py | 4 +- test/pacman/tests/scriptlet001.py | 4 -- test/pacman/tests/scriptlet002.py | 4 -- 20 files changed, 354 insertions(+), 235 deletions(-) mode change 100755 => 100644 contrib/updpkgsums.sh.in delete mode 100644 lib/libalpm/libarchive-compat.c mode change 100644 => 100755 test/scripts/human_to_size_test.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Document LocalFileSigLevel and RemoveFileSigLevel
by Allan McRae 05 Feb '13

05 Feb '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman.conf.5.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index f003db9..45a3383 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -155,6 +155,14 @@ Options Set the default signature verification level. For more information, see <<SC,Package and Database Signature Checking>> below. +LocalFileSigLevel =* ...:: + Set the signature verification level for installing packages using the "-U" + operation on a local file. Uses the value from SigLevel as the default. + +RemoteFileSigLevel =* ...:: + Set the signature verification level for installing packages using the "-U" + operation on a remote file URL. Uses the value from SigLevel as the default. + *UseSyslog*:: Log action messages through syslog(). This will insert log entries into +{localstatedir}/log/messages+ or equivalent. -- 1.8.1.2

2 1

[pacman-dev] [PATCH] Additions to .mailmap
by Allan McRae 05 Feb '13

05 Feb '13

Standardize on the most common name for email addresses with multiple name variants. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- .mailmap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.mailmap b/.mailmap index c3f8ce2..431ef9a 100644 --- a/.mailmap +++ b/.mailmap @@ -3,6 +3,8 @@ Allan McRae <allan(a)archlinux.org> <mcrae_allan(a)hotmail.com> Allan McRae <allan(a)archlinux.org> <mcrae_allan at hotmail.com> Allan McRae <allan(a)archlinux.org> <allan.mcrae(a)qimr.edu.au> Andres P <aepd87(a)gmail.com> <stderr(a)mail.com> +Andrew Gregory <andrew.gregory.8(a)gmail.com> +Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Bryan Ischo <bryan(a)ischo.com> <bji-keyword-pacman.3644cb(a)www.ischo.com> Christos Nouskas <nous(a)archlinux.us> <nouskas(a)gmail.com> Daenyth Blank <daenyth+arch(a)gmail.com> <Daenyth+Arch(a)gmail.com> @@ -10,6 +12,7 @@ Daenyth Blank <Daenyth+arch(a)gmail.com> <Daenyth+git(a)gmail.com> Dave Reisner <dreisner(a)archlinux.org> <d(a)falconindy.com> 甘露(Gan Lu) <rhythm.gan(a)gmail.com> Giovanni Scafora <giovanni(a)archlinux.org> <linuxmania(a)gmail.com> +Jan Steffens <jan.steffens(a)gmail.com> Jaroslaw Swierczynski <swiergot(a)gmail.com> <swiergot(a)juvepoland.com> Jonathan Conder <j(a)skurvy.no-ip.org> <jonno.conder(a)gmail.com> Juan Pablo González Tognarelli <lord_jotape(a)yahoo.com.ar> @@ -25,6 +28,7 @@ Roman Kyrylych <roman(a)archlinux.org> <roman.kyrylych(a)gmail.com> Sebastian Nowicki <sebnow(a)gmail.com> <xilonmu(a)gmail.com> Vojtěch Gondžala <vojtech.gondzala(a)gmail.com> <vogo(a)seznam.cz> Vojtěch Gondžala <vojtech.gondzala(a)gmail.com> Vojtech Gondzala <vojtech.gondzala(a)gmail.com> +William Giokas <1007380(a)gmail.com> Xavier Chantry <shiningxc(a)gmail.com> Xavier Chantry <shiningxc(a)gmail.com> <chantry.xavier(a)gmail.com> Xavier Chantry <shiningxc(a)gmail.com> <xav(a)chantry.homelinux.org> -- 1.8.1.2

1 0

[pacman-dev] Upcoming merge and creating an 4.1rc?
by Allan McRae 05 Feb '13

05 Feb '13

Hi all, I am going to push this to master in the next day or two: https://projects.archlinux.org/users/allan/pacman.git/log/?h=merge After that, there is my patchset that adds the reading of key id from signatures and the improvements to the signature handling that brings. That will be the last large commit before we focus on getting 4.1 out the door. If there are any patches that have not made their way to my working branch, you should ping them on the mailing list soon... As the 4.1 development period has been so long and so many large changes have landed (approaching 500 commits!), I think it would be good to cut a testing release. At that point we can have a string freeze and get translations under way. Allan

1 0

[pacman-dev] [PATCH] Remove outdated instructions in pactest README
by Allan McRae 03 Feb '13

03 Feb '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/README | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/pacman/README b/test/pacman/README index e563379..ccf0d7f 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -55,14 +55,6 @@ Installation Simply extract the pactest tarball, jump into the newly created directory and run pactest.py. See the usage section below. -Remark: pacman 3.x restrictions regarding fakeroot must be disabled. -It can be done by configuring pacman with the --disable-fakeroot flag: - ./configure --disable-fakeroot - -For pacman 2.9.x releases, apply the patch found in the patches directory, -then export CFLAGS as following before rebuilding pacman: - export CFLAGS=-DNOFAKEROOT - Usage ===== -- 1.8.1.2

2 2

[pacman-dev] [PATCH] [pactest] Check for fakeroot in ldconfig tests
by Chirantan Ekbote 03 Feb '13

03 Feb '13

libalpm runs ldconfig inside chroot so we should expect failure when testing if fakechroot is not installed. Fixes FS#33551. Signed-off-by: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> --- test/pacman/tests/ldconfig001.py | 4 ++++ test/pacman/tests/ldconfig002.py | 4 ++++ test/pacman/tests/ldconfig003.py | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/test/pacman/tests/ldconfig001.py b/test/pacman/tests/ldconfig001.py index a97f28c..cbc4695 100644 --- a/test/pacman/tests/ldconfig001.py +++ b/test/pacman/tests/ldconfig001.py @@ -7,3 +7,7 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("FILE_EXIST=etc/ld.so.cache") + +fakechroot = util.which("fakechroot") +if not fakechroot: + self.expectfailure = True diff --git a/test/pacman/tests/ldconfig002.py b/test/pacman/tests/ldconfig002.py index 07f2ec6..2b5d833 100644 --- a/test/pacman/tests/ldconfig002.py +++ b/test/pacman/tests/ldconfig002.py @@ -11,3 +11,7 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-2") self.addrule("FILE_EXIST=etc/ld.so.cache") + +fakechroot = util.which("fakechroot") +if not fakechroot: + self.expectfailure = True diff --git a/test/pacman/tests/ldconfig003.py b/test/pacman/tests/ldconfig003.py index 9b2967e..40fcfb2 100644 --- a/test/pacman/tests/ldconfig003.py +++ b/test/pacman/tests/ldconfig003.py @@ -7,3 +7,7 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("FILE_EXIST=etc/ld.so.cache") + +fakechroot = util.which("fakechroot") +if not fakechroot: + self.expectfailure = True -- 1.8.1.2

3 9

[pacman-dev] [PATCH] use strtok_r to parse multi-value config options
by Andrew Gregory 02 Feb '13

02 Feb '13

This prevents multiple spaces between values from being parsed as empty values. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/conf.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 1bea2b0..d407296 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -373,17 +373,14 @@ static int process_cleanmethods(alpm_list_t *values, static void setrepeatingoption(char *ptr, const char *option, alpm_list_t **list) { - char *q; + char *val, *saveptr; - while((q = strchr(ptr, ' '))) { - *q = '\0'; - *list = alpm_list_add(*list, strdup(ptr)); - pm_printf(ALPM_LOG_DEBUG, "config: %s: %s\n", option, ptr); - ptr = q; - ptr++; + val = strtok_r(ptr, " ", &saveptr); + while(val) { + *list = alpm_list_add(*list, strdup(val)); + pm_printf(ALPM_LOG_DEBUG, "config: %s: %s\n", option, val); + val = strtok_r(NULL, " ", &saveptr); } - *list = alpm_list_add(*list, strdup(ptr)); - pm_printf(ALPM_LOG_DEBUG, "config: %s: %s\n", option, ptr); } static int _parse_options(const char *key, char *value, -- 1.8.1.2

3 3

[pacman-dev] [PATCH] Better error message with "-" is specified without stdin
by Allan McRae 02 Feb '13

02 Feb '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 95 ++++++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 44 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index f2465a8..38b28e1 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -809,54 +809,61 @@ int main(int argc, char *argv[]) } /* we support reading targets from stdin if a cmdline parameter is '-' */ - if(!isatty(fileno(stdin)) && alpm_list_find_str(pm_targets, "-")) { - size_t current_size = PATH_MAX; - char *vdata, *line = malloc(current_size); - - /* remove the '-' from the list */ - pm_targets = alpm_list_remove_str(pm_targets, "-", &vdata); - free(vdata); - - i = 0; - while((line[i] = (char)fgetc(stdin)) != EOF) { - if(isspace((unsigned char)line[i])) { - /* avoid adding zero length arg when multiple spaces separate args */ - if(i > 0) { - line[i] = '\0'; - pm_targets = alpm_list_add(pm_targets, strdup(line)); - i = 0; - } - } else { - i++; - /* we may be at the end of our allocated buffer now */ - if(i >= current_size) { - char *new = realloc(line, current_size * 2); - if(new) { - line = new; - current_size *= 2; - } else { - free(line); - line = NULL; - break; + if(alpm_list_find_str(pm_targets, "-")) { + if(!isatty(fileno(stdin))) { + size_t current_size = PATH_MAX; + char *vdata, *line = malloc(current_size); + + /* remove the '-' from the list */ + pm_targets = alpm_list_remove_str(pm_targets, "-", &vdata); + free(vdata); + + i = 0; + while((line[i] = (char)fgetc(stdin)) != EOF) { + if(isspace((unsigned char)line[i])) { + /* avoid adding zero length arg when multiple spaces separate args */ + if(i > 0) { + line[i] = '\0'; + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + } else { + i++; + /* we may be at the end of our allocated buffer now */ + if(i >= current_size) { + char *new = realloc(line, current_size * 2); + if(new) { + line = new; + current_size *= 2; + } else { + free(line); + line = NULL; + break; + } } } } - } - /* check for memory exhaustion */ - if(!line) { - pm_printf(ALPM_LOG_ERROR, _("memory exhausted in argument parsing\n")); - cleanup(EXIT_FAILURE); - } - /* end of stream -- check for data still in line buffer */ - if(i > 0) { - line[i] = '\0'; - pm_targets = alpm_list_add(pm_targets, strdup(line)); - } - free(line); - if(!freopen(ctermid(NULL), "r", stdin)) { - pm_printf(ALPM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), - strerror(errno)); + /* check for memory exhaustion */ + if(!line) { + pm_printf(ALPM_LOG_ERROR, _("memory exhausted in argument parsing\n")); + cleanup(EXIT_FAILURE); + } + + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + line[i] = '\0'; + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + free(line); + if(!freopen(ctermid(NULL), "r", stdin)) { + pm_printf(ALPM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), + strerror(errno)); + } + } else { + /* do not read stdin from terminal */ + pm_printf(ALPM_LOG_ERROR, _("argument '-' specified without input on stdin\n")); + cleanup(1); } } -- 1.8.1.2

1 0

[pacman-dev] [PATCH] Exit with failure status if download or installation is not confirmed
by Martin Panter 02 Feb '13

02 Feb '13

Original: https://github.com/vadmium/pacman-arch/commit/a1776b6.patch >From a1776b648faf36e1f1e88f5ee6cfca63af8fec3c Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Tue, 23 Oct 2012 13:32:56 +0000 Subject: [PATCH] Exit with failure status if download or installation is not confirmed --- src/pacman/sync.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 3decc40..417773d 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -871,6 +871,7 @@ int sync_prepare_execute(void) confirm = yesno(_("Proceed with installation?")); } if(!confirm) { + retval = 1; goto cleanup; } -- 1.7.10

2 3

[pacman-dev] [PATCH 1/2] makepkg: make $pkgdir non-accessible during build()
by Allan McRae 02 Feb '13

02 Feb '13

The idea of having separate build() and package() functions is that build() is run as a normal uses and package() as (fake)root. Any files placed in $pkgdir during build() can have the wrong permissions. Restrict access to $pkgdir during build() - unless there is no package() function. Also, set $pkgdir to something "useful" during build(). For split packages, this uses "<path>/pkg/$pkgbase" because it is not obvious which $pkgdir is being referred to. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bcc415b..ec39c2e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -152,7 +152,7 @@ clean_up() { # If it's a clean exit and -c/--clean has been passed... msg "$(gettext "Cleaning up...")" - rm -rf "$pkgdir" "$srcdir" + rm -rf "$pkgdirbase" "$srcdir" if [[ -n $pkgbase ]]; then local fullver=$(get_full_version) # Can't do this unless the BUILDSCRIPT has been sourced. @@ -1519,7 +1519,7 @@ tidy_install() { if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then warning "$(gettext "Package contains reference to %s")" "\$srcdir" fi - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdir}" ; then + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then warning "$(gettext "Package contains reference to %s")" "\$pkgdir" fi @@ -2344,16 +2344,14 @@ restore_package_variables() { run_split_packaging() { local pkgname_backup=${pkgname[@]} for pkgname in ${pkgname_backup[@]}; do - pkgdir="$pkgdir/$pkgname" - mkdir -p "$pkgdir" - chmod a-s "$pkgdir" + pkgdir="$pkgdirbase/$pkgname" + mkdir "$pkgdir" backup_package_variables run_package $pkgname tidy_install create_package create_debug_package restore_package_variables - pkgdir="${pkgdir%/*}" done pkgname=${pkgname_backup[@]} } @@ -2689,12 +2687,16 @@ epoch=${epoch:-0} if [[ $BUILDDIR = "$startdir" ]]; then srcdir="$BUILDDIR/src" - pkgdir="$BUILDDIR/pkg" + pkgdirbase="$BUILDDIR/pkg" else srcdir="$BUILDDIR/$pkgbase/src" - pkgdir="$BUILDDIR/$pkgbase/pkg" + pkgdirbase="$BUILDDIR/$pkgbase/pkg" + fi +# set pkgdir to something "sensible" for (not recommended) use during build() +pkgdir="$pkgdirbase/$pkgbase" + if (( GENINTEG )); then mkdir -p "$srcdir" chmod a-s "$srcdir" @@ -2767,9 +2769,10 @@ if (( INFAKEROOT )); then exit 0 # $E_OK fi + chmod 755 "$pkgdirbase" if (( ! SPLITPKG )); then - pkgdir="$pkgdir/$pkgname" - mkdir -p "$pkgdir" + pkgdir="$pkgdirbase/$pkgname" + mkdir "$pkgdir" if (( ! PKGFUNC )); then if (( ! REPKG )); then if (( BUILDFUNC )); then @@ -2786,7 +2789,6 @@ if (( INFAKEROOT )); then tidy_install create_package create_debug_package - pkgdir="${pkgdir%/*}" else run_split_packaging fi @@ -2881,7 +2883,7 @@ if (( NOEXTRACT )); then warning "$(gettext "Using existing %s tree")" "src/" elif (( REPKG )); then if (( ! PKGFUNC && ! SPLITPKG )) \ - && { [[ ! -d $pkgdir ]] || dir_is_empty "$pkgdir"; }; then + && { [[ ! -d $pkgdirbase ]] || dir_is_empty "$pkgdirbase"; }; then error "$(gettext "The package directory is empty, there is nothing to repackage!")" plain "$(gettext "Aborting...")" exit 1 @@ -2900,22 +2902,27 @@ if (( NOBUILD )); then exit 0 #E_OK else # check for existing pkg directory; don't remove if we are repackaging - if [[ -d $pkgdir ]] && (( ! REPKG || PKGFUNC || SPLITPKG )); then + if [[ -d $pkgdirbase ]] && (( ! REPKG || PKGFUNC || SPLITPKG )); then msg "$(gettext "Removing existing %s directory...")" "pkg/" - rm -rf "$pkgdir" + rm -rf "$pkgdirbase" fi - mkdir -p "$pkgdir" - chmod a-s "$pkgdir" + mkdir -p "$pkgdirbase" + chmod a-srwx "$pkgdirbase" cd_safe "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it if ! check_buildenv "fakeroot" "y" || (( EUID == 0 )); then if (( ! REPKG )); then + if (( ! ( SPLITPKG || PKGFUNC ) )); then + chmod 755 "$pkgdirbase" + mkdir "$pkgdir" + fi (( BUILDFUNC )) && run_build (( CHECKFUNC )) && run_check fi + chmod 755 "$pkgdirbase" if (( ! SPLITPKG )); then - pkgdir="$pkgdir/$pkgname" + pkgdir="$pkgdirbase/$pkgname" mkdir -p "$pkgdir" if (( PKGFUNC )); then run_package @@ -2926,7 +2933,6 @@ else tidy_install create_package create_debug_package - pkgdir="${pkgdir%/*}" else run_split_packaging fi -- 1.8.1.2

2 2