- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] distribute library/term_colors.sh
by Allan McRae 10 Mar '13

10 Mar '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- So... it appears we need to look at the output of "make dist" rather than relying on return code. scripts/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index c3c1d73..784b180 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -29,7 +29,8 @@ LIBRARY = \ library/output_format.sh \ library/parseopts.sh \ library/human_to_size.sh \ - library/size_to_human.sh + library/size_to_human.sh \ + library/term_colors.sh # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) -- 1.8.1.5

1 0

[pacman-dev] [PATCH] zsh completion: Add new makepkg opts
by William Giokas 10 Mar '13

10 Mar '13

Signed-off-by: William Giokas <1007380(a)gmail.com> --- Just adding in the options that were recently added to the makepkg completion. contrib/zsh_completion.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 0f39e81..8ad4a63 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -592,6 +592,8 @@ _makepkg_longopts=( '--noconfirm[do not ask for confirmation when resolving dependencies]' '--asdeps[Install packages as non-explicitly installed]' '--noprogressbar[Do not show a progress bar when downloading files]' + '--needed[Do not reinstall up-to-date packages]' + '--verifysource[Only download sources and verify checksums]' ) _makepkg(){ case $words[CURRENT] in -- 1.8.2.rc1.24.g06d67b8

1 0

[pacman-dev] [PATCH] makepkg: Add --verifysource to only download/verify source files
by Olivier Brunel 09 Mar '13

09 Mar '13

Because --noextract also implies to not download/verify source files, it wasn't possible to simply do that, without either extracting and/or building. (Note: --verifysource takes precedence over --noextract) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- doc/makepkg.8.txt | 5 +++++ scripts/makepkg.sh.in | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 498c79b..87d266b 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -65,6 +65,11 @@ Options then make a package out of the result. Keep in mind that creating a patch may be a better solution to allow others to use your PKGBUILD. +*\--verifysource*:: + For each source file in the source array of PKGBUILD, download the file + if required and perform the integrity checks. No extraction or build is + performed. + *-f, \--force*:: makepkg will not build a package if a built package already exists in the `PKGDEST` (set in linkman:makepkg.conf[5]) directory, which may diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..ce978b1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -68,6 +68,7 @@ INSTALL=0 NOBUILD=0 NODEPS=0 NOEXTRACT=0 +VERIFYSOURCE=0 RMDEPS=0 REPKG=0 LOGGING=0 @@ -2409,6 +2410,7 @@ usage() { printf -- "$(gettext " -s, --syncdeps Install missing dependencies with %s")\n" "pacman" printf -- "$(gettext " -S, --source Generate a source-only tarball without downloaded sources")\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" @@ -2459,7 +2461,7 @@ OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'nosign' 'pkg:' 'repackage' 'rmdeps' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'skippgpcheck' 'sign' - 'source' 'syncdeps' 'version') + 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') @@ -2508,6 +2510,7 @@ while true; do --sign) SIGNPKG='y' ;; -s|--syncdeps) DEP_BIN=1 ;; -S|--source) SOURCEONLY=1 ;; + --verifysource) VERIFYSOURCE=1 ;; -h|--help) usage; exit 0 ;; # E_OK -V|--version) version; exit 0 ;; # E_OK @@ -2885,7 +2888,7 @@ mkdir -p "$srcdir" chmod a-s "$srcdir" cd_safe "$srcdir" -if (( NOEXTRACT )); then +if (( NOEXTRACT && ! VERIFYSOURCE )); then warning "$(gettext "Using existing %s tree")" "src/" elif (( REPKG )); then if (( ! PKGFUNC && ! SPLITPKG )) \ @@ -2897,6 +2900,7 @@ elif (( REPKG )); then else download_sources check_source_integrity + (( VERIFYSOURCE )) && exit 0 # $E_OK extract_sources if (( PREPAREFUNC )); then run_prepare -- 1.8.1.4

3 5

[pacman-dev] [GIT] The official pacman repository annotated tag, v4.1.0rc1, created. v4.1.0rc1
by allan＠archlinux.org 09 Mar '13

