- Pacman-dev - lists.archlinux.org

[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%2Barch(a)gmail.com> <Daenyth%2BArch(a)gmail.com> @@ -10,6 +12,7 @@ Daenyth Blank <Daenyth%2Barch(a)gmail.com> <Daenyth%2Bgit(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

[pacman-dev] [PATCH 2/2] doc: update PKGBUILD man page
by Allan McRae 02 Feb '13

02 Feb '13

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> --- doc/PKGBUILD.5.txt | 97 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index b48f0a7..688ce8a 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -280,62 +280,61 @@ A normal sync or upgrade will not use its value. When used in combination with the `strip' option, a separate package containing the debug symbols is created. -build() Function ----------------- -In addition to the above directives, the optional build() function usually -comprises the remainder of the PKGBUILD. This is directly sourced and executed -by makepkg, so anything that bash or the system has available is available for -use here. The function is run in `bash -e` mode, meaning any command that exits -with a non-zero status will cause the function to exit. Be sure any exotic -commands used are covered by `makedepends`. -All of the above variables such as `$pkgname` and `$pkgver` are available for use -in the build function. In addition, makepkg defines the following three -variables for use during the build and install process: +Packaging Functions +------------------- + +In addition to the above directives, PKGBUILDs require a set of functions that +provide instructions to build and install the package. As a minimum, the PKGBUILD +must contain a package() function which installs all the package's files into the +packaging directory, with optional prepare(), build() and check() being used to +create those files from source. + +*package() Function*:: + The package() function is used to install files into the directory that + will become the root directory of the built package and is run after all + the optional functions listed below. When specified in combination with + the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage + will be limited to running the packaging stage. All other functions will + be run as the user calling makepkg. + +*prepare() Function*:: + An optional prepare() function can be specified in which operations that + are to be run in order to prepare the sources for building (such as + patching) are performed. This function is run after the source extraction + and before the build() function and is skipped when source extraction is + skipped. + +*build() Function*:: + The optional build() function is use to compile and/or adjust the source + files in preparation to be installed by the package() function. This is + directly sourced and executed by makepkg, so anything that bash or the + system has available is available for use here. Be sure any exotic + commands used are covered by `makedepends`. ++ +If you create any variables of your own in the build function, it is +recommended to use the bash `local` keyword to scope the variable to inside +the build function. -*startdir*:: - This contains the absolute path to the directory where the PKGBUILD is - located, which is usually the output of `$(pwd)` when makepkg is started. - Use of this variable is deprecated and strongly discouraged. +*check() Function*:: + An optional check() function can be specified in which a package's + test-suite may be run. This function is run between the build() and + package() functions. Be sure any exotic commands used are covered by + `checkdepends`. + +All of the above variables such as `$pkgname` and `$pkgver` are available for use +in the build function. In addition, makepkg defines the following variables for use +during the build and install process: *srcdir*:: - This contains the directory where makepkg extracts, or copies, all source - files. + This contains the directory where makepkg extracts, or copies, all sourc + files. *pkgdir*:: - This contains the directory where makepkg bundles the installed package - (this directory will become the root directory of your built package). - -If you create any variables of your own in the build function, it is -recommended to use the bash `local` keyword to scope the variable to inside -the build function. + This contains the directory where makepkg bundles the installed package + (this directory will become the root directory of your built package). + This variable should only be used in the package() function. -prepare() Function ------------------- -An optional prepare() function can be specified in which operations that are -to be run in order to prepare the sources for building (such as patching) are -performed. This function is run after the source extraction and before the -build() function and is skipped when source extraction is skipped. The -function is run in `bash -e` mode, meaning any command that exits with a -non-zero status will cause the function to exit. - -check() Function ----------------- -An optional check() function can be specified in which a packages test-suite -may be run. This function is run between the build() and package() functions. -The function is run in `bash -e` mode, meaning any command that exits with a -non-zero status will cause the function to exit. Be sure any exotic commands -used are covered by `checkdepends`. - -package() Function ------------------- -An optional package() function can be specified in addition to the build() -function. This function is run after the build() and check() functions. The -function is run in `bash -e` mode, meaning any command that exits with a -non-zero status will cause the function to exit. When specified in combination -with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage -will be limited to running the packaging stage. An existing build() function -will be run as the user calling makepkg. Package Splitting ----------------- -- 1.8.1.2

2 3

[pacman-dev] [PATCH 0/2] Fix up $pkgdir
by Allan McRae 02 Feb '13

02 Feb '13

As was noted by Martin a couple of days ago, $pkgdir could take bad values in the build() function. This corrects those values to something more sensible and makes $pkgdir inaccessible before packaging starts. The usage of $pkgdir and all the packaging functions is clarified in the man page. I can not wait for pacman-4.1 to be out so I can delete all the code required to support packages without a package() function... Would anyone mind removing building without fakeroot or as root too? That makes the packaging section of makepkg so much more difficult... Allan McRae (2): makepkg: make $pkgdir non-accessible during build() doc: update PKGBUILD man page doc/PKGBUILD.5.txt | 97 +++++++++++++++++++++++++-------------------------- scripts/makepkg.sh.in | 42 ++++++++++++---------- 2 files changed, 72 insertions(+), 67 deletions(-) -- 1.8.1.2

1 0