January 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] removed duplicate macros SYMEXPORT and SYMHIDDEN from alpm_list.c, using them from util.h
by Paul Barbu Gheorghe 29 May '13

29 May '13

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- lib/libalpm/alpm_list.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 39eded1..b9e7cba 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -21,13 +21,11 @@ #include <stdlib.h> #include <string.h> +#include "util.h" + /* libalpm */ #include "alpm_list.h" -/* check exported library symbols with: nm -C -D <lib> */ -#define SYMEXPORT __attribute__((visibility("default"))) -#define SYMHIDDEN __attribute__((visibility("internal"))) - /** * @addtogroup alpm_list List Functions * @brief Functions to manipulate alpm_list_t lists. -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

6 9

[pacman-dev] code reuse for PKGBUILD
by Kent Fredric 12 Apr '13

12 Apr '13

So, I'm sort of new to Arch, but I've already found some things in how a few things work I have rather sizable miss-givings about, and see room for improvement. *~~~ BEGIN CONFUSING RANT HERE ~~~* *( or skip past it to the TL;DR )* The primary one at present is "No code re-use in PKGBUILD. Period" And this strikes me as a bad idea. I understand that having a PKGBUILD become not fully independent might be undesirable to some, but I'm hoping there is a pivotal middle-ground that can be useful. 1. Many PKGBUILD files are seriously outdated 2. Each and every Perl Module PKGBUILD requires the author to know *everything* about packaging Perl modules, and this is a somewhat hard thing to know: - version normalisation # I haven't seen anyone do it yet, and its the only sure-fire mechanism to get versions to play nicely together. - lots of boilerplate , cargo-cult copypasted around, see : https://aur.archlinux.org/packages/pe/perl-json-any/PKGBUILD Consider this for a moment: Gentoo, like Arch have been nuking '.packlist' files for some time, until recently it became apparent that some programs actually need those files to do their job. https://bugs.gentoo.org/show_bug.cgi?id=438660 This is "bad practice", and because the behaviour is not codified in some shared library that all perl module packages use, in order to "Fix" this problem on arch, it requires a considerable number of person-hours to vet the hundreds of perl PKGBUILDS to eliminate this behaviour. https://aur.archlinux.org/packages/pe/perl-devel-nytprof/PKGBUILD Another bad example of people reinventing all their own wheels, and doing all make/make test/make install during build. This behaviour should really be codified in a shared module. That way, when people realise the way the shared module has been doing things is for whatever reason, wrong, its simply a matter of fixing that, and every build past and present benefits from the change, with no additional effort on the PKGBUILD maintainers. What I hope to do is find some sort of consensus on how it would be best to add a little bit of code-reuse to pkgbuild, as this will, I feel, greatly improve maintenance of these files. Because *both* of those 2 PKGBUILD files I posted could have been easily refactored, and had *100%* of their independent code eliminated in favour of shared behaviour. extensions=('perl-module') _perl_distname=json-any _perl_ver='1.29' _perl_author=PERIGRIN pkgver='1.290.0' pkgrel='1' pkgdesc="Wrapper Class for the various JSON classes." arch=('any') options=('!emptydirs') depends=('perl-json>=2.02' 'perl-json-xs>=2.3' 'perl-yaml-syck') makedepends=() md5sums=('f7eea523d532668555456e4153334342') Notes: _perl_ver and pkgver are different due to my recommendation that upstream versions undergo a normalisation process prior to being used for arch versions. This is important, as perl versioning semantics are wildly different from the rest of the worlds. The average packager will not even realise how big a deal this is, but simple to say, perl versions are a nightmare: http://www.dagolden.com/index.php/369/version-numbers-should-be-boring/ On Gentoo, we've developed a tool to make it easier to convert perl versions to versions we can use in packages, and it basically "Just works". https://metacpan.org/module/Gentoo::PerlMod::Version license= is omitted, as this way, it can default to the most common license on CPAN, "The Perl5 License" -> license=('PerlArtistic' 'GPL') and can be overridden as needed. url= is omitted, as this can easily be generated from the _perl_distname value, and overridden only when necessary. This means you can either have the underlying module refer to pages on search.cpan.org, or metacpan.org source=() is also omitted, as the primary src URI can also be divined from combining _perl_distname , _perl_author and _perl_ver and you can usually leave out build(), check() and package(), as these phases are all very well known and have to meet a standard behaviour to operate with 'cpan' clients, so its quite straightforward to have a set of default behaviours. Implementation wise, my biggest question is "Where is 'perl-module' stored". The simplest option is a pacman distribution, such as 'pacman-extensions', that installs files in /usr/lib/pacman/extension/ , and makepkg/pacman can be made aware of this feature and load the modules on demand. For those who don't like the inherent issue where "PKGBUILD depends on code outside tar.gz", it could be engineered so that `makepkg -S` copies files from /usr/lib/pacman/extension/ into the built tree at /extensions/ , and then have some sort of mechanic that chooses between using the "system" version of the extension or the "bundled" version of the extension. With built packages, the behaviours from the extension would probably have to be cooked in to the dist ( somehow ), but thats an accepted caveat of how binary distribution usually works. *========= TL;DR TL;DR TL;DR TL;DR TL;DR =========* 1. I'm a noob to Arch 2. ... But I have substantial experience packaging perl modules for gentoo ( https://github.com/gentoo-perl/perl-experimental/graphs/contributors , https://www.ohloh.net/p/gentoo-perl- overlay/contributors/summary ) 3. And I strongly feel that in regard to packaging things, the PKGBUILD spec at present seems a little immature 4. And I strongly feel, that PKGBUILD could gain a great deal of improvement utility by having /some/ shared code mechanism 5. ... But I'm not quite sure what the best way to do this is 6. And I'm strongly against any ideas that involve developing a *Second* platform that simply emits files in the PKGBUILD format, or implementing competing products to `makepkg` 7. And I'd rather *not* have hard-inlining behaviour , I'm fine with the external behaviour being shipped independently, but if thats not universal, then I'd like to find a middleground In advance, thanks for your consideration =). -- Kent perl -e "print substr( \"edrgmaM SPA NOcomil.ic\\@tfrken\", \$_ * 3, 3 ) for ( 9,8,0,7,1,6,5,4,3,2 );" http://kent-fredric.fox.geek.nz