09 Mar '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 annotated tag, v4.1.0rc1 has been created at 3bdf6e3ab4b74fd33e3ad431a73c86beca619da4 (tag) tagging 312e9252f4f74e26ad899950fbcb527d31760519 (commit) replaces v4.0.3 tagged by Allan McRae on Sun Mar 10 09:31:12 2013 +1000 - Log ----------------------------------------------------------------- 4.1.0rc1 - long time between releases... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRO8ZBAAoJEPmf/g/q6Zm9AXoH/22vi2TX5V5cAlL9ltqyOA7q uzpeYBatpYd4pncYzn24Z0wgtkHjOGtnnNUojrypQS350Ey9zTQOgQynDy3dN5HM 7RhoPPuQokfLaXkKNWKvrSXBqxdBYKZSTQqIhApwWLl85tXsXa5JRjteAeNDkPCR OYr1qNMjgaX59P53LwRWkq6b/vHy1BdZjy39pL7C53yMDuMCtzh7f8F6oujmf+MC +FadSgOj6fxv6wVKa+pSo5TFFcZB9Kofv3ldtn69szJ1prVNGP7feAfm6ARmZ8mL WNOrpyvzYD4MBzRK3/8K4J8w6UvvkYKfm1gyGMiOj9BDM78mOVVHuIY3Qxvb97M= =Un3y -----END PGP SIGNATURE----- Allan McRae (190): repo-add: Remove .tmp. prefix from output pacman: list all unknown targets on removal operation makepkg: Use SKIP in checksum to skip integrity check makepkg: calculate exact total file size be_package.c: fix compiler warning Allow specifying shell for running scriptlets Move ROOTDIR definition into config.h Reset errno before opening archive testpkg: set gpgdir Do not check for ALPM_ERR_PKG_INVALID_ARCH on remove operation Add gpgme m4 autoconf macro file makepkg: rework libprovides Update copyright years Use "mode" in _alpm_makepath_mode Point python shebangs at python2 Add information on how an installed package was validated Remove _alpm_csum Simplify package validation info output for sync packages makepkg: append pkgbase to BUILDDIR if specified makepkg: prevent issues with files starting with a hyphen makepkg: abort when failing to create BUILDDIR makepkg: the rhs in string comparisons should be quoted makepkg: use printf rather than echo to output variable makepkg: safely change directories Make selecting scriptlet shell work Check minimum required gpgme version Prefix alpm_pkgfrom_t members with ALPM_ makepkg: save and restore shopts when sourcing /etc/profile Add more warning flags makepkg: deal with overriden package arch properly makepkg: treat list of packages to be installed as an array makepkg: Be more consistent with missing program message Output "Packages" instead of "Targets" makepkg: fix package arch detection makepkg: Add CPPFLAGS support Define _FORTIFY_SOURCE in CPPFLAGS makepkg: write makedepends into .PKGINFO repo-add: add makedepends information makepkg: rework libdepends Create repo-remove symlink in scripts dir makepkg: allow url to be overridden in split packages makepkg: install deps with --repackage repo-add: add checkdepends information contrib: fix typo in PKGBUILD.vim Scripts testsuite output consistency Allow leading "local/" in query operations Add conflict for replacing owned empty directory Check empty subdirectory ownership contrib/bacman: fix package architecture in filename Do not enable _FORTIFY_SOURCE without optimization makepkg: remove unnecessary formatting contrib/updpkgsums: Fix error message Add pactest for empty subdirectory conflict pactest: conflict between directory and a file pactest: conflict between files having same effective path pactest: Do not remove symlink to directory if local package uses that path pactest: Do not remove symlink to directory if a to be installed package uses it Split _alpm_filelist_operation function makepkg: remove VCS package support makepkg: reorder source handling functions makepkg: add function to return download protocol makepkg: generalize download_sources makepkg: skip integrity checking early makepkg: allow using GIT source URLs makepkg: fix checksum generation with VCS sources makepkg: modify get_filename to handle VCS sources makepkg: modify get_filepath to handle VCS sources makepkg: provide mechanism for auto-updating pkgver makepkg: add support for SVN urls makepkg: rename myver makepkg: do not download VCS sources unless needed makepkg: add --holdver to control VCS source updating makepkg: only update pkgver when all sources are available makepkg: check pkgver validity after updating doc: Document using VCS sources in a PKGBUILD doc: document automatically updating the pkgver variable doc: Document using svn source url doc: Add --holdver information for makepkg makepkg: add hg url support makepkg: delay checking for build package with pkgver() Print repo being search for replaces in debug output Move important information up in -Si output pactest: allow running with valgrind from any directory Document system and user specific makepkg.conf Remove incorrect documentation for unlink_file Fix documentation typo pacman.8: remove redundant section makepkg: fix warnings with --noextract Fix typo in documentation Avoid interger overflow when calculating remaining line length makepkg: do not create hg working directory on checkout makepkg: check if hg and svn directories are non-empty before updating makepkg: do not embed timestamps in compressed manpages makepkg: always check makepkg.conf for match to download protocol makepkg: allow fragment to contain a "#" character makepkg: fix order of --help output makepkg: fix incorrect bracket usage m4/po.m4: Remove use of deprecated macro repo-add: quote filename for consistent output style doc: PKGBUILD.5 - fix output of bzr command makepkg: use last match in BUILDENV/OPTIONS array makepkg: print "SKIP" for signature checksums makepkg: deprecate PKGBUILDs without a package() function makepkg: save path to PACMAN and test availability makepkg: always run tidy_install on repackaging makepkg: add option to include debugging compiler flags makepkg: move debug symbol stripping to separate function makepkg: always use pkg/$pkgname as $pkgdir makepkg: strip debugging symbols into separate folder makepkg: output the name of the package being created makepkg: create package from stripped debug symbols makepkg: allow debug package suffix to be configurable makepkg: assign debugging symbol directory to a variable makepkg: install debug symbol packages if requested pactest: Provide a full filelist to the pactests that need it Detect inter-package conflicts between files and directories Add resolved_path to alpm_filelist_t Resolve file paths during inter-package conflict check Avoid upgrade conflict with unchanged effective path pactest: removal of packages with unmet dependencies pactest: variant of package removal due to unmet dependencies It turns out we do care about directories... Notify of removed package required as optdepend Display optdep install status in package query output Add "Optional for" to package information output Make alpm_pkg_find public Display install status of optdependencies Fix future signature timestamp warning Do not warn about missing database if being downloaded makepkg: add mtree file into package Extract .MTREE file into local package database Add internal functions for reading mtree file from local db Add public functions for accessing mtree data Move check function into its own file Separate checking a files existence into a function Basic running of pacman -Qkk to check mtree files Perform full checking of files with -Qkk Check "install" and "changelog" files for changes Check file types match before comparing properties Remove leading "./" from filenames in mtree file Update copyright year for 2013 Remove Cygwin support Remove checks for geteuid makepkg: use --apparent-size when du supports it doc: Fix section link in pacman-key man page Update Doxyfile Split common utility functions for libalpm and pacman Fix spacing in HACKING spacing example pacman-key: handle local signing of multiple keys Use execvp for running programs in chroot Do not use full path for ldconfig Do not require full path for scriptlet shell pmtest: resolve path to scriptlet shell Fix release dates Revert execvp and related commits pactest: handle non-default scriptlet shells Remove leading / for pactest paths Make path to ldconfig configurable Update "missing" file Add configuration option for Upgrade operation SigLevel Document LocalFileSigLevel and RemoteFileSigLevel makepkg: make $pkgdir non-accessible during build() doc: update PKGBUILD man page Better error message with "-" is specified without stdin Remove outdated instructions in pactest README Additions to .mailmap Make key_in_keychain available in library Move key importing into separate function Add function to extract key id from signatures Make decode_signature available to the library Check keys are in keyring before package validation Remove retry path from signature validation Prompt to delete packages with signature fails Import key if needed when installing package from file README: update with 4.0 -> 4.1 API changes Update NEWS for pacman-4.1 Skip reading sync db deltas files if UseDelta is unset Quieten the build process some more pacman: print version information in debug output makepkg: add lrzip compression support Fix compilation error on clang Fix --enable-warningflags Add format attributes to all required functions Fix gpgme detection Fix --without-gpgme build Fix registering database with non-gpgme builds Perform limited conflict checking with --force Do not resolve every local package filelist on remove bash_completion: update for color Bump to version 4.1.0rc1 Andrew Gregory (45): libalpm/remove.c - add doxygen pactree: consolidate both walk_deps functions pactree: show tree vertical "limbs" query_fileowner: break/continue pkgfile loop query_fileowner: remove resolve_path function query_fileowner: resolve root early query_fileowner: remove trailing '/' from targets query_fileowner: remove assumption that root is "/" query_fileowner, mdirname: add error checks pactree: fix --sync getopt value pactree: style last branch node differently pactree: unindent first limb Add _alpm_filelist_resolve _alpm_filelist_resolve: use original filenames where possible _alpm_filelist_resolve: add useful return code Fix overzealous package removal with unmet dependencies Plug various minor memory leaks query.c: simplify is_foreign query_fileowner: don't append '/' if path is "/" Allow querying directory ownership add doxygen comments to conflict.c add caller prefix to alpm_logaction paclog-pkglist: parse entries with caller info unset executable bit on updpkgsums.sh.in add missing utilities to contrib/README make test/scripts/human_to_size.sh executable document that stdin must not be a tty to read from it use strtok_r to parse multi-value config options README: update alpm options find_fileconflicts: reduce path resolution calls add alpm_logaction to API updates fix alpm_validation_t comment fix style violations fix off-by-one error in _alpm_filelist_resolve pmtest: install filesystem entries before packages use alpm_list_free on filelist intersection add fileconflict tests for cases with symlinks return resolved paths from filelist_intersection return resolved paths from filelist_difference use resolved_path for filelist_contains add SYMEXPORT to alpm_filelist_contains fix typos in pacman tests pmpkg: add missing directories to test packages testdb: pass empty local pkglist to alpm_checkdeps testdb: quote output substitutions Barbu Paul - Gheorghe (4): Fix wrong parameter name in alpm_db_update's signature fixed typo added coding standard removed the condition in alpm_db_set_servers since FREELIST is NULL safe Benedikt Morbach (3): Hook new optdepend structures up Add pactests for displaying optdep installation status Add pactest for "Optional for" output Chirantan Ekbote (4): makepkg: Integrate check_install into tidy_install Print a warning if fakechroot is not found Remove conditional checks for fakechroot from test files Document fakeroot and fakechroot as dependencies Christian Hesse (2): makepkg: allow specifying compression options makepkg: fix signing built package Dan McGee (143): _alpm_parsedate: use strtoll() to parse numeric value Introduce alpm_time_t type Extract a try_rename helper from extract_single_file() Move infrequently used path variables off the stack Convert MALLOC to actually call malloc() _alpm_archive_fgets: optimize EOL search diskspace: extract check_mountpoint() function Remove alpm_list_getdata wrapper function Merge branch 'maint' Fix some strict 32-bit gcc warnings Remove mcheck.h support Use puts() instead of no-op printf() where applicable Remove -f short option for --force Use fputs and putchar in callback progress display Merge branch 'maint' Make _alpm_filelist_contains() NULL-safe Large performance improvement for check for owned directories base64: don't compile base64_encode() function sync: extract build_payload() method from find_dl_candidates Hide empty columns in table package list display Merge branch 'maint' Merge branch 'maint' libalpm/util: two stat() related cleanups Merge branch 'maint' Add OPEN() and CLOSE() util macros libalpm/util: use low-level I/O for copyfile and checksum routines Convert package and database archive reads to use file descriptors Fix size reported in CALLOC allocation failure message libalpm/util: don't use sprintf to convert from bin to hex Merge branch 'maint' Merge branch 'maint' Remove unnecessary casts in callback code Add helper method for creating and opening archive object Merge branch 'maint' Update alpm_errno_t type to non-enum version repo-add: ensure path to LOCKFILE is always absolute repo-add: ensure database and signature files are always viewed in whole Merge branch 'maint' Add helper function for duplicating depends lists Merge branch 'maint' Add 'silent-rules' to automake setup in configure.ac Merge branch 'maint' Slight local database files reading optimization Move items around in the alpm handle struct Make automake generate silent rules by default Use automake verbose helpers in custom make rules pacman: process all targets on upgrade operation pacman: process all sync targets before exiting on error Calculate root length only once when checking for file conflicts Merge branch 'maint' Don't check diskspace when using --dbonly Add note to HACKING about operator spacing Rework package removal code be_package: be more explicit parsing key/value pairs Remove strtrim function from backend Merge branch 'maint' Convert strtrim/strlen paired calls to only strtrim Simplify hash function to a single multiplication Fix delta parsing Only compile delta regex once Convert get_update_timediff to integer return value contrib: add install rules for bash and zsh completion alpm_list_msort: inline alpm_list_nth() call Remove unnecessary counters in file removal code Minor optimization on likely sync package lookup pkghash improvements/modifications Merge branch 'maint' Use 32-bit wide integer type in PolarSSL code Clean up <inttypes.h> header inclusions Update sync database size estimation values testdb: check local database for duplicate files Fix segfaults on opening invalid archive files Merge branch 'maint' Reorder some operations in sig check for efficiency Allow UseDelta option to specify a delta ratio Merge branch 'maint' libalpm/deps.c: access trans flags directly Remove rmrf implementation from backend Merge branch 'maint' Remove last explicit include of config.h alpm.h: enum cleanups, comment formatting cleanup ALPM API adjustments for sanity and consistency Merge branch 'maint' Merge branch 'maint' Merge branch 'maint' pacman-optimize: standardize on openssl usage, only touch local/ Allow alpm_depend_t to have a description Merge branch 'maint' Minor format-string related cleanups Remove unnecessary path check from local database Extract a write_deps function from local database writing Prefer fputs/fputc over fprintf when writing local database Handle printing NULL correctly in table display Always display download size if it applies pactest: make OPTDEPEND rule look at non-description only Merge branch 'maint' Pass a file descriptor to getcols and flush_term_input Reduce calls to getcols Change table_display() to be static Drop bash 3.2 completion support bash_completion: complete pacman-key options right away Revert "makepkg: calculate exact total file size" Merge branch 'maint' Return more useful error codes on package open failures Various tweaks to support building with excessive GCC warning flags Add a new configure option for excessive compiler warning flags Merge branch 'maint' Merge remote-tracking branch 'dave/buildsys' Fix a signed overflow error on i686 with GCC 4.7.0 Fix issues with unintialized variable value usage Remove SyncFirst option Merge branch 'maint' Merge branch 'parse-opts' Merge branch 'maint' Split check steps in Makefile into multiple targets util/testdb: don't return crazy error values be_local: write all single-valued attributes first Pointer coding style cleanups Move short-lived realpath buffers to the stack Merge remote-tracking branch 'dave/buildsys' be_local: use the right length value for filename in all cases Convert ALLOC_FAIL macro into a function Ensure pre_upgrade scriptlet gets old package version doc: remove --recursive documentation for non-remove operations pacman-key: clarify messages, s/keychain/keyring/ docs: remove 'in the wild' section Update pacman-scripts message catalog Fix gettext usage in pkgdelta help instructions Merge branch 'maint' Merge branch 'maint' Add more debug logging to dir_belongsto_pkg() function Skip deltas and partial downloads in package cleanup Clean up exclusion list in sync cache cleanup Merge branch 'maint' Move filelist functions into separate source file Merge branch 'maint' Merge remote-tracking branch 'allan/working-split/vcs' Merge branch 'maint' Fix typo in acinclude.m4 fs_old_*flags Fix thinko in configure.ac CFLAGS empty checking util/pactree: correctly free the deps list in walk_deps() Use a defined constant in delta.c for num_matches Restore libarchive 2.8.x compatibility Daniel Wallace (12): add zsh completion to pacman-key zsh completion for makepkg zsh-completion: Allow use of names in pacman-key asdeps flag passed from makepkg to pacman zsh completion: add deptest and database zsh completion: fix stacked completion zsh completion: use consistent case statement style zsh completion: make sure all indentions are tabs zsh completion: add --color to completion zsh completion: fix doubling up of specific variables zsh completion: include flags that can be doubled zsh completion: add support for all longopts commands Danny George (2): Fixed missing asciidoc id Add a -n option to repo-add to only add new packages Dave Reisner (130): diskspace: add _alpm_check_downloadspace() diskspace: create static function mount_point_list_free dload: add pointer to server list for each payload sync: dont group sync records by repository sync: check for necessary disk space for download sync: move file download loop out of download_files pacman: show repo name in download prompt invert iteration order for ignoregroup add support for back end fnmatch'd options add fnmatch support for HoldPkg makepkg: split source elements when looking for sigs code syntax cleanup lib/conflict: save strlen call by reusing snprintf return delta: use regex substring matching sync: avoid checking file conflicts with --dbonly include config.h via Makefiles pacman/util: return size_t from strtrim pactree: update with new strtrim function pactree: cleanup register_syncs makepkg: abstract license check into separate function makepkg: check for license when creating srcpackage pacman-key: simplify trusted keyring iteration pacman-key: call gpg fewer times for revocation keys util: reduce pointer hell in _alpm_makepath_mode makepkg: enforce decimal format for pkgrel makepkg: avoid use of eval in run_pacman makepkg: use array instead of string makepkg.conf: enable curl's cookie engine for http makepkg: add missing newline from libprovides output makepkg: use proper array addition in libdeps makepkg: treat lib{provides,depends} returns as proper arrays pacman-key: verify TRUST_ULTIMATE keys as good buildsys: add pkg-config m4 macros buildsys: use pkg-config for openssl detection buildsys: use pkg-config for libarchive detection buildsys: use pkg-config for libcurl detection buildsys: cleanup gpgme compile time check buildsys: use AC_DEFINE for CYGWIN macro buildsys: define warning CFLAGS in separate var buildsys: cleanup libtool and autoconf initialization buildsys: move acinclude.m4 to m4/ buildsys: move autotools bloat to build-aux autoclean.sh: abide by POSIX shebang pacman-key: avoid use of tempfile in verify_sig makepkg: restrict usage of errexit to user functions makepkg: catch errors sourcing files makepkg: complain when the buildfile isn't writeable contrib: remove wget-xdelta from gitignore contrib: remove pactree make rule makepkg: restrict allowed characters in pkgname configure: avoid linking against libssl scripts/library: introduce parseopts makepkg: adopt parseopts for option parsing makepkg: allow specifying --pkg multiple times pacman-key: adopt parseopts for option parsing scripts: avoid dumping usage on parser fail bash_completion: update for changes to pacman-key scripts/library: remove parse_options pacman-key: allow verification of multiple sig files makepkg.8: remove bold from --pkg's optarg pacman-key: lookup keys before receiving contrib: use a separate build rule for bash scripts contrib: rename bash scripts: .in -> .sh.in validate bash scripts with 'bash -n' during build. configure: require bash >= 4.1 at compile time paccache: adopt parseopts for options parsing rankmirrors: move to contrib/ libalpm: add pkg-config file pacman/package.c: show checksums with -Sii makepkg: null terminate filenames to strip makepkg: remove subshelling from check_option and friends contrib: remove executable bit from input files contrib/pacsysclean: avoid setting bogus PACMAN_OPTS pacman-key: test for content in keyring files pkgdelta: adopt parseopts for option parsing pacman: support group selection delimited by commas makepkg: use mapfile where plausible pacman-key: use mapfile over read contrib/pacsysclean: use a standard vim modeline fix -Wshadow warnings as reported by gcc 4.4.3 updpkgsums: add new contrib script paccache: allow running as root diskspace: canonicalize path to download dir check proper variable for NULL pkgdelta: add missing --version longopt add real_line_size to alpm_read_buffer add line length parameter to _alpm_strip_newline contrib: sed out @SCRIPTNAME@ in edit command updpkgsums: avoid fancy quoting in error message query: avoid false ownership matches for files in root diskspace: dedupe code for loading FS usage diskspace: only load filesystem info on demand scripts/library: add human_to_size pkgdelta: use human_to_size to parse --min-pkg-size scripts/library: add size_to_human paccache: adopt size_to_human diskspace: log errors when opening the mount table fails makepkg.conf: enable curl's cookie engine for http makepkg.conf: add -q option for curl update comments referring to alpm_option_get_syncdbs pacman: be more descriptive when opening an include fails lib/be_package: use qsort instead of our own msort lib/be_local: ensure local filelists are sorted lib/conflict: use a binary search within filelists util: fix line length calc in _alpm_archive_fgets pactest: avoid upgrade conflict with unchanged effective path pkgdelta: pass correct args to create_delta makepkg: implement dir_is_empty for dir content checks configure.ac: cleanup duplication in --enable-git-version buildsys: eschew use of DEFS, prefer AM_CPPFLAGS etc/Makefile: simplify build rule for conf files pactree: autodetect and use unicode line drawing characters pactree: fix style violations pactree: unify output between utf8 and ascii pkgdelta: avoid use of eval and IFS manipulation makepkg: normalize whitespace in $pkgdesc when writing .PKGINFO parseopts: remove superfluous continue/shift statements dload: avoid showing progress bars on some redirects pacsort: add -f, --files option for sorting filenames paccache: pass the --file option to pacsort dload: pass back the effective URL to callers of _alpm_download add libarchive compatability object Use libarchive compat header for relevant symbols inline libarchive compat wrappers libalpm: never attempt to remove a mountpoint makepkg.conf.5: fix bulletted list item formatting makepkg: add support for .pkg.tar.lzo paccache: use xargs to execute mv/rm commands dload: don't download sig if package is found in cache libalpm/sync: remove useless intermediate variable Diogo Sousa (1): Created hex_representation() in lib/libalpm/util.c Enjolras (2): Add a function prepare() to PKGBUILD Add documentation for the prepare() function Florian Pritz (16): change gpg import message to resemble gpg --list-keys add key algo to import msg use _alpm_access in a few more places for increased debugging info repo-remove: remove deltas file if it becomes empty pkgdelta: rework option/argument parser pkgdelta: implement requirments for delta generation pkgdelta/repo-add: quoting fixes pkgdelta/repo-add: quoting fixes coding style fixes signing.c: warn if time went backwards Add pactests for not detecting directory conflicts with upgrades pacdiff: color filename and mention what we found pacdiff: be more verbose if we rename or remove pacdiff: check cmp's exit code rather than output pacdiff: Add option to overwrite, clarify remove option pacdiff: update copyright notice Gary van der Merwe (2): makepkg: Improvements to get_filename: makepkg: Add Bazaar VCS support Gerardo Exequiel Pozzi (4): fix comment style // -> /* */ Fix missing spaces in operators Fix open braces style Fix space between control structure and open parens Jan Alexander Steffens (heftig) (1): Allow cleaning only some cachedirs Jason St. John (5): Added syntax highlighting for the sha256sums, sha384sums, and sha512sums arrays Fixed FS#29213 PKGBUILD.vim: improve 'options' highlighting, add extra keywords Use sentence case in makepkg Remove Vim modelines in prototype files Replace space-based indents in prototypes with tabs Jeremy Huntwork (2): Portability fixes for makepkg Allow wildcards in PURGE_TARGETS to match any type of file except for directories. Jonathan Conder (1): create a typedef for enum _alpm_errno_t LANGLOIS Olivier PIS -EXT (1): Relax requirement of what constitutes a dead connection Lukas Fleischer (5): scripts/*.sh.in: Honor TMPDIR environment variable contrib/*: Hardcode program names scripts/*: Declare several constant variables read-only Makefile.am: Extract "contrib/" into DIST_SUBDIRS contrib/*: Support the "--help" and "--version" options Martin Panter (2): Remove last traces of handling command arguments in $PACMAN Exit with failure status if download or installation is not confirmed Matthew Monaco (5): makepkg: remove unused variable makepkg: devel_check(): determine vcs makepkg: devel_check(): consolidate common code makepkg: devel_check(): set newpkgver (cleanup) makepkg: devel_check(): cleanup for hg version Maxime Gauduin (1): Make sed follow symlinks on Linux Mohammad Alsaleh (2): makepkg: git clone instead of git fetch if $dir exists but empty makepkg: check if $dir is a local clone of the right git repo Nagy Gabor (1): Print error message when to-be-downloaded file cannot be created Nathan Phillip Brink (1): Use AM_PATH_GPGME macro from gpgme instead of home-built gpgme detection. Neer Sighted (2): makepkg: Use a recursive git clone. makepkg: Make VCS download functions use get_filename Olivier Brunel (3): libalpm: Fix installing update of a replaced package libalpm: Search for replacers before literals makepkg: Add --verifysource to only download/verify source files Pang Yan Han (1): Save backup files with extension .pacsave.n Paul Barbu Gheorghe (1): fixed erroneous memory access to newurl in alpm_db_remove_server Phillip Smith (1): makepkg: add support for PACKAGER environment var Pierre (1): pacman: show groups once with -Sg Pierre Schmitz (2): pacman-key: Use lsign_keys function in --populate pacman-key: reduce verbosity of --populate Ram Bhamidipaty (1): Add man page for pactree Richard Pougnet (1): Provide full path names in warning messages Simon Gomizelj (21): pacman: add -n/--native filter to -Q Print package name before changelog entry with -Qc Consolidate --foreign/--native filtering refactor common code in query_search/sync_search remove :: prefix from all message split "Packages (%zd):" message remove format from statistic messages standardize format functions add a config settings and flag for colours introduce colstr for colourizing colourize colon_printf and question colourize warnings and errors colourize table output colourize the output of -Qi/Si colourize -Ss/-Qs colourize -Sl/-Ql colourize -Q update documentation and config files remove the duplicate strnlen and strndup make status/log messages reflect version change make paclog-pkglist understand 'downgraded' Sébastien Luttringer (2): Add staticlibs option in PKGBUILD makepkg: Avoid find to fork for each rm call William Giokas (15): Added LOGDEST variable makepkg: Print out full version on pkgver update makepkg: Formatting consistency in write_pkginfo Fix printing of paths makepkg: fix -r and --needed conflict scripts: Add color to library/output_format.sh scripts: Add color to pacman-db-upgrade scripts: Add color to pacman-key scripts: Add color to pacman-optimize scripts: Add color to pkgdelta scripts: Add color to repo-add contrib: Make pacdiff colors the same as makepkg contrib: Add color to bacman contrib: Add color to paccache makepkg: Separate vcs download and extract andrew.gregory.8(a)gmail.com (1): added doxygen documentation wgiokas (1): Add --needed option to makepkg ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-640-g312e925
by allan＠archlinux.org 09 Mar '13

