- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 00/13] Files database operations
by Allan McRae 24 Jun '15

24 Jun '15

This patchset adds support for reading the .files database and performing the following: - downloading/updating the .files database - checking which package contains a file - searching for a file (including regex support) - listing all files from a package Allan McRae (13): Simplify sync_cleandb Fix formatting in parsearg_upgrade Add files option to handle libalpm: handle both .db and .files extensions Read file lists from files database Add pacman support for .files databases pacman: move database syncing to util.c Prototype pacman files database operations Implement locating file owner in sync files database Implement listing files from sync packages Implement searching for a file in the sync databases Add regex search option to sync database file searching Handle repo/pkg style arguments to sync repo file listing lib/libalpm/alpm.h | 3 + lib/libalpm/be_sync.c | 61 +++++++++-- lib/libalpm/db.c | 10 +- lib/libalpm/handle.c | 13 +++ lib/libalpm/handle.h | 1 + src/pacman/Makefile.am | 1 + src/pacman/callback.c | 2 +- src/pacman/conf.c | 4 + src/pacman/conf.h | 6 +- src/pacman/files.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/pacman.c | 88 +++++++++++++++- src/pacman/pacman.h | 2 + src/pacman/sync.c | 84 ++++----------- src/pacman/util.c | 33 ++++++ src/pacman/util.h | 1 + 15 files changed, 498 insertions(+), 82 deletions(-) create mode 100644 src/pacman/files.c -- 2.4.4

3 24

[pacman-dev] [PATCH 03/13] Add files option to handle
by Allan McRae 23 Jun '15

23 Jun '15

