- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pkgdelta: use highest compression ratio when creating deltas with xdelta3
by Matthias Krüger 21 Mar '14

21 Mar '14

Looking how pkgdelta works, I found this line xdelta3 -q -f -s "$oldfile" "$newfile" "$deltafile" || ret=$? which seemed to be responsible for the actual delta generation, however man xdelta3 revealed that there were different compression levels (0-9) (not sure which one is default). To make it short, we could have had smaller deltas since pkgdelta was introduced! Examples: -9 16660K blender-12:2.69.c7ac0e-1_to_13:2.69.13290d-1-x86_64.delta default 17832K blender-12:2.69.c7ac0e-1_to_13:2.69.13290d-1-x86_64.delta -9 504K xbmc-12.3-10_to_12.3-11-x86_64.delta default 572K xbmc-12.3-10_to_12.3-11-x86_64.delta The attached patch adds the "-9" option to the line above. Side note: it might be even more advantageous to use bsdiff instead of xdelta3 comparing the /usr/bin/blender binaries of the above versions (12:2.69.c7ac0e-1 and 13:2.69.13290d-1) : xdelta3 10.4M xdelta3 -9 9.9M bsdiff 4.7M ,however bsdiff is only for direct diff creation, bsdiff foo1.pkg.tar.xz foo2.pkg.tar.xz will create a diff between the archives and not their contents, so that'd require further coding which I am unable to do (maybe someone else volunteers :) ). Kind regards, Matthias

4 11

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-328-g912ea36
by allan＠archlinux.org 13 Mar '14

13 Mar '14

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 912ea363dec9038e9226a619364e16709720cac3 (commit) via d8ee8d0c99c3820951e2e49dbdb71a5390bd1dc4 (commit) via 61ba5c961e4a3536c4bbf41edb348987a9993fdb (commit) via ce3fbcb18d176d45df0c0f54299022e55509595f (commit) via 204158682910556b3e5e53906dcfaf063ab0e195 (commit) via 87b0818246984295399c0b612abf9514695ae473 (commit) via ffdc2c5396903ec0dd2b7ab4623f7f7674827885 (commit) via f3a280bc67c0f2e7b57f3772599f989b0df4d945 (commit) via 2e9602716c4586ccb1b54eda4718f4dd53399f99 (commit) via 2330a6458976f20e6039ddbb5a0e00ea939b392a (commit) via 1afddd74a978631ff4f15d450b96d66e7af1e768 (commit) from e6ff63076390141f2606babda627e5e053462456 (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 912ea363dec9038e9226a619364e16709720cac3 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Wed Mar 5 10:45:21 2014 +0100 makepkg: Reorder some entries in usage() and getopts Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8ee8d0c99c3820951e2e49dbdb71a5390bd1dc4 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 8 20:46:21 2014 +1000 makepkg: enforce fakeroot usage Packaging outside of fakeroot can result in incorrect permissions for package files. It has been years since fakeroot issues during packaging were common, so it is safe to enforce fakeroot usage. If using fakeroot is impossible for some reason, a two line wrapper script will suffice to fool makepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 61ba5c961e4a3536c4bbf41edb348987a9993fdb Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 8 20:31:46 2014 +1000 makepkg: Remove --asroot option The days of fakeroot being error ridden are long gone, so there is no valid reason to run makepkg as root. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ce3fbcb18d176d45df0c0f54299022e55509595f Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Mon Mar 3 20:29:54 2014 +0100 makepkg: Add a --noarchive option to inhibit archive creation 1. Packagers who want to test the package() function, i.e. to check the content of the pkg/ folder. 2. Developers who want to check how the packaged version of a program looks, in other words how the pkg/ folder looks. 3. For users of systems with no port tree, makepkg can ease package creation. However the resulting archive of the whole makepkg process is often useless. For all situations, makepkg will usually be called several times. But no archive (the final package) is needed in any cases. The archive creation ends up being a waste of time and resource, especially for big applications and slow machines. Since this option aborts the process prematurely, it behaves like the -o,--nobuild option, i.e. any other option acting on later stages in the process will be automatically discarded. For --noarchive, it means that in $ makepkg --noarchive --install the '--install' option does not do anything. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 204158682910556b3e5e53906dcfaf063ab0e195 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Wed Mar 5 10:45:22 2014 +0100 makepkg: Comment on install_package() return code Previously, install_package() return code was either used as exit code or ignored. This was rather confusing. The return code is now always ignored and a comment on install_package() has been added. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 87b0818246984295399c0b612abf9514695ae473 Author: Matthias Krüger <matthias.krueger(a)famsik.de> Date: Thu Mar 6 01:25:59 2014 +0100 note that TotalDownload and XferCommand are incompatible. Another small patch that I made long ago (but was too lazy to submit back then). When using XferCommand, TotalDownload option is not take into account. Regards, Matthias >From bff946cd9969b6bc6243875e0759f0ee02e487de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger(a)famsik.de> Date: Thu, 9 May 2013 13:21:04 +0200 Subject: [PATCH] doc: pacman.conf: note that TotalDownload and XferCommand options are incompatible. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matthias Krüger <matthias.krueger(a)famsik.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ffdc2c5396903ec0dd2b7ab4623f7f7674827885 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 8 16:58:30 2014 +1000 Use MALLOC throughtout libalpm Use MALLOC instead of malloc for safety in libalpm. Some changes are pure refactoring, but for others this provides a success check for memory allocation. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f3a280bc67c0f2e7b57f3772599f989b0df4d945 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 3 18:29:10 2014 -0500 remove check for unused ALPM_ERR_PKG_IGNORED alpm_add_pkg does not ignore packages. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2e9602716c4586ccb1b54eda4718f4dd53399f99 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 3 18:29:09 2014 -0500 simplify check for leading "local/" Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2330a6458976f20e6039ddbb5a0e00ea939b392a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 3 18:29:08 2014 -0500 sync_prepare: ignore explicitly removed conflicts Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1afddd74a978631ff4f15d450b96d66e7af1e768 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Mar 3 20:14:45 2014 +1000 Fix install order in scripts Makefile We need to use install-exec-hook instead of install-data-hook to make sure the hook is run after the installation of the scripts into $BINDIR. ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 10 ++--- doc/makepkg.conf.5.txt | 5 +-- doc/pacman.conf.5.txt | 1 + etc/makepkg.conf.in | 5 +-- lib/libalpm/be_local.c | 6 +-- lib/libalpm/be_package.c | 8 ++-- lib/libalpm/pkghash.c | 5 +-- lib/libalpm/sync.c | 6 ++- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 113 +++++++++++++++++------------------------------ src/pacman/remove.c | 9 ++-- src/pacman/sync.c | 5 +-- 12 files changed, 65 insertions(+), 110 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2] pacman/upgrade: Check malloc() return value
by Sören Brinkmann 12 Mar '14

