- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Update NEWS for pacman-4.1
by Allan McRae 31 Jan '13

31 Jan '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- DRAFT! This assumes everything on my working branch will be committed for the 4.1 release. NEWS | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/NEWS b/NEWS index b0e9a1e..6e21b10 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,75 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +4.1.0 - check file properties when using -Qkk (FS#11091) + - add informational messages for optdepends installaion + status (FS#13035, FS#27116) + - add number suffix to pacsave files instead of overwriting + (FS#24192) + - improve needed key importing for Upgrade (FS#26520) + - add options to specify require signature level for + Upgrade operations (FS#26729) + - directory ownership can be queried + - allow wildcards in NpUpgrade, NoExtract, IgnorePkg, + IgnoreGroup and HoldPkg (FS#20360, FS#18988) + - remove -f short option for --force + - SyncFirst option has been removed (FS#26445) + - offer to delete downloaded packages failing signature check + (FS#28014) + - configure shell for running install scriptlets (FS#20557) + - speed up reading from archives + - improve speed when checking for directory removal + - more thorough checking for disk space availability + - display repo in VerbosePkgLists output (FS#26334) + - process all targets on Sync/Upgrade/Removal operations + to list all errors + - do not check file conflicts or diskspace with --dbonly + (FS#25667) + - specify a ratio in UseDelta + - handle descriptions for dependencies + - track how installed packages were validated (FS#28040) + - add pkg-config file for libalpm + - avoid false ownership matches for files in / (FS#30388) + - only load filesystem space information when needed + - allow leading "local/" in query options + - allow cleaing only some cachedirs + - do not remove source package and package databases from + cache (FS#25166) + - improve conflict checking with directory symlinks (FS#30681) + - remove Cygwin and Darwin (OSX) support + - makepkg: + - require bash>=4.0 + - support for VCS URLs (git, bzr, svn and hg) (FS#7816, + FS#8890, FS#13727, FS#15895, FS#16384, FS#16872, FS#19459, + FS#19476, FS#20841, FS#21098, FS#28605) + - split debugging symbols into seperate package (FS#10975) + - use SKIP in checksums to skip integrity check (FS#19735) + - add prepare() function to PKGBUILD (FS#30582) + - pkgrel must be in decimal format + - PKGBUILDs without package() functions are depricated + - support specifying CPPFLAGS in makepkg.conf + - support PACKAGER environmental variable + - allow source renaming to work on signature files + - libprovides and libdepends rewritten + - configurable compression options (FS#27430) + - allow multiple packages to be build when using + BUILDDIR (FS#28417) + - imporved option parsing + - add zsh completion + - add makedepends/checkdepends information to .PKGINFO + - url can be overridden in split packages + - allow wildcards in PURGE_TARGETS + - pass --asdep flag to pacman when installing + - use last match in BUILDEVN/OPTIONS arrays (FS#26701) + - fix "arch" handling in split packages (FS#27204) + - repo-add: + - honor TMPDIR environmental variable + - add makedepends/checkdepends information to database + - pacman-key: + - fix importing keys with quotes in file name (FS#28445) + - allow verification of multiple sig files + - add zsh completion (FS#29062) + - contrib: + - add updpkgsums 4.0.3 - frontend database cleanup enhancements (FS#28714) - frontend package cleanup enhancements (FS#25166) - back out changes related to SyncFirst in 4.0.0 -- 1.8.0

6 10

[pacman-dev] Error handling when removing packages
by Alexander Rødseth 31 Jan '13

31 Jan '13

Hi, In order to make up for igniting all the (unintended) discussions about quoting, I'm implementing two small TODO items in pacman, concerning error handling. Best regards, Alexander Rødseth <rodseth(a)gmail.com>

2 2

[pacman-dev] [PATCH] make test/scripts/human_to_size.sh executable
by Andrew Gregory 31 Jan '13

31 Jan '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/scripts/human_to_size_test.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 test/scripts/human_to_size_test.sh diff --git a/test/scripts/human_to_size_test.sh b/test/scripts/human_to_size_test.sh old mode 100644 new mode 100755 -- 1.8.1.2

1 0

[pacman-dev] [PATCH 1/2] unset executable bit on updpkgsums.sh.in
by Andrew Gregory 30 Jan '13

30 Jan '13

No other contrib script is executable. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- The scripts in test/scripts are also inconsistent, but I'm not sure whether they should be executable or not. contrib/updpkgsums.sh.in | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 contrib/updpkgsums.sh.in diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in old mode 100755 new mode 100644 -- 1.8.1.2

4 3

[pacman-dev] [PATCH] inline libarchive compat wrappers
by Dave Reisner 30 Jan '13