09 Mar '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 312e9252f4f74e26ad899950fbcb527d31760519 (commit) from 41ef7eff75a0935098358287e1ea88c032c9ba44 (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 312e9252f4f74e26ad899950fbcb527d31760519 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 10 09:25:49 2013 +1000 Bump to version 4.1.0rc1 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-639-g41ef7ef
by allan＠archlinux.org 09 Mar '13

09 Mar '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 41ef7eff75a0935098358287e1ea88c032c9ba44 (commit) via 0e5c22e7a1c1ef78607121031208f6cc0ffb86e1 (commit) via 0d4ecae6252359fccf706210bececc943fb4fee3 (commit) via 1b78e2bb1af03e6e5245ebe1399222d0f1bfea49 (commit) via 8fd62a39b5d7cb7b8fd73bdfc5dc1ef55f445091 (commit) via 704ab17a6abd22a9c7036051fd72c1fa09841073 (commit) via 8db7e0c98d4eab0bfa119d5ecf209e8a21b4bbaf (commit) via e43c2716504ca0ac8f8f5deedbeb2c3215326558 (commit) from c9b7f9b0d0a85a8106d144edfdf3d22a7f7f9802 (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 41ef7eff75a0935098358287e1ea88c032c9ba44 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Fri Mar 8 15:59:30 2013 -0500 zsh completion: add support for all longopts commands add all the longopts for the operations and allow for them to be completed just like shortopts Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0e5c22e7a1c1ef78607121031208f6cc0ffb86e1 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Fri Mar 8 15:59:29 2013 -0500 zsh completion: include flags that can be doubled include the flags that could be doubled up like -Sii -Syy -Suu -Qii etc also include the long opts of all the commands Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0d4ecae6252359fccf706210bececc943fb4fee3 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Fri Mar 8 15:59:28 2013 -0500 zsh completion: fix doubling up of specific variables -i -y -u -d -s etc, so that they do not disappear In the future I hope there is an easy way to limit it to just 2, right now the *- makes it so that it can be added as many times as you want. Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1b78e2bb1af03e6e5245ebe1399222d0f1bfea49 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Thu Mar 7 01:59:24 2013 -0500 zsh completion: add --color to completion Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8fd62a39b5d7cb7b8fd73bdfc5dc1ef55f445091 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Wed Mar 6 16:10:25 2013 -0500 zsh completion: make sure all indentions are tabs Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 704ab17a6abd22a9c7036051fd72c1fa09841073 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Wed Mar 6 16:04:00 2013 -0500 zsh completion: use consistent case statement style Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8db7e0c98d4eab0bfa119d5ecf209e8a21b4bbaf Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Wed Mar 6 15:41:29 2013 -0500 zsh completion: fix stacked completion Before this, if you do pacman -Sy<tab> it completes to -y. Now, with -S and the other operations in the actual option _arguments, it won't remove the operations. Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e43c2716504ca0ac8f8f5deedbeb2c3215326558 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Wed Mar 6 15:41:12 2013 -0500 zsh completion: add deptest and database Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/zsh_completion.in | 645 +++++++++++++++++++++++++++------------------- 1 file changed, 381 insertions(+), 264 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-631-gc9b7f9b
by allan＠archlinux.org 09 Mar '13

