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

[pacman-dev] [suggestion] Sandboxed package building
by BlissSam 16 May '13

16 May '13

It is well known that Gentoo builds packages in a sandbox environment. It protects from badly written build scripts [1] as well as some other threats. I suggest that ArchLinux can build packages in such a sandbox, and this behavior can be easily configured via makepkg.conf. It seems that sandbox and lib32-sandbox ported from Gentoo in AUR works fine on Arch.[2] So why don't Arch build packages in a sandbox? I admit that sandbox is not always safe, but it does protects. Notes: [1]: scripts like this: rm -Rf ${pkgdirr}/home since ${pkgdirr} is mistyped, it will be `rm -Rf /home` [2]: https:///aur.archlinux.org/packages/sandbox/ ... and https:///aur.archlinux.org/packages/lib32-sandbox/

5 5

[pacman-dev] [PATCH] makepkg: assign fragment for bzr revision
by Dave Reisner 15 May '13

15 May '13

Fixes FS#35281 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b85b87e..88f3e2a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -452,7 +452,8 @@ download_bzr() { local displaylocation="$url" local revision=('-r-1') - if [[ -n $fragment ]]; then + if [[ $netfile = *\#* ]]; then + local fragment=${netfile#*#} case ${fragment%%=*} in revision) revision=("-r${fragment##*=}") -- 1.8.2.3

2 1

[pacman-dev] [RFC] support for URL query strings and fragments
by Xyne 10 May '13

10 May '13