This option will be used to determine if the .files database should be used for reading sync information. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 9 +++++++++ lib/libalpm/handle.c | 13 +++++++++++++ lib/libalpm/handle.h | 1 + 3 files changed, 23 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 06e080b..a6cabc9 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -155,6 +155,12 @@ typedef enum _alpm_pkgfrom_t { ALPM_PKG_FROM_SYNCDB } alpm_pkgfrom_t; +/** Database extension options */ +typedef enum _alpm_dbtype_t { + ALPM_DBTYPE_DB, + ALPM_DBTYPE_FILES +} alpm_dbtype_t; + /** Method used to validate a package. */ typedef enum _alpm_pkgvalidation_t { ALPM_PKG_VALIDATION_UNKNOWN = 0, @@ -859,6 +865,9 @@ int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); +alpm_dbtype_t alpm_option_get_dbtype(alpm_handle_t *handle); +int alpm_option_set_dbtype(alpm_handle_t *handle, alpm_dbtype_t dbtype); + alpm_siglevel_t alpm_option_get_default_siglevel(alpm_handle_t *handle); int alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 4915d0b..df81f0d 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -284,6 +284,12 @@ int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) return handle->checkspace; } +alpm_dbtype_t SYMEXPORT alpm_option_get_dbtype(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->dbtype; +} + int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb) { CHECK_HANDLE(handle, return -1); @@ -664,6 +670,13 @@ int SYMEXPORT alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace) return 0; } +int SYMEXPORT alpm_option_set_dbtype(alpm_handle_t *handle, alpm_dbtype_t dbtype) +{ + CHECK_HANDLE(handle, return -1); + handle->dbtype = dbtype; + return 0; +} + int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level) { diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5893139..7fd470e 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -95,6 +95,7 @@ struct __alpm_handle_t { double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ + alpm_dbtype_t dbtype; /* Set the database type (extension) */ alpm_siglevel_t siglevel; /* Default signature verification level */ alpm_siglevel_t localfilesiglevel; /* Signature verification level for local file upgrade operations */ -- 2.4.4

1 1

[pacman-dev] Warning message jargon inconsistent with man page
by m.scott.stewart＠gmail.com 22 Jun '15

22 Jun '15

When attempting to install a package via pacman, I received a few warnings like: warning: database file for 'community' does not exist After looking through the man page, it wasn’t apparent what this meant. After googling, it appears this means I need to run: pacman -Syy. The man page says that -y updates the “master package list” from the server, so I’m guessing “database file” is a synonym for “package list”. Could the wording be brought in sync, such that one can understand the error in terms of the man file? As in, either change the warning to say something like “warning: package list for ‘community’ has not been downloaded”, or update the man file to use the “database file” terminology. Matt

2 1

[pacman-dev] libalpm fails on a filesystem with a large blocksize
by Astro Xe 13 Jun '15

13 Jun '15

Hello, ''pacman --debug --root dir -S util-linux'' fails on a 2 GB NFS (1,9 GB free): "Partition /root/dir too full: 12385 blocks needed, 3802 blocks free" statvfs() reports f_bsize = 524288, f_bfree = 3855, so the "blocks free" estimate is correct, taking the cushion into account. A little debugging shows that the "blocks needed" overestimate comes from calculate_installed_size @ lib/libalpm/diskspace.c which, basically, rounds every file's size up to a multiple of the block size. In my case, having a huge block size, it is indeed summing 1 block per file. Is it possible to work around this problem, and how? Thanks

3 3

[pacman-dev] [PATCH 1/2] repo-add: Generate unarmored DB signature
by Johannes Löthberg 13 Jun '15

13 Jun '15

Pacman cannot handle armored signatures, so use gpg's --no-armor flag to force an unarmored signature. --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 3ece8d5..7e242ce 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -264,7 +264,7 @@ create_signature() { if [[ -n $GPGKEY ]]; then SIGNWITHKEY="-u ${GPGKEY}" fi - gpg --detach-sign --use-agent ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$? + gpg --detach-sign --use-agent --no-armor ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$? if (( ! ret )); then msg2 "$(gettext "Created signature file '%s'")" "${dbfile##*/.tmp.}.sig" -- 2.4.1

2 6

[pacman-dev] [PATCH 1/2] makepkg-template: ignore duplicates per option
by Dominik Fischer 09 Jun '15

09 Jun '15

When templates recursively include other templates, a diamond problem, similar to multiple inheritance, may occur. It is illustrated in the test case. As templates may consist of arbitrary code, it may be unwanted to execute a template twice. This patch provides a solution to some simple cases of this problem by completely ignoring every template occurrence but the first for each template name. Signed-off-by: Dominik Fischer <d.f.fischer(a)web.de> --- doc/makepkg-template.1.txt | 6 ++++++ scripts/makepkg-template.pl.in | 12 ++++++++++++ .../makepkg-template-tests/diamond-input/PKGBUILD | 5 +++++ .../diamond-input/PKGBUILD.expanded | 13 +++++++++++++ .../diamond-input/templates/base-1.template | 1 + .../diamond-input/templates/first-include-1.template | 1 + .../diamond-input/templates/second-include-1.template | 1 + .../diamond-input/testcase-config | 18 ++++++++++++++++++ 8 files changed, 57 insertions(+) create mode 100644 test/scripts/makepkg-template-tests/diamond-input/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/diamond-input/PKGBUILD.expanded create mode 100644 test/scripts/makepkg-template-tests/diamond-input/templates/base-1.template create mode 100644 test/scripts/makepkg-template-tests/diamond-input/templates/first-include-1.template create mode 100644 test/scripts/makepkg-template-tests/diamond-input/templates/second-include-1.template create mode 100644 test/scripts/makepkg-template-tests/diamond-input/testcase-config diff --git a/doc/makepkg-template.1.txt b/doc/makepkg-template.1.txt index 03b2a38..bd2355c 100644 --- a/doc/makepkg-template.1.txt +++ b/doc/makepkg-template.1.txt @@ -76,6 +76,12 @@ Options given multiple times in which case files found in directory given last will take precedence. +*-t, \--no-duplicates*:: + Do not include any template twice, even when templates recursively include + other templates. Only the first occurrence of each template will be + expanded, all further references to the same name, also with different + version numbers, will be ignored. + Example PKGBUILD ---------------- diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index 9877796..e9f6e08 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -33,6 +33,8 @@ my %opts = ( my $template_name_charset = qr/[[:alnum:]+_.@-]/; my $template_marker = qr/# template/; +my %seen = (); + # runtime loading to avoid dependency on cpan since this is the only non-core module my $loaded_gettext = can_load(modules => {'Locale::gettext' => undef}); if ($loaded_gettext) { @@ -96,6 +98,15 @@ sub parse_template_line { sub load_template { my ($values) = @_; + if ($opts{dups}) { + # omit already included templates. + if (exists $seen{$values->{name}}) { + return ""; + } else { + $seen{$values->{name}} = (); + } + } + my $ret = ""; my $template_name = "$values->{name}"; @@ -205,6 +216,7 @@ GetOptions( "output|o=s" => \$opts{output}, "newest|n" => \$opts{newest}, "template-dir=s@" => \$opts{template_dir}, + "no-duplicates|t" => \$opts{dups}, ) or usage(1); $opts{output} = $opts{input} unless $opts{output}; diff --git a/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD b/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD new file mode 100644 index 0000000..6bb4fa5 --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD @@ -0,0 +1,5 @@ +pkgname=foo +pkgver=1 + +# template input; name=first-include; version=1; +# template input; name=second-include; version=1; diff --git a/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD.expanded b/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD.expanded new file mode 100644 index 0000000..8077581 --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/PKGBUILD.expanded @@ -0,0 +1,13 @@ +pkgname=foo +pkgver=1 + +# template start; name=first-include; version=1; +# template start; name=base; version=1; +package() {} +# template end; +# template end; +# template start; name=second-include; version=1; +# template start; name=base; version=1; +package() {} +# template end; +# template end; diff --git a/test/scripts/makepkg-template-tests/diamond-input/templates/base-1.template b/test/scripts/makepkg-template-tests/diamond-input/templates/base-1.template new file mode 100644 index 0000000..056096f --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/templates/base-1.template @@ -0,0 +1 @@ +package() {} diff --git a/test/scripts/makepkg-template-tests/diamond-input/templates/first-include-1.template b/test/scripts/makepkg-template-tests/diamond-input/templates/first-include-1.template new file mode 100644 index 0000000..9916370 --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/templates/first-include-1.template @@ -0,0 +1 @@ +# template input; name=base; version=1; diff --git a/test/scripts/makepkg-template-tests/diamond-input/templates/second-include-1.template b/test/scripts/makepkg-template-tests/diamond-input/templates/second-include-1.template new file mode 100644 index 0000000..9916370 --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/templates/second-include-1.template @@ -0,0 +1 @@ +# template input; name=base; version=1; diff --git a/test/scripts/makepkg-template-tests/diamond-input/testcase-config b/test/scripts/makepkg-template-tests/diamond-input/testcase-config new file mode 100644 index 0000000..65bb8d0 --- /dev/null +++ b/test/scripts/makepkg-template-tests/diamond-input/testcase-config @@ -0,0 +1,18 @@ +arguments+=(-t) +expected_exitcode=0 + +IFS="" read -d '' expected_output <<'EOF' +EOF + +IFS="" read -d '' expected_result <<'EOF' +pkgname=foo +pkgver=1 + +# template start; name=first-include; version=1; +# template start; name=base; version=1; +package() {} +# template end; +# template end; +# template start; name=second-include; version=1; +# template end; +EOF -- 2.4.2

3 4

[pacman-dev] [PATCH] util.c: table_display: Fix incorrect docstring
by Johannes Löthberg 09 Jun '15

09 Jun '15

Commit 7b8f8753 removed the title parameter but forgot to remove it from the docstring. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/pacman/util.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 5d68360..7c6a8c0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -612,7 +612,6 @@ static size_t table_calc_widths(const alpm_list_t *header, /** Displays the list in table format * - * @param title the tables title * @param header the column headers. column count is determined by the nr * of headers * @param rows the rows to display as a list of lists of strings. the outer -- 2.4.2

1 0

[pacman-dev] [PATCH] makepkg-template.1: Clarify which file version-less markers use
by Wieland Hoffmann 08 Jun '15

08 Jun '15

The old text could be interpreted such that makepkg-template compares the version numbers of the templates to find the most recent one. Rephrase this to make it explicit that "$template_name.template" is used. --- doc/makepkg-template.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/makepkg-template.1.txt b/doc/makepkg-template.1.txt index 03b2a38..99637d4 100644 --- a/doc/makepkg-template.1.txt +++ b/doc/makepkg-template.1.txt @@ -47,8 +47,8 @@ and end markers and the template code on the first run. Template files should be stored in one directory and filenames should be "$template_name-$version.template" with a symlink "$template_name.template" pointing to the most recent template. If the version is not set in the marker, -'makepkg-template' will automatically use the most recent version of the -template, otherwise the specified version will be used. This allows for easier +'makepkg-template' will automatically use the target of "$template_name.template", +otherwise the specified version will be used. This allows for easier verification of untrusted PKGBUILDs if the template is trusted. You verify the non-template code and then use a command similar to this: -- 2.4.2

2 1

[pacman-dev] [PATCH v2] makepkg: Add flag for printing SRCINFO to stdout
by Johannes Löthberg 25 May '15

25 May '15

This commit adds a makepkg option to generate and print the SRCINFO file for a PKGBUILD, required by the new AUR, to stdout. AUR 4.0 will use Git instead of source tarballs for uploading packages, so making makepkg capable of printing the SRCINFO would simplify package management, instead of having to extract it from a source tarball. It is also useful for scripting other things, so that instead of having to parse PKGBUILDs, one can make makepkg generate the SRCINFO and then you can parse that instead, which is much simpler and less error-prone. --- Now with documentation and justification! doc/makepkg.8.txt | 3 +++ scripts/makepkg.sh.in | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 41df30e..4323fd3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -207,6 +207,9 @@ Options List the packages that would be produced without building. Listed package names do not include PKGEXT. +*\--printsrcinfo*:: + Generate and print the SRCINFO file to stdout. + Additional Features ------------------- makepkg supports building development versions of packages without having to diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c74e84a..2613b31 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1723,6 +1723,7 @@ usage() { printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --packagelist Only list packages that would be produced, without PKGEXT")\n" printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" + printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" @@ -1768,7 +1769,7 @@ OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' - 'pkg:' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' + 'pkg:' 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options @@ -1813,6 +1814,7 @@ while true; do -p) shift; BUILDFILE=$1 ;; --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; + --printsrcinfo) PRINTSRCINFO=1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --sign) SIGNPKG='y' ;; @@ -2099,6 +2101,11 @@ if (( PACKAGELIST )); then exit 0 fi +if (( PRINTSRCINFO )); then + write_srcinfo + exit 0 +fi + if (( ! PKGVERFUNC )); then check_build_status fi -- 2.4.1

1 0

[pacman-dev] [PATCH] makepkg: Add flag for printing SRCINFO to stdout
by Johannes Löthberg 24 May '15

24 May '15

--- scripts/makepkg.sh.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c74e84a..2613b31 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1723,6 +1723,7 @@ usage() { printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --packagelist Only list packages that would be produced, without PKGEXT")\n" printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" + printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" @@ -1768,7 +1769,7 @@ OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' - 'pkg:' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' + 'pkg:' 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options @@ -1813,6 +1814,7 @@ while true; do -p) shift; BUILDFILE=$1 ;; --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; + --printsrcinfo) PRINTSRCINFO=1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --sign) SIGNPKG='y' ;; @@ -2099,6 +2101,11 @@ if (( PACKAGELIST )); then exit 0 fi +if (( PRINTSRCINFO )); then + write_srcinfo + exit 0 +fi + if (( ! PKGVERFUNC )); then check_build_status fi -- 2.4.1

3 5