09 Mar '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 c9b7f9b0d0a85a8106d144edfdf3d22a7f7f9802 (commit) via 0ff57350fbf359c9f0a6700da1f91250a1f9a239 (commit) via 43a2f6319455edadf9947d2e0fa9e68ea4e348ae (commit) via 2259dff7f34b082d8e43af15228e74cba75580f6 (commit) via 93fa63ee8a7f17bea676ac4f29d1733cb04ef7d2 (commit) via fcdaa46b651904fb88ea325d014bd85edd8a08fe (commit) via 06d761a0207d579d4976a8c61257516c2b368911 (commit) via ce9fd69eba44d997a660c982a8149fae7acb6a29 (commit) via 9876d9783979ec031d673e9a6df845e52fd2febb (commit) via 51276f1ac5fd337a8bffbda3099c0bd86b6503cf (commit) via 08a1244f4ef952be0c4897b9c5fee12a214be3f9 (commit) from d90641a894b915f5e13876bba88aa765c9961b0a (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 c9b7f9b0d0a85a8106d144edfdf3d22a7f7f9802 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Mar 9 11:59:33 2013 -0500 testdb: quote output substitutions Quoting output substitutions makes whitespace errors such as FS#30101 much more obvious: old: missing perl-test-pod dependency for perl-test-output new: missing 'perl-test-pod ' dependency for 'perl-test-output' Several of the quoted substitutions should not be capable of containing whitespace in theory, but this errs on the side of caution as the point of the tool is to find error conditions. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0ff57350fbf359c9f0a6700da1f91250a1f9a239 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Mar 9 11:59:32 2013 -0500 testdb: pass empty local pkglist to alpm_checkdeps Passing the local package list to alpm_checkdeps as both the local packages and packages to be upgraded did nothing but cause extra overhead as the packages were all removed from the installed package list because they were being upgraded. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 43a2f6319455edadf9947d2e0fa9e68ea4e348ae Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Mar 9 11:49:27 2013 -0500 pmpkg: add missing directories to test packages Several tests require complete file lists in order to provide accurate results. These can be non-obvious. Adding missing parent directories helps insure the integrity of tests against human error. Filling in parent directories also allows us to check that file lists are actually valid. There didn't seem to be a good place to do this that was always guaranteed to be run, so this adds a finalize() function to packages that will always be run before the package is actually used to allow for this type of tidying. Fixes FS#30723 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2259dff7f34b082d8e43af15228e74cba75580f6 Author: Olivier Brunel <i.am.jack.mail(a)gmail.com> Date: Sat Feb 23 13:08:44 2013 +0100 makepkg: Add --verifysource to only download/verify source files Because --noextract also implies to not download/verify source files, it wasn't possible to simply do that, without either extracting and/or building. (Note: --verifysource takes precedence over --noextract) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 93fa63ee8a7f17bea676ac4f29d1733cb04ef7d2 Author: Neer Sighted <neersighted(a)myopera.com> Date: Sat Mar 9 08:50:58 2013 -0800 makepkg: Make VCS download functions use get_filename Make all VCS download functions uses get_filename to get the repo name. In addition, creating a working directory from a Bazaar repository now shows the short-name of the repository, not the full path on disk. I'm not sure if the name of the variable that holds the basename of the local clone should still be `repo`, but I have left the variable name for simplicity. Signed-off-by: Neer Sighted <neersighted(a)myopera.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fcdaa46b651904fb88ea325d014bd85edd8a08fe Author: William Giokas <1007380(a)gmail.com> Date: Sat Mar 9 14:36:55 2013 -0600 makepkg: Separate vcs download and extract Previously makepkg would clone vcs sources in the download function, regardless of the noextract settings. Now the download_* functions only download or update the vcs sources, and the new extract_* functions just create working copies using the specified protocols. The extract_sources function will call the needed extract function for the protocol specified. The tarball extraction has also been moved into its own extract_file function to keep things consistent. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 06d761a0207d579d4976a8c61257516c2b368911 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Thu Mar 7 01:32:42 2013 -0500 make paclog-pkglist understand 'downgraded' Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ce9fd69eba44d997a660c982a8149fae7acb6a29 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Thu Mar 7 01:32:41 2013 -0500 make status/log messages reflect version change Currently pacman either prints 'adding' or 'upgrading' when installing a package. This make pacman print and log the other possible actions: 'downgrade' and 'reinstall' Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9876d9783979ec031d673e9a6df845e52fd2febb Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 8 17:23:33 2013 +1000 bash_completion: update for color Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 51276f1ac5fd337a8bffbda3099c0bd86b6503cf Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Thu Mar 7 01:24:15 2013 -0500 remove the duplicate strnlen and strndup Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 08a1244f4ef952be0c4897b9c5fee12a214be3f9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Mar 7 08:56:13 2013 -0500 libalpm/sync: remove useless intermediate variable This also rearranges some code to ensure that declarations and code aren't mixed. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 6 +- contrib/paclog-pkglist.sh.in | 2 +- doc/makepkg.8.txt | 5 + lib/libalpm/add.c | 61 ++++++------ lib/libalpm/alpm.h | 20 ++++ lib/libalpm/sync.c | 7 +- scripts/makepkg.sh.in | 221 ++++++++++++++++++++++++++++--------------- src/pacman/callback.c | 30 ++++++ src/pacman/util.c | 22 ----- src/util/testdb.c | 14 +-- test/pacman/pmdb.py | 2 +- test/pacman/pmpkg.py | 54 +++++++---- test/pacman/pmtest.py | 3 + 13 files changed, 276 insertions(+), 171 deletions(-) mode change 100644 => 100755 contrib/paclog-pkglist.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] pmpkg: add missing directories to test packages
by Andrew Gregory 09 Mar '13