6 18

[pacman-dev] pacman 4.1 release plans
by Allan McRae 24 Feb '13

24 Feb '13

It has been over a year since pacman-4.0 and the pacman-4.1 release is beginning to shape up, so let do it... The main thing that is left is to merge my improvements for the signature checking, which I will do in the next week. Once that is done, nothing major will be committed. So if you have a patch had comments made and you never did them [1], now is the time. I am aiming for string freeze mid to late February. At that time it will also become big/regression fixes only. Main release, early March. @Dan: will you have time to help with translations, or can you give me Transifex access? [1] https://patchwork.archlinux.org/project/pacman/list/?state=*

1 1

[pacman-dev] [PATCH] README: update alpm options
by Andrew Gregory 07 Feb '13

07 Feb '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Includes local_file_siglevel and remote_file_siglevel, still in Allan's working branch. README | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/README b/README index 54e8dd6..b4c9978 100644 --- a/README +++ b/README @@ -53,8 +53,16 @@ library is initialized. * dlcb: The callback function for download progress of each package. * fetchcb: Callback for custom download function. * totaldlcb: The callback function for overall download progress. -* root: The root directory for pacman to install to (Default: /) -* dbpath: The toplevel database directory (Default: /var/lib/pacman) +* eventcb: Callback for transaction messages. +* questioncb: Callback for selecting amongst choices. +* progresscb: Callback to handle display of transaction progress. +* gpgdir: Directory where GnuPG files are stored. +* arch: Allowed package architecture. +* deltaratio: Download deltas if possible; a ratio value. +* checkspace: Check disk space before installing. +* default_siglevel: Default signature verification level. +* local_file_siglevel: Signature verification level for local file upgrades. +* remote_file_siglevel: Signature verification level for remote file upgrades. * logfile: The base path to pacman's log file (Default: /var/log/pacman.log) * usesyslog: Log to syslog instead of `logfile` for file-base logging. @@ -71,14 +79,10 @@ alpm_option_{get,set}_noupgrades -> alpm_option_{add,remove}_noupgrade. The following options are read-only, having ONLY alpm_option_get_* functions: -* lockfile: The file used for locking the database - (Default: <dbpath>/db.lck) -* localdb: A alpm_db_t structure for the local (installed) database -* syncdbs: A list of alpm_db_t structures to which pacman can sync from. +* root: The root directory for pacman to install to +* dbpath: The toplevel database directory +* lockfile: The file used for locking the database (Default: <dbpath>/db.lck) -The following options are write-only, having ONLY alpm_option_set_* functions: - -* usedelta: Download delta files instead of complete packages if possible. [Transactions] -- 1.8.1.1

2 2

[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