30 Jan '13

Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/Makefile.am | 2 +- .../{libarchive-compat.c => libarchive-compat.h} | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) rename lib/libalpm/{libarchive-compat.c => libarchive-compat.h} (76%) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 55fec9c..171bc46 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -44,7 +44,7 @@ libalpm_la_SOURCES = \ graph.h graph.c \ group.h group.c \ handle.h handle.c \ - libarchive-compat.h libarchive-compat.c \ + libarchive-compat.h \ log.h log.c \ package.h package.c \ pkghash.h pkghash.c \ diff --git a/lib/libalpm/libarchive-compat.c b/lib/libalpm/libarchive-compat.h similarity index 76% rename from lib/libalpm/libarchive-compat.c rename to lib/libalpm/libarchive-compat.h index 56af2e1..814d3b4 100644 --- a/lib/libalpm/libarchive-compat.c +++ b/lib/libalpm/libarchive-compat.h @@ -1,5 +1,8 @@ +#ifndef _LIBARCHIVE_COMPAT_H +#define _LIBARCHIVE_COMPAT_H + /* - * libarchive-compat.c + * libarchive-compat.h * * Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> * @@ -19,9 +22,7 @@ #include <stdint.h> -#include "libarchive-compat.h" - -int _alpm_archive_read_free(struct archive *archive) { +static inline int _alpm_archive_read_free(struct archive *archive) { #if ARCHIVE_VERSION_NUMBER >= 3000000 return archive_read_free(archive); #else @@ -29,7 +30,7 @@ int _alpm_archive_read_free(struct archive *archive) { #endif } -int64_t _alpm_archive_compressed_ftell(struct archive *archive) { +static inline int64_t _alpm_archive_compressed_ftell(struct archive *archive) { #if ARCHIVE_VERSION_NUMBER >= 3000000 return archive_filter_bytes(archive, -1); #else @@ -37,7 +38,7 @@ int64_t _alpm_archive_compressed_ftell(struct archive *archive) { #endif } -int _alpm_archive_read_open_file(struct archive *archive, +static inline int _alpm_archive_read_open_file(struct archive *archive, const char *filename, size_t block_size) { #if ARCHIVE_VERSION_NUMBER >= 3000000 return archive_read_open_filename(archive, filename, block_size); @@ -46,7 +47,7 @@ int _alpm_archive_read_open_file(struct archive *archive, #endif } -int _alpm_archive_filter_code(struct archive *archive) { +static inline int _alpm_archive_filter_code(struct archive *archive) { #if ARCHIVE_VERSION_NUMBER >= 3000000 return archive_filter_code(archive, 0); #else @@ -54,7 +55,7 @@ int _alpm_archive_filter_code(struct archive *archive) { #endif } -int _alpm_archive_read_support_filter_all(struct archive *archive) { +static inline int _alpm_archive_read_support_filter_all(struct archive *archive) { #if ARCHIVE_VERSION_NUMBER >= 3000000 return archive_read_support_filter_all(archive); #else @@ -63,3 +64,5 @@ int _alpm_archive_read_support_filter_all(struct archive *archive) { } /* vim: set ts=2 sw=2 noet: */ + +#endif /* _LIBARCHIVE_COMPAT_H */ -- 1.8.1.1

4 4

[pacman-dev] [PATCH] remove isatty check before reading from stdin
by Andrew Gregory 30 Jan '13

30 Jan '13

The old behavior is undocumented and we already require the user to explicitly request reading from stdin so we should oblige them whether stdin is a tty or not. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index e86b5c7..d9de556 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -809,7 +809,7 @@ 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, "-")) { + if(alpm_list_find_str(pm_targets, "-")) { size_t current_size = PATH_MAX; char *vdata, *line = malloc(current_size); -- 1.8.0

4 7

[pacman-dev] [PATCH 2/2] add missing utilities to contrib/README
by Andrew Gregory 30 Jan '13

30 Jan '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- contrib/README | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/contrib/README b/contrib/README index 04b656f..b9f6524 100644 --- a/contrib/README +++ b/contrib/README @@ -4,11 +4,14 @@ PKGBUILD.vim - a vim/gvim syntax file for PKGBUILDs. Colors known variable names, highlights common errors such as invalid characters in pkgname or pkgver, etc. +bacman - regenerate a pacman package based on installed files and the pacman +database entries. Useful for reuse, or possible config file extension. + bash_completion - a bash completion script for pacman, install in /etc/bash_completion.d/ for use (but rename to something descriptive!). -zsh_completion - a zsh completion script, install (with a rename) to -/usr/share/zsh/site-functions/. +paccache - a flexible package cache cleaning utility that allows greater +control over which packages are removed. pacdiff - a simple pacnew/pacorig/pacsave updater for /etc/. @@ -16,6 +19,8 @@ paclist - list all packages installed from a given repository. Useful for seeing which packages you may have installed from the testing repository, for instance. +paclog-pkglist - lists currently installs packages based pacman's log. + pacscripts - tries to print out the {pre,post}_{install,remove,upgrade} scripts of a given package. @@ -23,8 +28,13 @@ pacsearch - a colorized search combining both -Ss and -Qs output. Installed packages are easily identified with a *** and local-only packages are also listed. -bacman - regenerate a pacman package based on installed files and the pacman -database entries. Useful for reuse, or possible config file extension. +pacsysclean - lists installed packages sorted by size. + +rankmirrors - ranks pacman mirrors by their connection and opening speed. + +updpkgsums - performs an in place update of the checksums in a PKGBUILD. vimprojects - a project file for the vim project plugin. +zsh_completion - a zsh completion script, install (with a rename) to +/usr/share/zsh/site-functions/. -- 1.8.1.2

1 0