09 Mar '13

Several tests require complete file lists in order to provide accurate results. These can be non-obvious. Adding missing parent directories helps insure the integrity of tests against human error. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/pmpkg.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index c0c9f13..a78d5cb 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -153,6 +153,17 @@ def makepkg(self, path): info.size = len(data) tar.addfile(info, StringIO(data)) + # Add missing directories + for name in list(self.files): + fileinfo = util.getfileinfo(name) + filename = fileinfo["filename"] + parent = os.path.dirname(filename.rstrip("/")) + while parent and parent != "/": + if parent not in self.files and parent + "/" not in self.files: + self.files.append(parent + "/") + parent = os.path.dirname(parent) + self.files.sort() + # Generate package file system for name in self.files: fileinfo = util.getfileinfo(name) -- 1.8.1.4

2 7

[pacman-dev] [PATCH] makepkg: separate dl and extract for vcs sources
by William Giokas 09 Mar '13

09 Mar '13

Previously makepkg would clone vcs sources in the download function, regardless of the noextract settings. Now the download_* functions only download or update the vcs sources, and the new extract_* functions just create working copies using the specified protocols. The extract_sources function will call the needed extract function for the protocol specified. The tarball extraction has also been moved into its own extract_file function to keep things consistent. Signed-off-by: William Giokas <1007380(a)gmail.com> --- This isn't really needed, I know, but it would facilitate the --verify function skipping the extraction/cloning of vcs sources while still downloading/updateing them. Using `download_sources fast` would make sense to me to skip the version updating, as that will fail without any $srcdir/. scripts/makepkg.sh.in | 375 ++++++++++++++++++++++++++++---------------------- 1 file changed, 212 insertions(+), 163 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..60bf81a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -431,28 +431,11 @@ download_bzr() { warning "$(gettext "Failure while pulling %s")" "${displaylocation}" fi fi - - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${dir}" "bzr" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - if ! bzr checkout "$dir" --lightweight; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${dir}" "bzr" - plain "$(gettext "Aborting...")" - exit 1 - fi - - popd &>/dev/null } download_git() { local netfile=$1 - local fragment=${netfile#*#} - if [[ $fragment = "$netfile" ]]; then - unset fragment - fi - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" @@ -485,54 +468,11 @@ download_git() { warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git" fi fi - - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "git" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - if ! git clone "$dir"; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 - fi - - cd_safe "${dir##*/}" - - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - commit|tag) - ref=${fragment##*=} - ;; - branch) - ref=origin/${fragment##*=} - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi - - if [[ -n $ref ]]; then - if ! git checkout -b makepkg $ref; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 - fi - fi - - popd &>/dev/null } download_hg() { local netfile=$1 - local fragment=${netfile#*#} - if [[ $fragment = "$netfile" ]]; then - unset fragment - fi - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" @@ -558,41 +498,11 @@ download_hg() { warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "hg" fi fi - - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - branch|revision|tag) - ref=('-u' "${fragment##*=}") - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi - - if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" - plain "$(gettext "Aborting...")" - exit 1 - fi - - popd &>/dev/null } download_svn() { local netfile=$1 - local fragment=${netfile#*#} - if [[ $fragment = "$netfile" ]]; then - unset fragment - fi - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" @@ -620,30 +530,6 @@ download_svn() { warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "svn" fi fi - - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - revision) - ref=('-r' "${fragment##*=}") - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi - - if ! svn export ${ref[@]} "$dir"; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" - plain "$(gettext "Aborting...")" - fi - - popd &>/dev/null } download_sources() { @@ -1222,63 +1108,195 @@ check_source_integrity() { fi } -extract_sources() { - msg "$(gettext "Extracting sources...")" - local netfile - for netfile in "${source[@]}"; do - local file=$(get_filename "$netfile") - if in_array "$file" "${noextract[@]}"; then - #skip source files in the noextract=() array - # these are marked explicitly to NOT be extracted - continue - fi +extract_bzr() { + local netfile=$1 + + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${dir}" "bzr" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" + + if ! bzr checkout "$dir" --lightweight; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${dir}" "bzr" + plain "$(gettext "Aborting...")" + exit 1 + fi + + popd &>/dev/null +} + +extract_git() { + local netfile=$1 + + local fragment=${netfile#*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + fi + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + msg "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "git" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" - # fix flyspray #6246 - local file_type=$(file -bizL "$file") - local ext=${file##*.} - local cmd='' - case "$file_type" in - *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) - cmd="bsdtar" ;; - *application/x-gzip*) - case "$ext" in - gz|z|Z) cmd="gzip" ;; - *) continue;; - esac ;; - *application/x-bzip*) - case "$ext" in - bz2|bz) cmd="bzip2" ;; - *) continue;; - esac ;; - *application/x-xz*) - case "$ext" in - xz) cmd="xz" ;; - *) continue;; - esac ;; + if ! git clone "$dir"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" + plain "$(gettext "Aborting...")" + exit 1 + fi + + cd_safe "${dir##*/}" + + local ref + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + commit|tag) + ref=${fragment##*=} + ;; + branch) + ref=origin/${fragment##*=} + ;; *) - # See if bsdtar can recognize the file - if bsdtar -tf "$file" -q '*' &>/dev/null; then - cmd="bsdtar" - else - continue - fi ;; + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 esac + fi - local ret=0 - msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" - if [[ $cmd = "bsdtar" ]]; then - $cmd -xf "$file" || ret=$? - else - rm -f -- "${file%.*}" - $cmd -dcf "$file" > "${file%.*}" || ret=$? - fi - if (( ret )); then - error "$(gettext "Failed to extract %s")" "$file" + if [[ -n $ref ]]; then + if ! git checkout -b makepkg $ref; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 fi - done + fi + + popd &>/dev/null +} + +extract_hg() { + local netfile=$1 + + local fragment=${netfile#*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + fi + + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" + + local ref + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + branch|revision|tag) + ref=('-u' "${fragment##*=}") + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + + if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" + plain "$(gettext "Aborting...")" + exit 1 + fi + + popd &>/dev/null +} + +extract_svn() { + local netfile=$1 + + local fragment=${netfile#*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + fi + + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" + + local ref + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + revision) + ref=('-r' "${fragment##*=}") + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + + if ! svn export ${ref[@]} "$dir"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" + plain "$(gettext "Aborting...")" + fi + + popd &>/dev/null +} + +extract_file() { + local file=$1 + + # fix flyspray #6246 + local file_type=$(file -bizL "$file") + local ext=${file##*.} + local cmd='' + case "$file_type" in + *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) + cmd="bsdtar" ;; + *application/x-gzip*) + case "$ext" in + gz|z|Z) cmd="gzip" ;; + *) continue;; + esac ;; + *application/x-bzip*) + case "$ext" in + bz2|bz) cmd="bzip2" ;; + *) continue;; + esac ;; + *application/x-xz*) + case "$ext" in + xz) cmd="xz" ;; + *) continue;; + esac ;; + *) + # See if bsdtar can recognize the file + if bsdtar -tf "$file" -q '*' &>/dev/null; then + cmd="bsdtar" + else + continue + fi ;; + esac + + local ret=0 + msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" + if [[ $cmd = "bsdtar" ]]; then + $cmd -xf "$file" || ret=$? + else + rm -f -- "${file%.*}" + $cmd -dcf "$file" > "${file%.*}" || ret=$? + fi + if (( ret )); then + error "$(gettext "Failed to extract %s")" "$file" + plain "$(gettext "Aborting...")" + exit 1 + fi if (( EUID == 0 )); then # change perms of all source files to root user & root group @@ -1286,6 +1304,37 @@ extract_sources() { fi } +extract_sources() { + msg "$(gettext "Preparing sources...")" + local netfile + for netfile in "${source[@]}"; do + local file=$(get_filename "$netfile") + if in_array "$file" "${noextract[@]}"; then + #skip source files in the noextract=() array + # these are marked explicitly to NOT be extracted + continue + fi + local proto=$(get_protocol "$netfile") + case "$proto" in + bzr*) + extract_bzr "$netfile" + ;; + git*) + extract_git "$netfile" + ;; + hg*) + extract_hg "$netfile" + ;; + svn*) + extract_svn "$netfile" + ;; + *) + extract_file "$file" + ;; + esac + done +} + error_function() { if [[ -p $logpipe ]]; then rm "$logpipe" -- 1.8.2.rc0.22.gb3600c3

2 7

[pacman-dev] [PATCH 1/2] testdb: pass empty local pkglist to alpm_checkdeps
by Andrew Gregory 09 Mar '13

09 Mar '13

Passing the local package list to alpm_checkdeps as both the local packages and packages to be upgraded did nothing but cause extra overhead as the packages were all removed from the installed package list because they were being upgraded. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/util/testdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/testdb.c b/src/util/testdb.c index 7b08cb0..073acc3 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -98,7 +98,7 @@ static int check_deps(alpm_list_t *pkglist) alpm_list_t *data, *i; int ret = 0; /* check dependencies */ - data = alpm_checkdeps(handle, pkglist, NULL, pkglist, 0); + data = alpm_checkdeps(handle, NULL, NULL, pkglist, 0); for(i = data; i; i = alpm_list_next(i)) { alpm_depmissing_t *miss = i->data; char *depstring = alpm_dep_compute_string(miss->depend); -- 1.8.1.5

1 1