Hi, pacman/libalpm currently only supports "bare" server URIs of the form <scheme name> : <hierarchical part> whereas a full URI is <scheme name> : <hierarchical part> [ ? <query> ] [ # <fragment> ] Support for query strings would allow for more flexible server configurations using dynamic content. For the sake of a concrete example, I'm in the middle of rewriting Pacserve and I could really use "?repo=$repo&arch=$arch" to keep all packages in one apparent server directory while still being able to correctly redirect to external mirrors. Redirection requires both values to determine and interpolate the server URL before returning it to Pacman with a 307. At first I thought this would be relatively easy to do. I took a quick look at the code but I didn't find a common function to affix the file name to the URL (although I did see "sanitize_url" in db.c). I see two ways of doing this: 1) Support a "$file" variable in the URL. If the URL doesn't contain the variable, add the file name to the end as usual. 2) Remove the query and fragment, treat the URL as usual, then restore the query and fragment. The first would allow for file names in query strings (e.g. "?file=$file"). It could be used for a build server, for example. Of course, you can extract the file name from the request path but that requires hacking the server code or using something like mod_rewrite to mangle URLS. Having the file name sent in a get variable is much more convenient for server-side programming. In either case, it should be enough to have a single, central function that accepts the template URL and the filename (pkg or db) and returns the full URL. The sanitize_url function would also need to handle query strings and fragments. Would there be any objection to this if a patch were submitted?

2 2

[pacman-dev] [PATCH] pmtest: set LC_ALL=C in subprocess.call
by Andrew Gregory 10 May '13

10 May '13

LC_ALL=C is required to force pacman's output to English for tests that rely on that output, but setting it in Makefile.am results in those tests breaking under different locales when pactest.py is run directly. This will also ease an eventual transition to python3 which LC_ALL=C causes to default to ascii encoded strings, creating problems for tests with unicode strings. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Makefile.am | 2 +- test/pacman/pmtest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7b53fd0..28f7f8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ dist_pkgdata_DATA = \ check-local: test-pacman test-pacsort test-vercmp test-parseopts test-pacman: test/pacman src/pacman - LC_ALL=C $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ + $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ --test $(top_srcdir)/test/pacman/tests/*.py \ --scriptlet-shell $(SCRIPTLET_SHELL) \ --ldconfig $(LDCONFIG) \ diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 2eafe68..f5a9680 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -241,7 +241,7 @@ def run(self, pacman): # archives are made available more easily. time_start = time.time() self.retcode = subprocess.call(cmd, stdout=output, stderr=output, - cwd=os.path.join(self.root, util.TMPDIR)) + cwd=os.path.join(self.root, util.TMPDIR), env={'LC_ALL': 'C'}) time_end = time.time() vprint("\ttime elapsed: %.2fs" % (time_end - time_start)) -- 1.8.2.2

1 0

[pacman-dev] [PATCH] pacman/util.c: Fix negative Installed size
by Peter Wu 09 May '13

09 May '13

Commit ce5ee8a065a590564982191c76cb325ab05e04e2 separated the display of Download, Installed/Removed and Upgrade size such that the output can nicely be formatted. However, it also changed the data type for storing the actual size. Previously it was off_t (sizeof == 8), after that commit is became int (sizeof == 4). This patch restores the previous behaviour and shows the expected (non-negative) values again. Signed-off-by: Peter Wu <lekensteyn(a)gmail.com> --- src/pacman/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 862c8e8..643b6fe 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -49,7 +49,7 @@ struct table_row_t { const char *label; - int size; + off_t size; }; int trans_init(alpm_transflag_t flags, int check_valid) @@ -828,7 +828,7 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) return ret; } -static void add_transaction_sizes_row(alpm_list_t **table, const char *label, int size) +static void add_transaction_sizes_row(alpm_list_t **table, const char *label, off_t size) { struct table_row_t *row = malloc(sizeof(struct table_row_t)); -- 1.8.2.2

2 2

[pacman-dev] [RFC] Find real library names with libdepends/libprovides
by Mohammad Alsaleh 09 May '13

09 May '13

makepkg only handles libprovides/libdepends correctly if the naming scheme is: lib${name}.so --> lib$name.so.$ver But it is not uncommon for libname.so to link to a '.so' file that does not follow this naming scheme. For example, these 2 schemes are sometimes used: lib$name.so --> libname$major.$major.$minor lib$name.so --> libname-$major.$major.$minor There exists other schemes. With those cases, and before these patches, makepkg would add lib$name.so to provides unversioned and display a warning. And if another package adds lib$name.so as a dependency, the build will succeed and only a warning will be displayed. Not only makepkg fails to find version/arch for libraries in those scenarios. But the success of builds in both provide/depend sides might give the illusion that versioned sodepends are actually honored. If the idea behind these 2 patches is rejected. I would like to propose promoting the warning in find_libprovides() to an error. [PATCH 1/2] makepkg: Search/Add real library names libprovide link to [PATCH 2/2] makepkg: Search/Add real library names libdepend link to

4 4

[pacman-dev] [PATCH 2/2] makepkg: Search/Add real library names libdepend link to
by Mohammad Alsaleh 09 May '13

09 May '13

Search library paths for libdepend. If found and its realpath is not of the name scheme "libdepend.ver". Add the real library name to depends. Coupled with code in the libprovides side, this is necessary as the real library name is the one binaries depend on. And it is the one we can obtain version/arch info from. Signed-off-by: Mohammad Alsaleh <msal(a)tormail.org> --- Note: parsing library paths from `ldconfig -v` output is relatively slow. scripts/makepkg.sh.in | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7f4ee25..c4d0020 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1680,6 +1680,25 @@ tidy_install() { fi } +extra_libdepends() { + local d dfile extra_d extra_dfile + + # Search library paths for libdepend. + # If libdepend's file realpath has a different library name, add that name to depends + for d in "${depends[@]}"; do + if [[ $d = *.so ]]; then + while read dfile; do + extra_dfile="$(basename "$(realpath "$dfile")")" + if [[ "$extra_dfile" =~ \.so && "${extra_dfile%.so*}.so" != "$d" ]]; then + extra_d="${extra_dfile%.so*}.so" + depends+=("$extra_d") + warning "$(gettext "Library %s added to %s")" "$extra_d" "'depends'" + fi + done < <(find $(ldconfig -v 2>/dev/null| grep '^/' | sed 's|:||') -type l -maxdepth 1 -name "$d" 2>/dev/null) + fi + done +} + find_libdepends() { local d sodepends; @@ -1846,6 +1865,7 @@ write_pkginfo() { printf "size = %s\n" "$size" printf "arch = %s\n" "$pkgarch" + extra_libdepends extra_libprovides mapfile -t provides < <(find_libprovides) mapfile -t depends < <(find_libdepends) -- 1.8.2.2

2 1

[pacman-dev] [PATCH 1/2] makepkg: Search/Add real library names libprovide link to
by Mohammad Alsaleh 08 May '13

08 May '13

If libprovide file's realpath is not of the scheme "$libprovide.ver", add the real library name used to provides. The real name is needed to find version/arch info. And it is the one actually used by binaries as a dependency. Signed-off-by: Mohammad Alsaleh <msal(a)tormail.org> --- scripts/makepkg.sh.in | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b85b87e..7f4ee25 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1744,6 +1744,23 @@ find_libdepends() { printf '%s\n' "${libdepends[@]}" } +extra_libprovides() { + local p pfile extra_p extra_pfile + + # If libprovide's realpath has a different library name, add that name to provides + for p in "${provides[@]}"; do + if [[ $p = *.so ]]; then + while read pfile; do + extra_pfile="$(basename "$(realpath "$pfile")")" + if [[ "$extra_pfile" =~ \.so && "${extra_pfile%.so*}.so" != "$p" ]]; then + extra_p="${extra_pfile%.so*}.so" + provides+=("$extra_p") + warning "$(gettext "Library %s added to %s")" "$extra_p" "'provides'" + fi + done < <(find "$pkgdir" -type l -name "$p" 2>/dev/null) + fi + done +} find_libprovides() { local p libprovides missing @@ -1829,6 +1846,7 @@ write_pkginfo() { printf "size = %s\n" "$size" printf "arch = %s\n" "$pkgarch" + extra_libprovides mapfile -t provides < <(find_libprovides) mapfile -t depends < <(find_libdepends) -- 1.8.2.2

1 0

[pacman-dev] [PATCH] Fix spelling errors using 'codespell' tool
by Anatol Pomozov 07 May '13

07 May '13

--- NEWS | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/be_package.c | 4 ++-- lib/libalpm/deps.c | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/util.c | 6 +++--- m4/pkg.m4 | 2 +- scripts/library/README | 2 +- src/pacman/conf.c | 4 ++-- src/pacman/pacman.c | 4 ++-- src/pacman/util.c | 8 ++++---- test/scripts/parseopts_test.sh | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NEWS b/NEWS index 3a0361d..ce52e6f 100644 --- a/NEWS +++ b/NEWS @@ -912,7 +912,7 @@ VERSION DESCRIPTION - HTTP/1.1 support - an improved progress bar with transfer rates and ETA - cleaned up warning output a bit -2.7.2 - Supressed "No such file" messages during stripping +2.7.2 - Suppressed "No such file" messages during stripping - Removed extra newlines in /var/log/pacman.log - Added a --noextract option to makepkg to skip source extraction 2.7.1 - Fixed a couple obscure segfaults diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 1d9db60..3ef81e3 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -314,7 +314,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, hash_local = alpm_compute_md5sum(filename); hash_pkg = alpm_compute_md5sum(checkfile); - /* update the md5 hash in newpkg's backup (it will be the new orginal) */ + /* update the md5 hash in newpkg's backup (it will be the new original) */ alpm_list_t *i; for(i = alpm_pkg_get_backup(newpkg); i; i = i->next) { alpm_backup_t *backup = i->data; diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 3b43ed8..cfe5fb3 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -390,7 +390,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, /* If full is false, only read through the archive until we find our needed * metadata. If it is true, read through the entire archive, which serves - * as a verfication of integrity and allows us to create the filelist. */ + * as a verification of integrity and allows us to create the filelist. */ while((ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) { const char *entry_name = archive_entry_pathname(entry); @@ -460,7 +460,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, } } - if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occured */ + if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occurred */ _alpm_log(handle, ALPM_LOG_ERROR, _("error while reading package %s: %s\n"), pkgfile, archive_error_string(archive)); handle->pm_errno = ALPM_ERR_LIBARCHIVE; diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index aebfd0b..96c49a9 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -488,7 +488,7 @@ alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep) /* These parameters are messy. We check if this package, given a list of * targets and a db is safe to remove. We do NOT remove it if it is in the - * target list, or if if the package was explictly installed and + * target list, or if if the package was explicitly installed and * include_explicit == 0 */ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, alpm_list_t *targets, int include_explicit) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index c653e45..3208458 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -105,7 +105,7 @@ static alpm_list_t *list_sigsum(gpgme_sigsum_t sigsum) sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_TOO_OLD, "crl too old"); /* A policy was not met. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_BAD_POLICY, "bad policy"); - /* A system error occured. */ + /* A system error occurred. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SYS_ERROR, "sys error"); /* Fallback case */ if(!sigsum) { diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index dc1d043..f84fb66 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -527,7 +527,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) goto cleanup; } - /* fork- parent and child each have seperate code blocks below */ + /* fork- parent and child each have separate code blocks below */ pid = fork(); if(pid == -1) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not fork a new process (%s)\n"), strerror(errno)); @@ -677,7 +677,7 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename) return NULL; } -/** Check the alpm cachedirs for existance and find a writable one. +/** Check the alpm cachedirs for existence and find a writable one. * If no valid cache directory can be found, use /tmp. * @param handle the context handle * @return pointer to a writable cache directory. @@ -1251,7 +1251,7 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a /** Checks whether a string matches a shell wildcard pattern. * Wrapper around fnmatch. - * @param pattern pattern to match aganist + * @param pattern pattern to match against * @param string string to check against pattern * @return 0 if string matches pattern, non-zero if they don't match and on * error diff --git a/m4/pkg.m4 b/m4/pkg.m4 index 5152a4b..5c20244 100644 --- a/m4/pkg.m4 +++ b/m4/pkg.m4 @@ -53,7 +53,7 @@ fi[]dnl # to PKG_CHECK_MODULES(), but does not set variables or print errors. # # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place +# only at the first occurrence in configure.ac, so if the first place # it's called might be skipped (such as if it is within an "if", you # have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- diff --git a/scripts/library/README b/scripts/library/README index c28ebc6..9e2b6a1 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -17,7 +17,7 @@ the short opts, any number of valid long opts may be be passed. The end of the options delimiter must then be added, followed by the user arguments to the calling program. -Reccommended Usage: +Recommended Usage: OPT_SHORT='fb:z' OPT_LONG=('foo' 'bar:' 'baz') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 2ea49cc..5adc96c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -519,7 +519,7 @@ static int _parse_options(const char *key, char *value, char *endptr; const char *oldlocale; - /* set the locale to 'C' for consistant decimal parsing (0.7 and never + /* set the locale to 'C' for consistent decimal parsing (0.7 and never * 0,7) from config files, then restore old setting when we are done */ oldlocale = setlocale(LC_NUMERIC, NULL); setlocale(LC_NUMERIC, "C"); @@ -636,7 +636,7 @@ static int _add_mirror(alpm_db_t *db, char *value) } /** Sets up libalpm global stuff in one go. Called after the command line - * and inital config file parsing. Once this is complete, we can see if any + * and initial config file parsing. Once this is complete, we can see if any * paths were defined. If a rootdir was defined and nothing else, we want all * of our paths to live under the rootdir that was specified. Safe to call * multiple times (will only do anything the first time). diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 916873d..c220b27 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -288,7 +288,7 @@ static ssize_t xwrite(int fd, const void *buf, size_t count) } /** Catches thrown signals. Performs necessary cleanup to ensure database is - * in a consistant state. + * in a consistent state. * @param signum the thrown signal */ static void handler(int signum) @@ -313,7 +313,7 @@ static void handler(int signum) return; } } - /* SIGINT: no commiting transaction, release it now and then exit pacman + /* SIGINT: no committing transaction, release it now and then exit pacman * SIGHUP, SIGTERM: release no matter what */ alpm_trans_release(config->handle); /* output a newline to be sure we clear any line we may be on */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 862c8e8..bcaead0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -314,7 +314,7 @@ size_t strtrim(char *str) return end - pch; } -/* Replace all occurances of 'needle' with 'replace' in 'str', returning +/* Replace all occurrences of 'needle' with 'replace' in 'str', returning * a new string (must be free'd) */ char *strreplace(const char *str, const char *needle, const char *replace) { @@ -336,11 +336,11 @@ char *strreplace(const char *str, const char *needle, const char *replace) q = strstr(p, needle); } - /* no occurences of needle found */ + /* no occurrences of needle found */ if(!list) { return strdup(str); } - /* size of new string = size of old string + "number of occurences of needle" + /* size of new string = size of old string + "number of occurrences of needle" * x "size difference between replace and needle" */ newsz = strlen(str) + 1 + alpm_list_count(list) * (replacesz - needlesz); @@ -354,7 +354,7 @@ char *strreplace(const char *str, const char *needle, const char *replace) for(i = list; i; i = alpm_list_next(i)) { q = i->data; if(q > p) { - /* add chars between this occurence and last occurence, if any */ + /* add chars between this occurrence and last occurrence, if any */ memcpy(newp, p, (size_t)(q - p)); newp += q - p; } diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 1693b9f..2862cae 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -83,7 +83,7 @@ parse '-p PKGBUILD --' 3 -pPKGBUILD # valid shortopts as a long opt parse '--' 1 --sir -# long opt wiht no optarg +# long opt with no optarg parse '--log --' 2 --log # long opt with missing optarg -- 1.8.2.1

2 2

[pacman-dev] pkgrel in VCS packages
by Christian Hesse 07 May '13

07 May '13

Hello everybody, I love the new pkgver() function that allows to update pkgver string. However this also sets "pkgrel=1". Most of the time this is ok, but it is problematic for repositories that change very seldom, so a rebuild would get exactly the same version string again and again. Is there any way to workaround this? -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Chris get my mail address: */=0;b=c[a++];) putchar(b-1/(/* gcc -o sig sig.c && ./sig */b/42*2-3)*42);}

3 5