12 Mar '14

Check the return value of malloc() before dereferencing the returned pointer. Signed-off-by: Sören Brinkmann <soeren.brinkmann(a)gmail.com> --- v2: - add print statement to log the error --- src/pacman/upgrade.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 5416f6180b39..11da4dcb5e53 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -51,6 +51,10 @@ int pacman_upgrade(alpm_list_t *targets) */ for(i = targets; i; i = alpm_list_next(i)) { int *r = malloc(sizeof(int)); + if(r == NULL) { + pm_printf(ALPM_LOG_ERROR, _("memory exhausted\n")); + return 1; + } if(strstr(i->data, "://")) { char *str = alpm_fetch_pkgurl(config->handle, i->data); -- 1.9.0

2 4

[pacman-dev] [PATCH 2/2] makepkg: enforce fakeroot usage
by Allan McRae 08 Mar '14

08 Mar '14

Packaging outside of fakeroot can result in incorrect permissions for package files. It has been years since fakeroot issues during packaging were common, so it is safe to enforce fakeroot usage. If using fakeroot is impossible for some reason, a two line wrapper script will suffice to fool makepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 5 +---- etc/makepkg.conf.in | 5 ++--- scripts/makepkg.sh.in | 59 ++++++++++---------------------------------------- 3 files changed, 15 insertions(+), 54 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 9bb384e..b15f026 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -85,16 +85,13 @@ Options **DEBUG_CXXFLAGS=**"debug_cxxflags":: Debug flags used for the C++ compiler; see DEBUG_CFLAGS for more info. -**BUILDENV=(**fakeroot !distcc color !ccache check !sign**)**:: +**BUILDENV=(**!distcc color !ccache check !sign**)**:: This array contains options that affect the build environment; the defaults are shown here. All options should always be left in the array; to enable or disable an option, simply remove or add an ``!'' at the front of the option. If an option is specified multiple times, the final value takes precedence. Each option works as follows: - *fakeroot*;; - Allow building packages as a non-root user. This is highly recommended. - *distcc*;; Use the distributed C/C++/ObjC compiler to spread compilation among multiple machines. If this is enabled, `DISTCC_HOSTS` must be specified diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 43a6cf2..712ca60 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -41,17 +41,16 @@ CHOST="@CHOST@" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign) +# Defaults: BUILDENV=(!distcc color !ccache check !sign) # A negated environment option will do the opposite of the comments below. # -#-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation #-- check: Run the check() function if present in the PKGBUILD #-- sign: Generate PGP signature file # -BUILDENV=(fakeroot !distcc color !ccache check !sign) +BUILDENV=(!distcc color !ccache check !sign) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3107943..905fe0d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1827,7 +1827,7 @@ write_pkginfo() { msg2 "$(gettext "Generating %s file...")" ".PKGINFO" printf "# Generated by makepkg %s\n" "$makepkg_version" - (( INFAKEROOT )) && printf "# using %s\n" "$(fakeroot -v)" + printf "# using %s\n" "$(fakeroot -v)" printf "# %s\n" "$(LC_ALL=C date -u)" printf "pkgname = %s\n" "$pkgname" (( SPLITPKG )) && printf "pkgbase = %s\n" "$pkgbase" @@ -2312,7 +2312,7 @@ check_software() { local ret=0 # check for PACMAN if we need it - if (( ! INFAKEROOT && ( ! NODEPS || DEP_BIN || RMDEPS || INSTALL ) )); then + if (( ! NODEPS || DEP_BIN || RMDEPS || INSTALL )); then if [[ -z $PACMAN_PATH ]]; then error "$(gettext "Cannot find the %s binary required for dependency operations.")" "$PACMAN" ret=1 @@ -2320,16 +2320,16 @@ check_software() { fi # check for sudo if we will need it during makepkg execution - if (( ! INFAKEROOT && ( DEP_BIN || RMDEPS || INSTALL ) )); then + if (( DEP_BIN || RMDEPS || INSTALL )); then if ! type -p sudo >/dev/null; then warning "$(gettext "Cannot find the %s binary. Will use %s to acquire root privileges.")" "sudo" "su" fi fi - # fakeroot - building as non-root user + # fakeroot - correct package file permissions if check_buildenv "fakeroot" "y" && (( EUID > 0 )); then if ! type -p fakeroot >/dev/null; then - error "$(gettext "Cannot find the %s binary required for building as non-root user.")" "fakeroot" + error "$(gettext "Cannot find the %s binary.")" "fakeroot" ret=1 fi fi @@ -2790,11 +2790,6 @@ if (( ! INFAKEROOT )); then error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ catastrophic damage to your system.")" exit 1 # $E_USER_ABORT - elif (( EUID > 0 )) && ! check_buildenv "fakeroot" "y"; then - warning "$(gettext "Running %s as an unprivileged user will result in non-root\n\ -ownership of the packaged files. Try using the %s environment by\n\ -placing %s in the %s array in %s.")" "makepkg" "fakeroot" "'fakeroot'" "BUILDENV" "$MAKEPKG_CONF" - sleep 1 fi else if [[ -z $FAKEROOTKEY ]]; then @@ -2956,12 +2951,7 @@ if (( SOURCEONLY )); then check_source_integrity 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 - create_srcpackage - else - enter_fakeroot - fi + enter_fakeroot msg "$(gettext "Source package created: %s")" "$pkgbase ($(date))" exit 0 @@ -3042,38 +3032,13 @@ else 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 -p "$pkgdir" - fi - (( BUILDFUNC )) && run_build - (( CHECKFUNC )) && run_check - fi - chmod 755 "$pkgdirbase" - if (( ! SPLITPKG )); then - pkgdir="$pkgdirbase/$pkgname" - mkdir -p "$pkgdir" - if (( PKGFUNC )); then - run_package - fi - tidy_install - create_package - create_debug_package - else - run_split_packaging - fi - else - if (( ! REPKG )); then - (( BUILDFUNC )) && run_build - (( CHECKFUNC )) && run_check - cd_safe "$startdir" - fi - - enter_fakeroot + if (( ! REPKG )); then + (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check + cd_safe "$startdir" fi + + enter_fakeroot fi # if inhibiting archive creation, go no further -- 1.9.0

3 3

[pacman-dev] [PATCH 1/3] makepkg: abort if signature verification fails due to a missing public key
by Thomas Bächler 08 Mar '14

08 Mar '14

--- scripts/makepkg.sh.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e230c15..4c235cf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1296,10 +1296,8 @@ check_pgpsigs() { printf '%s' "$(gettext "FAILED")" >&2 if ! pubkey=$(awk '/NO_PUBKEY/ { print $3; exit 1; }' "$statusfile"); then printf ' (%s)' "$(gettext "unknown public key") $pubkey" >&2 - warnings=1 - else - errors=1 fi + errors=1 printf '\n' >&2 else if grep -q "REVKEYSIG" "$statusfile"; then -- 1.9.0

2 6

[pacman-dev] [PATCH 1/2] makepkg: Remove --asroot option
by Allan McRae 08 Mar '14

08 Mar '14

The days of fakeroot being error ridden are long gone, so there is no valid reason to run makepkg as root. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 5 ----- scripts/makepkg.sh.in | 22 ++++++---------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 4b3cbbd..9547bc8 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -35,11 +35,6 @@ your logs and output are not localized. Options ------- -*\--asroot*:: - Allow makepkg to run as root. This is for security purposes as it is - normally dangerous to do so. This will also disable use of fakeroot and - sudo. - *-A, \--ignorearch*:: Ignore a missing or incomplete arch field in the build script. This is for rebuilding packages from source when the PKGBUILD may be slightly diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a07942..3107943 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -60,7 +60,6 @@ known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512') # Options ASDEPS=0 -ASROOT=0 BUILDFUNC=0 CHECKFUNC=0 CLEANBUILD=0 @@ -1006,7 +1005,7 @@ run_pacman() { else cmd=("$PACMAN_PATH" "$@") fi - if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then + if [[ ! $1 = -@(T|Qq) ]]; then if type -p sudo >/dev/null; then cmd=(sudo "${cmd[@]}") else @@ -2321,7 +2320,7 @@ check_software() { fi # check for sudo if we will need it during makepkg execution - if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then + if (( ! INFAKEROOT && ( DEP_BIN || RMDEPS || INSTALL ) )); then if ! type -p sudo >/dev/null; then warning "$(gettext "Cannot find the %s binary. Will use %s to acquire root privileges.")" "sudo" "su" fi @@ -2536,7 +2535,6 @@ usage() { printf -- "$(gettext " -V, --version Show version information and exit")\n" printf -- "$(gettext " --allsource Generate a source-only tarball including downloaded sources")\n" printf -- "$(gettext " --verifysource Download source files (if needed) and perform integrity checks")\n" - printf -- "$(gettext " --asroot Allow %s to run as root user")\n" "makepkg" printf -- "$(gettext " --check Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" printf -- "$(gettext " --holdver Do not update VCS sources")\n" @@ -2587,7 +2585,7 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsSV" -OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' +OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' @@ -2612,7 +2610,6 @@ while true; do # Makepkg Options --allsource) SOURCEONLY=2 ;; - --asroot) ASROOT=1 ;; -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; -C|--cleanbuild) CLEANBUILD=1 ;; @@ -2789,16 +2786,9 @@ PACKAGER=${_PACKAGER:-$PACKAGER} CARCH=${_CARCH:-$CARCH} if (( ! INFAKEROOT )); then - if (( EUID == 0 && ! ASROOT )); then - # Warn those who like to live dangerously. - error "$(gettext "Running %s as root is a BAD idea and can cause permanent,\n\ -catastrophic damage to your system. If you wish to run as root, please\n\ -use the %s option.")" "makepkg" "--asroot" - exit 1 # $E_USER_ABORT - elif (( EUID > 0 && ASROOT )); then - # Warn those who try to use the --asroot option when they are not root - error "$(gettext "The %s option is meant for the root user only. Please\n\ -rerun %s without the %s flag.")" "--asroot" "makepkg" "--asroot" + if (( EUID == 0 )); then + error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ +catastrophic damage to your system.")" exit 1 # $E_USER_ABORT elif (( EUID > 0 )) && ! check_buildenv "fakeroot" "y"; then warning "$(gettext "Running %s as an unprivileged user will result in non-root\n\ -- 1.9.0

1 0

[pacman-dev] [PATCHv3 1/3] makepkg: Add a --noarchive option to inhibit archive creation
by Pierre Neidhardt 08 Mar '14

08 Mar '14

1. Packagers who want to test the package() function, i.e. to check the content of the pkg/ folder. 2. Developers who want to check how the packaged version of a program looks, in other words how the pkg/ folder looks. 3. For users of systems with no port tree, makepkg can ease package creation. However the resulting archive of the whole makepkg process is often useless. For all situations, makepkg will usually be called several times. But no archive (the final package) is needed in any cases. The archive creation ends up being a waste of time and resource, especially for big applications and slow machines. Since this option aborts the process prematurely, it behaves like the -o,--nobuild option, i.e. any other option acting on later stages in the process will be automatically discarded. For --noarchive, it means that in $ makepkg --noarchive --install the '--install' option does not do anything. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- doc/makepkg.8.txt | 5 +++++ scripts/makepkg.sh.in | 22 +++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 77a7a83..4b3cbbd 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -165,6 +165,11 @@ Options Run the check() function in the PKGBUILD, overriding the setting in linkman:makepkg.conf[5]. +*\--noarchive*:: + Do not create the archive at the end of the build process. This can be + useful to test the package() function or if your target distribution does + not use pacman. + *\--nocheck*:: Do not run the check() function in the PKGBUILD or handle the checkdepends. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e230c15..9d2b43f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -74,6 +74,7 @@ INFAKEROOT=0 INSTALL=0 LOGGING=0 NEEDED=0 +NOARCHIVE=0 NOBUILD=0 NODEPS=0 NOEXTRACT=0 @@ -1868,6 +1869,8 @@ write_pkginfo() { } create_package() { + (( NOARCHIVE )) && return + if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing %s directory.")" "\$pkgdir/" plain "$(gettext "Aborting...")" @@ -2403,7 +2406,7 @@ check_build_status() { fullver=$(get_full_version) pkgarch=$(get_pkg_arch) if [[ -f $PKGDEST/${pkgname}-${fullver}-${pkgarch}${PKGEXT} ]] \ - && ! (( FORCE || SOURCEONLY || NOBUILD )); then + && ! (( FORCE || SOURCEONLY || NOBUILD || NOARCHIVE)); then if (( INSTALL )); then warning "$(gettext "A package has already been built, installing existing package...")" install_package @@ -2425,7 +2428,7 @@ check_build_status() { allpkgbuilt=0 fi done - if ! (( FORCE || SOURCEONLY || NOBUILD )); then + if ! (( FORCE || SOURCEONLY || NOBUILD || NOARCHIVE)); then if (( allpkgbuilt )); then if (( INSTALL )); then warning "$(gettext "The package group has already been built, installing existing packages...")" @@ -2537,6 +2540,7 @@ usage() { printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" printf -- "$(gettext " --holdver Do not update VCS sources")\n" printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg" + printf -- "$(gettext " --noarchive Do not create archive")\n" printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" @@ -2582,10 +2586,11 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsSV" + OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' - 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' - 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' 'rmdeps' - 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' + 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' + 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' + 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options @@ -2623,6 +2628,7 @@ while true; do --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; + --noarchive) NOARCHIVE=1 ;; --nocheck) RUN_CHECK='n' ;; --noprepare) RUN_PREPARE='n' ;; --nosign) SIGNPKG='n' ;; @@ -3080,6 +3086,12 @@ else fi fi +# if inhibiting archive creation, go no further +if (( NOARCHIVE )); then + msg "$(gettext "Package folder is ready.")" + exit 0 +fi + fullver=$(get_full_version) msg "$(gettext "Finished making: %s")" "$pkgbase $fullver ($(date))" -- 1.9.0

2 7

[pacman-dev] [PATCH] pacman/upgrade: Check malloc() return value
by Sören Brinkmann 08 Mar '14

08 Mar '14

Check the return value of malloc() before dereferencing the returned pointer. Signed-off-by: Sören Brinkmann <soeren.brinkmann(a)gmail.com> --- src/pacman/upgrade.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 5416f6180b39..19aa17218ce4 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -51,6 +51,9 @@ int pacman_upgrade(alpm_list_t *targets) */ for(i = targets; i; i = alpm_list_next(i)) { int *r = malloc(sizeof(int)); + if(r == NULL) { + return 1; + } if(strstr(i->data, "://")) { char *str = alpm_fetch_pkgurl(config->handle, i->data); -- 1.9.0

2 4

[pacman-dev] [PATCH] note that TotalDownload and XferCommand are incompatible.
by Matthias Krüger 08 Mar '14

08 Mar '14

Another small patch that I made long ago (but was too lazy to submit back then). When using XferCommand, TotalDownload option is not take into account. Regards, Matthias

2 1

[pacman-dev] [RFC] makepkg: Introduce acceptkeys array
by Thomas Bächler 08 Mar '14

08 Mar '14

If acceptkeys is set in the PKGBUILD, signature checking fails if the fingerprint of the key used to create the signature is not listed in the array. Failure to verify the signature due to a missing public key is also treated as an error instead of a warning. --- scripts/makepkg.sh.in | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e230c15..40c5b48 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1250,7 +1250,7 @@ check_pgpsigs() { msg "$(gettext "Verifying source file signatures with %s...")" "gpg" - local file pubkey ext decompress found + local file pubkey ext decompress found success local warning=0 local errors=0 local statusfile=$(mktemp) @@ -1296,7 +1296,11 @@ check_pgpsigs() { printf '%s' "$(gettext "FAILED")" >&2 if ! pubkey=$(awk '/NO_PUBKEY/ { print $3; exit 1; }' "$statusfile"); then printf ' (%s)' "$(gettext "unknown public key") $pubkey" >&2 - warnings=1 + if (( ${#acceptkeys[@]} > 0 )); then + errors=1 + else + warnings=1 + fi else errors=1 fi @@ -1306,13 +1310,25 @@ check_pgpsigs() { printf '%s (%s)' "$(gettext "FAILED")" "$(gettext "the key has been revoked.")" >&2 errors=1 else - printf '%s' "$(gettext "Passed")" >&2 - if grep -q "EXPSIG" "$statusfile"; then - printf ' (%s)' "$(gettext "WARNING:") $(gettext "the signature has expired.")" >&2 - warnings=1 - elif grep -q "EXPKEYSIG" "$statusfile"; then - printf ' (%s)' "$(gettext "WARNING:") $(gettext "the key has expired.")" >&2 - warnings=1 + success=1 + if (( ${#acceptkeys[@]} > 0 )); then + pubkey=$(grep VALIDSIG "$statusfile" | sed -nr 's/.* VALIDSIG ([A-Z0-9]*) .*/\1/p;' | awk '{print tolower($0)}') + if ! in_array $pubkey ${acceptkeys[@]}; then + printf '%s' "$(gettext "FAILED")" >&2 + printf " ($(gettext 'the fingerprint %s is not accepted.'))" "$pubkey" >&2 + success=0 + errors=1 + fi + fi + if (( $success )); then + printf '%s' "$(gettext "Passed")" >&2 + if grep -q "EXPSIG" "$statusfile"; then + printf ' (%s)' "$(gettext "WARNING:") $(gettext "the signature has expired.")" >&2 + warnings=1 + elif grep -q "EXPKEYSIG" "$statusfile"; then + printf ' (%s)' "$(gettext "WARNING:") $(gettext "the key has expired.")" >&2 + warnings=1 + fi fi fi printf '\n' >&2 @@ -2809,7 +2825,7 @@ fi unset pkgname pkgbase pkgver pkgrel epoch pkgdesc url license groups provides unset md5sums replaces depends conflicts backup source install changelog build -unset makedepends optdepends options noextract +unset makedepends optdepends options noextract acceptkeys BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} if [[ ! -f $BUILDFILE ]]; then -- 1.9.0

2 2