- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] Compiling pacman with libarchive in nonstandard location
by Michael Schubert 29 Jan '13

29 Jan '13

Dear List Members, I've been trying to compile pacman for a while now but I can't figure out how to properly set the libarchive path with the following setup: - I'm working on a server where I don't have root access - the $PATH and $LD_LIBRARY_PATH are a mess - an old libarchive is in /usr/lib64/libarchive.so.2 - the current libarchive is in ~/.arch/usr/lib - I'd like ./configure to pick up the new libarchive I have tried almost all combinations of the environment variables (used full paths, ~ for clarity): export LD_LIBRARY_PATH=~/.arch/usr/lib:$LD_LIBRARY_PATH export LIBS=-L~/.arch/usr/lib export LDFLAGS=-L~/.arch/usr/lib export CFLAGS=-I~/.arch/usr/include export CXXFLAGS=-I~/.arch/usr/include echo > ChangeLog echo > ABOUT-NLS ~/.arch/usr/bin/autoreconf --force -B~/.arch/usr/include ./configure But it still fails with the message: checking for archive_read_data in -larchive... no configure: error: libarchive is needed to compile pacman! I think I somehow need to prepend the personal library path to the paths searched, but how? Any suggestions would be greatly appreciated. Thanks Michael

2 3

[pacman-dev] [PATCH] Compress manpages only after checking for $srcdir and $pkgdir
by Chirantan Ekbote 29 Jan '13

29 Jan '13

Move the manpage compression code from tidy_install to create_package. Since tidy_install could remove a backup file, it should go before check_package. Alternatively, we could move all the code from tidy_install into create_package since those two are always called together. Fixes FS#33318. Signed-off-by: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> --- scripts/makepkg.sh.in | 58 ++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebc24f7..be433ad 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1497,34 +1497,6 @@ tidy_install() { done fi - if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then - msg2 "$(gettext "Compressing man and info pages...")" - local file files inode link - while read -rd ' ' inode; do - read file - find ${MAN_DIRS[@]} -type l 2>/dev/null | - while read link ; do - if [[ "${file}" -ef "${link}" ]] ; then - rm -f "$link" "${link}.gz" - if [[ ${file%/*} = ${link%/*} ]]; then - ln -s -- "${file##*/}.gz" "${link}.gz" - else - ln -s -- "/${file}.gz" "${link}.gz" - fi - fi - done - if [[ -z ${files[$inode]} ]]; then - files[$inode]=$file - gzip -9 -n -f "$file" - else - rm -f "$file" - ln "${files[$inode]}.gz" "${file}.gz" - chmod 644 "${file}.gz" - fi - done < <(find ${MAN_DIRS[@]} -type f \! -name "*.gz" \! -name "*.bz2" \ - -exec @INODECMD@ '{}' + 2>/dev/null) - fi - if check_option "strip" "y"; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" # make sure library stripping variables are defined to prevent excess stripping @@ -1786,6 +1758,36 @@ create_package() { check_package cd_safe "$pkgdir" + + # compress manpages + if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then + msg2 "$(gettext "Compressing man and info pages...")" + local file files inode link + while read -rd ' ' inode; do + read file + find ${MAN_DIRS[@]} -type l 2>/dev/null | + while read link ; do + if [[ "${file}" -ef "${link}" ]] ; then + rm -f "$link" "${link}.gz" + if [[ ${file%/*} = ${link%/*} ]]; then + ln -s -- "${file##*/}.gz" "${link}.gz" + else + ln -s -- "/${file}.gz" "${link}.gz" + fi + fi + done + if [[ -z ${files[$inode]} ]]; then + files[$inode]=$file + gzip -9 -n -f "$file" + else + rm -f "$file" + ln "${files[$inode]}.gz" "${file}.gz" + chmod 644 "${file}.gz" + fi + done < <(find ${MAN_DIRS[@]} -type f \! -name "*.gz" \! -name "*.bz2" \ + -exec @INODECMD@ '{}' + 2>/dev/null) + fi + msg "$(gettext "Creating package \"%s\"...")" "$pkgname" pkgarch=$(get_pkg_arch) -- 1.8.1

4 5

[pacman-dev] [PATCH 1/2] add libarchive compatability object
by Dave Reisner 29 Jan '13

29 Jan '13

This allows us to support both libarchive 2.8.x as well as 3.x without deprecation warnings on compile. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Decided to just do this since libarchive 3.x has been a little scary from a stability standpoint. Compile tested on both 3.1.1 and 3.0.4. lib/libalpm/Makefile.am | 1 + lib/libalpm/libarchive-compat.c | 65 +++++++++++++++++++++++++++++++++++++++++ lib/libalpm/libarchive-compat.h | 33 +++++++++++++++++++++ 3 files changed, 99 insertions(+) create mode 100644 lib/libalpm/libarchive-compat.c create mode 100644 lib/libalpm/libarchive-compat.h diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 5cf66b9..55fec9c 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -44,6 +44,7 @@ libalpm_la_SOURCES = \ graph.h graph.c \ group.h group.c \ handle.h handle.c \ + libarchive-compat.h libarchive-compat.c \ 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.c new file mode 100644 index 0000000..56af2e1 --- /dev/null +++ b/lib/libalpm/libarchive-compat.c @@ -0,0 +1,65 @@ +/* + * libarchive-compat.c + * + * Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdint.h> + +#include "libarchive-compat.h" + +int _alpm_archive_read_free(struct archive *archive) { +#if ARCHIVE_VERSION_NUMBER >= 3000000 + return archive_read_free(archive); +#else + return archive_read_finish(archive); +#endif +} + +int64_t _alpm_archive_compressed_ftell(struct archive *archive) { +#if ARCHIVE_VERSION_NUMBER >= 3000000 + return archive_filter_bytes(archive, -1); +#else + return archive_position_compressed(archive); +#endif +} + +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); +#else + return archive_read_open_file(archive, filename, block_size); +#endif +} + +int _alpm_archive_filter_code(struct archive *archive) { +#if ARCHIVE_VERSION_NUMBER >= 3000000 + return archive_filter_code(archive, 0); +#else + return archive_compression(archive); +#endif +} + +int _alpm_archive_read_support_filter_all(struct archive *archive) { +#if ARCHIVE_VERSION_NUMBER >= 3000000 + return archive_read_support_filter_all(archive); +#else + return archive_read_support_compression_all(archive); +#endif +} + +/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/libarchive-compat.h b/lib/libalpm/libarchive-compat.h new file mode 100644 index 0000000..a1b379e --- /dev/null +++ b/lib/libalpm/libarchive-compat.h @@ -0,0 +1,33 @@ +/* + * libarchive-compat.h + * + * Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef _LIBARCHIVE_H +#define _LIBARCHIVE_H + +#include <archive.h> + +int _alpm_archive_read_free(struct archive *archive); +int64_t _alpm_archive_compressed_ftell(struct archive *archive); +int _alpm_archive_read_open_file(struct archive *archive, + const char *filename, size_t block_size); +int _alpm_archive_filter_code(struct archive *archive); +int _alpm_archive_read_support_filter_all(struct archive *archive); + +#endif /* _LIBARCHIVE_H */ + +/* vim: set ts=2 sw=2 noet: */ -- 1.8.1.1

3 4