- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] added doxygen documentation
by andrew.gregory.8＠gmail.com 22 Nov '11

22 Nov '11

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> Made existing documentation more consistent and added documentation where there was none. A couple functions I did not fully understand still need documentation and are marked with 'TODO'. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/util.c | 122 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 98 insertions(+), 24 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f5b7968..35bc059 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -173,8 +173,11 @@ cleanup: return ret; } -/* Trim whitespace and newlines from a string -*/ +/** Trim leading and trailing whitespace, including newlines, from a string. + * Modifies str in place. + * @param str a string to trim + * @return str + */ char *_alpm_strtrim(char *str) { char *pch = str; @@ -190,6 +193,7 @@ char *_alpm_strtrim(char *str) if(pch != str) { size_t len = strlen(pch); if(len) { + /* move the remaining string to the beginning of str */ memmove(str, pch, len + 1); } else { *str = '\0'; @@ -210,8 +214,7 @@ char *_alpm_strtrim(char *str) return str; } -/** - * Trim trailing newline from a string (if one exists). +/** Trim trailing newlines from a string (if one exists). * @param str a single line of text * @return the length of the trimmed string */ @@ -232,8 +235,7 @@ size_t _alpm_strip_newline(char *str) /* Compression functions */ -/** - * Open an archive for reading and perform the necessary boilerplate. +/** Open an archive for reading and perform the necessary boilerplate. * This takes care of creating the libarchive 'archive' struct, setting up * compression and format options, opening a file descriptor, setting up the * buffer size, and performing a stat on the path once opened. @@ -290,9 +292,7 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path, return fd; } -/** - * @brief Unpack a specific file in an archive. - * +/** Unpack a specific file in an archive. * @param handle the context handle * @param archive the archive to unpack * @param prefix where to extract the files @@ -313,15 +313,12 @@ int _alpm_unpack_single(alpm_handle_t *handle, const char *archive, return ret; } -/** - * @brief Unpack a list of files in an archive. - * +/** Unpack a list of files in an archive. * @param handle the context handle * @param path the archive to unpack * @param prefix where to extract the files * @param list a list of files within the archive to unpack or NULL for all * @param breakfirst break after the first entry found - * * @return 0 on success, 1 on failure */ int _alpm_unpack(alpm_handle_t *handle, const char *path, const char *prefix, @@ -421,7 +418,10 @@ cleanup: return ret; } -/* does the same thing as 'rm -rf' */ +/** Recursively removes a path similar to 'rm -rf'. + * @param path path to remove + * @return 0 on success, positive int on failure + */ int _alpm_rmrf(const char *path) { int errflag = 0; @@ -464,8 +464,7 @@ int _alpm_rmrf(const char *path) return 0; } -/** - * Determine if there are files in a directory +/** Determine if there are files in a directory. * @param handle the context handle * @param path the full absolute directory path * @param full_count whether to return an exact count of files @@ -505,7 +504,13 @@ ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path, closedir(dir); return files; } - +/** Write formatted message to log. + * @param handle the context handle + * @param format formatted string to write out + * @param args formatting arguments + * @return 0 or number of characters written on success, negative int on + * failure + */ int _alpm_logaction(alpm_handle_t *handle, const char *fmt, va_list args) { int ret = 0; @@ -537,6 +542,12 @@ int _alpm_logaction(alpm_handle_t *handle, const char *fmt, va_list args) return ret; } +/** TODO. + * @param handle the context handle + * @param path + * @param argv + * @return + */ int _alpm_run_chroot(alpm_handle_t *handle, const char *path, char *const argv[]) { pid_t pid; @@ -656,6 +667,10 @@ cleanup: return retval; } +/** Run ldconfig in a chroot. + * @param handle the context handle + * @return 0 + */ int _alpm_ldconfig(alpm_handle_t *handle) { char line[PATH_MAX]; @@ -674,8 +689,13 @@ int _alpm_ldconfig(alpm_handle_t *handle) return 0; } -/* Helper function for comparing strings using the - * alpm "compare func" signature */ +/** Helper function for comparing strings using the alpm "compare func" + * signature. + * @param s1 string to be compared + * @param s1 string to be compared + * @return 0 if strings are equal, positive int if first unequal character + * has a greater value in s1, negative if it has a greater value in s2 + */ int _alpm_str_cmp(const void *s1, const void *s2) { return strcmp(s1, s2); @@ -784,6 +804,11 @@ int _alpm_lstat(const char *path, struct stat *buf) } #ifdef HAVE_LIBSSL +/** Compute the md5 of a file. + * @param path file path to md5 + * @param output string to hold computed md5 + * @return 0 on success, 0 on file open error, 2 on file read error + */ static int md5_file(const char *path, unsigned char output[16]) { MD5_CTX ctx; @@ -820,6 +845,12 @@ static int md5_file(const char *path, unsigned char output[16]) } /* third param is so we match the PolarSSL definition */ +/** Compute the sha2 of a file. + * @param path file path to sha2 + * @param output string to hold computed sha2 + * @param is224 use sha224 instead of sha256 + * @return 0 on success, 1 on file open error, 2 on file read error + */ static int sha2_file(const char *path, unsigned char output[32], int is224) { SHA256_CTX ctx; @@ -936,6 +967,13 @@ char SYMEXPORT *alpm_compute_sha256sum(const char *filename) return sha256sum; } +/** Calculates a files md5 or sha2 and compares it to an expected value. + * @param filepath path of the file to check + * @param expected hash value to compare against + * @param type hash type to use + * @return 0 if file matches the expected hash, 1 if they do not match, -1 on + * error + */ int _alpm_test_checksum(const char *filepath, const char *expected, enum _alpm_csum type) { @@ -963,6 +1001,12 @@ int _alpm_test_checksum(const char *filepath, const char *expected, } /* Note: does NOT handle sparse files on purpose for speed. */ +/** TODO. + * Does not handle sparse files on purpose for speed. + * @param a + * @param b + * @return + */ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b) { /* ensure we start populating our line buffer at the beginning */ @@ -1058,6 +1102,13 @@ cleanup: } } +/** Parse a package db entry. + * @param target db entry to parse + * @param name string pointer to hold package name + * @param version string pointer to hold package version + * @param name_hash string pointer to hold package name hash + * @return 0 on success, -1 on error + */ int _alpm_splitname(const char *target, char **name, char **version, unsigned long *name_hash) { @@ -1110,8 +1161,7 @@ int _alpm_splitname(const char *target, char **name, char **version, return 0; } -/** - * Hash the given string to an unsigned long value. +/** Hash the given string to an unsigned long value. * This is the standard sdbm hashing algorithm. * @param str string to hash * @return the hash value of the given string @@ -1131,6 +1181,10 @@ unsigned long _alpm_hash_sdbm(const char *str) return hash; } +/** Convert a string to a file offset. + * @param line string to convert + * @return file offset on success, -1 on error + */ off_t _alpm_strtoofft(const char *line) { char *end; @@ -1156,6 +1210,10 @@ off_t _alpm_strtoofft(const char *line) return (off_t)result; } +/** Parses a date into an alpm_time_t struct. + * @param line date to parse + * @return time struct on success, 0 on error + */ alpm_time_t _alpm_parsedate(const char *line) { char *end; @@ -1189,8 +1247,7 @@ alpm_time_t _alpm_parsedate(const char *line) return (alpm_time_t)result; } -/** - * Wrapper around access() which takes a dir and file argument +/** Wrapper around access() which takes a dir and file argument * separately and generates an appropriate error message. * If dir is NULL file will be treated as the whole path. * @param handle an alpm handle @@ -1199,7 +1256,6 @@ alpm_time_t _alpm_parsedate(const char *line) * @param amode access mode as described in access() * @return int value returned by access() */ - int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int amode) { size_t len = 0; @@ -1240,6 +1296,13 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a return ret; } +/** Checks whether a string matches a shell wildcard pattern. + * Wrapper around fnmatch. + * @param pattern pattern to match aganist + * @param string string to check against pattern + * @return 0 if string matches pattern, non-zero if they don't match and on + * error + */ int _alpm_fnmatch(const void *pattern, const void *string) { return fnmatch(pattern, string, 0); @@ -1247,6 +1310,11 @@ int _alpm_fnmatch(const void *pattern, const void *string) #ifndef HAVE_STRNDUP /* A quick and dirty implementation derived from glibc */ +/** Determines the length of a fixed-size string. + * @param s string to be measured + * @param max maximum number of characters to search for the string end + * @return length of s or max, whichever is smaller + */ static size_t strnlen(const char *s, size_t max) { register const char *p; @@ -1254,6 +1322,12 @@ static size_t strnlen(const char *s, size_t max) return (p - s); } +/** Copies a string. + * Returned string needs to be freed + * @param s string to be copied + * @param n maximum number of characters to copy + * @return pointer to the new string on success, NULL on error + */ char *strndup(const char *s, size_t n) { size_t len = strnlen(s, n); -- 1.7.7.3

2 2

[pacman-dev] [PATCH] makepkg: avoid using comm for diff'ing package lists
by Dave Reisner 22 Nov '11

22 Nov '11

Whereas comm will check inputs to see if they're sorted (and warn when they aren't), grep doesn't even care about ordering. In this particular instance -- neither do we. We're only interested that the two lists are equivalent. Fixes FS#26580. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 26a2789..11f9adb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -506,10 +506,10 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case - if [[ -n $(comm -23 <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}")) ]]; then - warning "$(gettext "Failed to remove installed dependencies.")" - return 0 + if [[ -n $(grep -xvFf <(printf '%s\n' "${current_packagelist[@]}") \ + <(printf '%s\n' "${original_packagelist[@]}") ) ]]; then + warning "$(gettext "Failed to remove installed dependencies.")" + return 0 fi local deplist=($(comm -13 <(printf "%s\n" "${original_pkglist[@]}") \ -- 1.7.7.4

1 1

[pacman-dev] [PATCH] Add two new pactests for pacman upgrade behavior
by Dan McGee 22 Nov '11

22 Nov '11

Both currently marked as failing. * sync303.py encapsulates the broken behavior reported in FS#27214. * sync304.py shows how packages depending on a specific version of a package in SyncFirst can cause breakage of the dependency resolver. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/tests/sync303.py | 38 ++++++++++++++++++++++++++++++++++++++ test/pacman/tests/sync304.py | 27 +++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/sync303.py create mode 100644 test/pacman/tests/sync304.py diff --git a/test/pacman/tests/sync303.py b/test/pacman/tests/sync303.py new file mode 100644 index 0000000..933d4e0 --- /dev/null +++ b/test/pacman/tests/sync303.py @@ -0,0 +1,38 @@ +self.description = "Sysupgrade: upgrade pacman with deps as provisions" + +sp = pmpkg("pacman", "1.0-2") +sp.depends = ["zlib"] +self.addpkg2db("sync", sp) + +glibcdep = pmpkg("glibc", "2.13-1") +self.addpkg2db("sync", glibcdep) + +zlibdep = pmpkg("zlib", "1.2.5-3") +zlibdep.depends = ["glibc"] +self.addpkg2db("sync", zlibdep) + + +lp = pmpkg("pacman", "1.0-1") +lp.depends = ["zlib"] +self.addpkg2db("local", lp) + +lp2 = pmpkg("glibc-awesome", "2.13-2") +lp2.provides = ["glibc=2.13"] +lp2.conflicts = ["glibc"] +self.addpkg2db("local", lp2) + +lp3 = pmpkg("zlib", "1.2.5-3") +self.addpkg2db("local", lp3) + +self.option["SyncFirst"] = ["pacman"] + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pacman") +self.addrule("PKG_VERSION=pacman|1.0-2") +self.addrule("PKG_EXIST=glibc-super") +self.addrule("PKG_VERSION=glibc|2.13-2") +self.addrule("PKG_EXIST=zlib") + +self.expectfailure = True diff --git a/test/pacman/tests/sync304.py b/test/pacman/tests/sync304.py new file mode 100644 index 0000000..4ac1a01 --- /dev/null +++ b/test/pacman/tests/sync304.py @@ -0,0 +1,27 @@ +self.description = "Sysupgrade: upgrade pacman being depended on" + +sp = pmpkg("pacman", "4.0.1-1") +self.addpkg2db("sync", sp) + +sp2 = pmpkg("pyalpm", "2-1") +sp2.depends = ["pacman>=4.0", "pacman<4.1"] +self.addpkg2db("sync", sp2) + +lp = pmpkg("pacman", "3.5.4-1") +self.addpkg2db("local", lp) + +lp2 = pmpkg("pyalpm", "1-1") +lp2.depends = ["pacman>=3.5", "pacman<3.6"] +self.addpkg2db("local", lp2) + +self.option["SyncFirst"] = ["pacman"] + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pacman") +self.addrule("PKG_VERSION=pacman|4.0.1-1") +self.addrule("PKG_EXIST=pyalpm") +self.addrule("PKG_VERSION=pyalpm|2-1") + +self.expectfailure = True -- 1.7.7.4

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v4.0.1, created. v4.0.1
by dan＠archlinux.org 21 Nov '11

21 Nov '11

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.0.1 has been created at 8553eeeccf14fe0627f3f42967b6c3012c102d3f (tag) tagging 507a2d15e65aba93a20ee99d90345917866407dc (commit) replaces v4.0.0 tagged by Dan McGee on Sun Nov 20 21:34:57 2011 -0600 - Log ----------------------------------------------------------------- 4.0.1 maint release, variety of small fixes -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk7Jxu4ACgkQXC5GoPU6du25NQCgppV6finXg+ULvRedM3c4OpGZ YaAAniK2FKkp3yZUU0FHtJGcKdJClXLU =ECPC -----END PGP SIGNATURE----- Allan McRae (4): Update libtool files Fix libtool detection of --as-needed flag makepkg: handle pgp signatures with .sign extension Update documentation regarding signature extensions Dan McGee (28): VerbosePkgLists: format table lines in i18n-compatible way signing: delay gpgme_init() until latest possible moment Add user-visible warning message if public keyring not found Update NEWS for missing 4.0 stuff and 4.0.1 changes so far doc: update .gitignore, add CSS override for new tables usage doc/index.txt: Reformat past releases chart curl_gethost() potential bug fixups Coding style cleanups Add missing #ifdef around cURL error code in download struct makepkg: don't attach traps until after argument parsing Table display: print message with warning: prefix Show an error message on failed remote key lookup pacman-key: add a default keyserver timeout value on --init Use stderr as output stream for pm_printf() Remove pm_fprintf() in favor of pm_printf() Remove remaining usages of fprintf() from frontend Add more logging to download code Don't realloc a 0-length files array when loading packages Add some unowned symlink replacement tests Fix issues with replacing unowned symlinks Introduce ALPM_BUFFER_SIZE constant Fix thinko in _alpm_strip_newline Fix download progress rounding edge case Updates in preparation for 4.0.1 release Update translations from Transifex Allow sync_prepare to work in certain cases without sync databases Update translations from Transifex Final changes before 4.0.1 release Dave Reisner (9): lib/sync: inform callers of compute_download_size of a partial paccache: ensure seen/seenarch vars are set paccache: add vim modeline dload: chmod tempfiles to respect umask dload: remove redundant conditional src/util: link vercmp against .lo, not the .o makepkg: check for value before using eval'd var makepkg.conf: disable motd printing for rsync DLAGENT makepkg: trim trailing space from whitespace sensitive vars Lukas Fleischer (2): repo-add: Avoid race condition in signal handlers scripts/*.sh.in: Fix signal handler error messages lolilolicon (1): bacman: pkgrel does not have to be an integer ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-98-g96b3ba3
by dan＠archlinux.org 21 Nov '11

21 Nov '11

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 96b3ba3470f11842312e4fdb34b74b391842fc33 (commit) via 2141b7112d237221280781bed2b2bb6efadc963e (commit) via 2f96067fe71e796e9da378620ad16a9f94a7b8ac (commit) via 5ba8b83b8be55b9d7a55cc8bfdef80c37117101d (commit) via cb898be887160e1e14ff0f1e3a3e506fc796ef57 (commit) via 80868b0da696d16c2fdc527cdb6f7fa2c0973044 (commit) via 6a9ed330551e585ce887a2bb53fb022b1c92da31 (commit) via 507a2d15e65aba93a20ee99d90345917866407dc (commit) via b8ef22312b4e5fb6b44b39c290303b2b77a68ea9 (commit) via 2752932d1966488c5bcc0c45282b0de5c8bf561e (commit) from 919b604c29060b3b14162ef331dfccc018606919 (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 96b3ba3470f11842312e4fdb34b74b391842fc33 Merge: 2141b71 507a2d1 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 20 21:40:50 2011 -0600 Merge branch 'maint' commit 2141b7112d237221280781bed2b2bb6efadc963e Author: Florian Pritz <bluewind(a)xinu.at> Date: Thu Oct 20 20:39:28 2011 +0200 add key algo to import msg Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2f96067fe71e796e9da378620ad16a9f94a7b8ac Author: Florian Pritz <bluewind(a)xinu.at> Date: Tue Oct 18 22:46:50 2011 +0200 change gpg import message to resemble gpg --list-keys Dan: const pointers, don't worry about bitfields. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5ba8b83b8be55b9d7a55cc8bfdef80c37117101d Author: Phillip Smith <fukawi2(a)gmail.com> Date: Tue Nov 1 12:00:47 2011 +1100 makepkg: add support for PACKAGER environment var Add support for overriding configuration in /etc/makepkg.conf and ~/.makepkg.conf by setting the environment variable PACKAGER similar to how SRCDEST and PKGDEST behave. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cb898be887160e1e14ff0f1e3a3e506fc796ef57 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Nov 20 13:46:24 2011 +1000 repo-add: Remove .tmp. prefix from output Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 80868b0da696d16c2fdc527cdb6f7fa2c0973044 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 15 22:16:42 2011 -0600 repo-add: ensure database and signature files are always viewed in whole This addresses a short but sweet race condition currently existing in repo-add and repo-remove. We do the smart thing and zip the database to a location in a temporary directory and not over the original database directly. However, we then proceed to move this file directly from the temporary directory to our final location, which is more than likely a cross-filesystem move (/tmp on tmpfs) and thus non-atomic. Instead, zip the file to the same directory, prefixing the filename with '.tmp.'. We then move the file into place. This move is guaranteed to be atomic, so any reader of the database file will get either the old version, the new version, or ENOENT. We also perform a hardlink if possible instead of a move when shifting the old database out of the way to '.old'; this ensures there is no chance of a database file not existing during the whole process. Only one small race condition should now be present- when the database has been fully moved into place and the signature has not, you may see a mismatch. There seems to be no good way to address this, and it existed before this patch. A final note- if someone had locked-down permissions on the directory that the database files are in (e.g., could only write to foo.db.tar.gz, foo.db, foo.db.tar.gz.old, foo.db.old, and the lock file), this would break. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6a9ed330551e585ce887a2bb53fb022b1c92da31 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 15 22:16:41 2011 -0600 repo-add: ensure path to LOCKFILE is always absolute Given our semi-frequent use of pushd/popd, if we are in any directory but the original and the database path given was relative, we won't unlock the database file when cleaning up after an error. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2752932d1966488c5bcc0c45282b0de5c8bf561e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 16 14:53:34 2011 -0600 Update alpm_errno_t type to non-enum version Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 10 ++++++-- doc/makepkg.8.txt | 4 +++ lib/libalpm/alpm.h | 3 ++ lib/libalpm/signing.c | 22 +++++++++++++++++++ lib/libalpm/sync.c | 2 +- scripts/makepkg.sh.in | 8 ++++-- scripts/po/Makevars | 4 +-- scripts/repo-add.sh.in | 55 +++++++++++++++++++++++++++++------------------ src/pacman/callback.c | 10 +++++++- src/pacman/po/zh_TW.po | 3 +- 10 files changed, 87 insertions(+), 34 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-44-g507a2d1
by dan＠archlinux.org 21 Nov '11

21 Nov '11

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, maint has been updated via 507a2d15e65aba93a20ee99d90345917866407dc (commit) via b8ef22312b4e5fb6b44b39c290303b2b77a68ea9 (commit) from c79c068fe9b80ea9af831c8c883f27fad2e0d128 (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 507a2d15e65aba93a20ee99d90345917866407dc Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 20 21:27:28 2011 -0600 Final changes before 4.0.1 release * Add last-minute changes to NEWS * Don't treat '_' or '_n' special in scripts when finding translatable strings; this breaks with one use of `read` and a dummy _ variable Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8ef22312b4e5fb6b44b39c290303b2b77a68ea9 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Nov 18 08:35:21 2011 -0500 makepkg: trim trailing space from whitespace sensitive vars This applies to pkgver, pkgrel, and epoch and ensures that any trailing whitespace outside of the context of the variable declaration itself is properly trimmed. The Bash parser will ignore this, and so should we. We don't need to worry about leading space because it would force a syntax error, or fail validation. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 10 +++++++--- scripts/makepkg.sh.in | 6 +++--- scripts/po/Makevars | 4 +--- src/pacman/po/zh_TW.po | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] repo-add: Remove .tmp. prefix from output
by Allan McRae 20 Nov '11

20 Nov '11

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a follow-up from Dan's repo-add patches. scripts/repo-add.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index fc008fc..4659129 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -195,7 +195,7 @@ create_signature() { gpg --detach-sign --use-agent ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$? if (( ! ret )); then - msg2 "$(gettext "Created signature file %s.")" "${dbfile##*/}.sig" + msg2 "$(gettext "Created signature file %s.")" "${dbfile##*/.tmp.}.sig" else warning "$(gettext "Failed to sign package database.")" fi -- 1.7.7.3

1 0

[pacman-dev] [PATCH 1/2] repo-add: ensure path to LOCKFILE is always absolute
by Dan McGee 20 Nov '11

20 Nov '11

Given our semi-frequent use of pushd/popd, if we are in any directory but the original and the database path given was relative, we won't unlock the database file when cleaning up after an error. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index fc008fc..280c024 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -411,13 +411,8 @@ elephant() { check_repo_db() { local repodir - # ensure the path to the DB exists - if [[ "$LOCKFILE" == /* ]]; then - repodir=${LOCKFILE%/*}/ - else - repodir=$PWD/$LOCKFILE - repodir=${repodir%/*}/ - fi + # ensure the path to the DB exists; $LOCKFILE is always an absolute path + repodir=${LOCKFILE%/*}/ if [[ ! -d "$repodir" ]]; then error "$(gettext "%s does not exist or is not a directory.")" "$repodir" @@ -624,7 +619,11 @@ if [[ -z $REPO_DB_FILE ]]; then exit 1 fi -LOCKFILE=$REPO_DB_FILE.lck +if [[ $REPO_DB_FILE == /* ]]; then + LOCKFILE=$REPO_DB_FILE.lck +else + LOCKFILE=$PWD/$REPO_DB_FILE.lck +fi verify_repo_extension "$REPO_DB_FILE" >/dev/null check_repo_db -- 1.7.7.3

2 3

[pacman-dev] [PATCH] makepkg: trim trailing space from whitespace sensitive vars
by Dave Reisner 20 Nov '11

20 Nov '11

Declarations such as: pkgver=2.11 # foo will work, but trimming off the comment (without trimming the trailing whitespace) will result in an incorrect validation error. Bash automatically trims this trailing whitespace and does the right thing under the covers, so we should honor this as well. NB: We don't need to worry about leading whitespace because it will cause a syntax error (when unquoted), or fail validation (when quoted). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Too late to squeeze this into maint? scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 085fbb9..39ce017 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1441,7 +1441,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i = *[[:space:]:-]* ]]; then error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" return 1 @@ -1450,7 +1450,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i = *[[:space:]-]* ]]; then error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel" return 1 -- 1.7.7.3

4 5

[pacman-dev] [PATCH] pacsysclean: Add new contrib script
by Eric Bélanger 17 Nov '11

17 Nov '11

pacsysclean sort installed packages by decreasing installed size. It's useful for finding large unused package when doing system clean-up. This script is an improved version of other similar scripts posted on the forums. Thanks goes to Dave as I reused the size_to_human function from his paccache script. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- If you can think of a better name, feel free to suggest one. --- contrib/.gitignore | 1 + contrib/Makefile.am | 5 ++- contrib/pacsysclean.in | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletions(-) create mode 100755 contrib/pacsysclean.in diff --git a/contrib/.gitignore b/contrib/.gitignore index 1bd145f..19b81e0 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -6,5 +6,6 @@ paclist paclog-pkglist pacscripts pacsearch +pacsysclean wget-xdelta.sh zsh_completion diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 10b03a2..754096d 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -5,7 +5,8 @@ OURSCRIPTS = \ paclist \ paclog-pkglist \ pacscripts \ - pacsearch + pacsearch \ + pacsysclean OURFILES = \ bash_completion \ @@ -21,6 +22,7 @@ EXTRA_DIST = \ paclist.in \ pacscripts.in \ pacsearch.in \ + pacsysclean.in \ vimprojects \ zsh_completion.in \ README @@ -59,6 +61,7 @@ paclist: $(srcdir)/paclist.in paclog-pkglist: $(srcdir)/paclog-pkglist.in pacscripts: $(srcdir)/pacscripts.in pacsearch: $(srcdir)/pacsearch.in +pacsysclean: $(srcdir)/pacsysclean.in pactree: $(srcdir)/pactree.in zsh_completion: $(srcdir)/zsh_completion.in diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in new file mode 100755 index 0000000..e393e24 --- /dev/null +++ b/contrib/pacsysclean.in @@ -0,0 +1,87 @@ +#!/bin/bash + +# pacsysclean - Sort installed packages by decreasing installed size. Useful for system clean-up. +# +# Copyright (C) 2011 Eric Bélanger <eric(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/>. + +export TEXTDOMAIN='pacman' +export TEXTDOMAINDIR='/usr/share/locale' + +# determine whether we have gettext; make it a no-op if we do not +if ! type gettext &>/dev/null; then + gettext() { + echo "$@" + } +fi + +usage() { + echo "$0 - Sort installed packages by decreasing installed size." + echo + echo "Usage: $0 [options]" + echo + echo "Options:" + echo " -a List all packages (Default)" + echo " -e List unrequired explicitely installed packages" + echo " -h, --help Show this help message and exit" +} + +size_to_human() { + awk -v size="$1" ' + BEGIN { + suffix[1] = "KiB" + suffix[2] = "MiB" + suffix[3] = "GiB" + suffix[4] = "TiB" + count = 1 + + while (size > 1024) { + size /= 1024 + count++ + } + + sizestr = sprintf("%.2f", size) + sub(/.?0+$/, "", sizestr) + printf("%s %s", sizestr, suffix[count]) + }' +} + +PACMAN_OPTS="-Qq" +if [ -n "$1" ]; then + case "$1" in + -a) PACMAN_OPTS="-Qq" ;; + -e) PACMAN_OPTS="-Qetq" ;; + -h|--help) usage; exit 0 ;; + *) usage; exit 1 ;; + esac +fi + +TEMPDIR=$(mktemp -d /tmp/cleanup-script.XXXX) +cd $TEMPDIR + +# Sort installed packages by decreasing installed size. Useful for system clean-up. +for package in $(pacman $PACMAN_OPTS); do + echo $(pacman -Qi $package |grep 'Installed Size' |awk '{print $4}') $package +done | sort -g -r -o raw.txt + +N=0 +while read LINE ; do + N=$((N+1)) + size_to_human $(echo -n $LINE |cut -d' ' -f1) >> sorted-list.txt + echo -n ' : ' >> sorted-list.txt + echo -n $LINE |cut -d' ' -f2 >> sorted-list.txt +done < raw.txt + +echo "Files saved to $TEMPDIR" -- 1.7.6

3 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-88-g919b604
by dan＠archlinux.org 16 Nov '11

16 Nov '11

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 919b604c29060b3b14162ef331dfccc018606919 (commit) via dee8144ce5ca96ceca643d74fd6152ecf812f8af (commit) via c79c068fe9b80ea9af831c8c883f27fad2e0d128 (commit) via ad09db3c55a4b9e4989704e04860c5dda7c25fb0 (commit) via 9363e7dc22f85c549cd90768ce884508901820a8 (commit) via 37ff0f5658e356a4fbd9ad212ccab2acb0d9bb46 (commit) via c0ce10397a8ef4811cdde6f727a3fdd3890e8a5d (commit) via fcf0a8b20328c57996ff61247d5ff4b13356f72a (commit) from f1ec3b9b10d1657412d6592180c56887c3a6ae20 (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 919b604c29060b3b14162ef331dfccc018606919 Merge: dee8144 c79c068 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 16 14:51:17 2011 -0600 Merge branch 'maint' commit dee8144ce5ca96ceca643d74fd6152ecf812f8af Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 13 23:45:55 2011 -0600 Add helper method for creating and opening archive object This moves the common setup code of about 5 different callers into one method. Error messages will now be common and shared in all places; several paths did not have any messages at all before. In addition, we now pick an ideal block size for the archive read based off the larger value of our default buffer size or the st.st_blksize field. For a filesystem such as NFS, this is often much larger than the default 8192- values such as 32768 and 131072 are common. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 10 ++ configure.ac | 5 +- doc/PKGBUILD.5.txt | 2 +- etc/makepkg.conf.in | 2 +- lib/libalpm/add.c | 22 ++-- lib/libalpm/be_package.c | 70 +++++----- lib/libalpm/be_sync.c | 23 +--- lib/libalpm/deps.c | 2 +- lib/libalpm/po/ca.po | 2 +- lib/libalpm/po/cs.po | 17 ++-- lib/libalpm/po/da.po | 8 +- lib/libalpm/po/de.po | 2 +- lib/libalpm/po/el.po | 2 +- lib/libalpm/po/en_GB.po | 2 +- lib/libalpm/po/es.po | 2 +- lib/libalpm/po/fi.po | 2 +- lib/libalpm/po/fr.po | 2 +- lib/libalpm/po/hu.po | 2 +- lib/libalpm/po/it.po | 2 +- lib/libalpm/po/kk.po | 8 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/lt.po | 4 +- lib/libalpm/po/nb.po | 173 +++++++++++++------------- lib/libalpm/po/pl.po | 2 +- lib/libalpm/po/pt.po | 2 +- lib/libalpm/po/pt_BR.po | 8 +- lib/libalpm/po/ro.po | 2 +- lib/libalpm/po/ru.po | 8 +- lib/libalpm/po/sk.po | 2 +- lib/libalpm/po/sr.po | 2 +- lib/libalpm/po/sr(a)latin.po | 2 +- lib/libalpm/po/sv.po | 67 +++++----- lib/libalpm/po/tr.po | 8 +- lib/libalpm/po/uk.po | 2 +- lib/libalpm/po/zh_CN.po | 6 +- lib/libalpm/po/zh_TW.po | 8 +- lib/libalpm/sync.c | 27 +++-- lib/libalpm/util.c | 95 +++++++++++---- lib/libalpm/util.h | 3 + scripts/po/ca.po | 13 ++- scripts/po/cs.po | 18 ++- scripts/po/da.po | 22 ++-- scripts/po/de.po | 16 ++- scripts/po/el.po | 21 +++- scripts/po/en_GB.po | 14 ++- scripts/po/es.po | 15 ++- scripts/po/fi.po | 145 +++++++++++++-------- scripts/po/fr.po | 13 ++- scripts/po/hu.po | 15 ++- scripts/po/it.po | 13 ++- scripts/po/kk.po | 22 ++-- scripts/po/lt.po | 15 ++- scripts/po/nb.po | 104 +++++++++------- scripts/po/pacman-scripts.pot | 13 ++- scripts/po/pl.po | 76 +++++++----- scripts/po/pt.po | 281 +++++++++++++++++++++++++++-------------- scripts/po/pt_BR.po | 13 ++- scripts/po/ro.po | 16 ++- scripts/po/ru.po | 107 +++++++++------- scripts/po/sk.po | 15 ++- scripts/po/sr.po | 13 ++- scripts/po/sr(a)latin.po | 13 ++- scripts/po/sv.po | 22 ++-- scripts/po/tr.po | 224 ++++++++++++++++++++------------- scripts/po/uk.po | 79 +++++++----- scripts/po/zh_CN.po | 13 ++- scripts/po/zh_TW.po | 13 ++- src/pacman/po/ca.po | 66 ++++++----- src/pacman/po/cs.po | 38 +++--- src/pacman/po/da.po | 58 +++++----- src/pacman/po/de.po | 17 ++-- src/pacman/po/el.po | 13 +- src/pacman/po/en_GB.po | 12 +- src/pacman/po/es.po | 16 ++-- src/pacman/po/fi.po | 123 +++++++++--------- src/pacman/po/fr.po | 12 +- src/pacman/po/hu.po | 14 +- src/pacman/po/it.po | 14 +- src/pacman/po/kk.po | 15 +-- src/pacman/po/lt.po | 124 +++++++++--------- src/pacman/po/nb.po | 14 +- src/pacman/po/pacman.pot | 8 +- src/pacman/po/pl.po | 85 +++++++------ src/pacman/po/pt.po | 15 ++- src/pacman/po/pt_BR.po | 12 +- src/pacman/po/ro.po | 14 +- src/pacman/po/ru.po | 15 +-- src/pacman/po/sk.po | 14 +- src/pacman/po/sr.po | 14 ++- src/pacman/po/sr(a)latin.po | 12 +- src/pacman/po/sv.po | 217 ++++++++++++++++---------------- src/pacman/po/tr.po | 30 ++--- src/pacman/po/uk.po | 14 +- src/pacman/po/zh_CN.po | 8 +- src/pacman/po/zh_TW.po | 26 ++--- 95 files changed, 1723 insertions(+), 1253 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-42-gc79c068
by dan＠archlinux.org 16 Nov '11

16 Nov '11

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, maint has been updated via c79c068fe9b80ea9af831c8c883f27fad2e0d128 (commit) via ad09db3c55a4b9e4989704e04860c5dda7c25fb0 (commit) via 9363e7dc22f85c549cd90768ce884508901820a8 (commit) via 37ff0f5658e356a4fbd9ad212ccab2acb0d9bb46 (commit) from c0ce10397a8ef4811cdde6f727a3fdd3890e8a5d (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 c79c068fe9b80ea9af831c8c883f27fad2e0d128 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 15 23:16:28 2011 -0600 Update translations from Transifex Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ad09db3c55a4b9e4989704e04860c5dda7c25fb0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 15 10:20:07 2011 -0500 makepkg.conf: disable motd printing for rsync DLAGENT Fixes FS#26806. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9363e7dc22f85c549cd90768ce884508901820a8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 15 09:12:18 2011 -0600 Allow sync_prepare to work in certain cases without sync databases When doing a bare -U operation on a local package that doesn't pull in any dependencies from the sync databases, we can get away with missing database files. This makes the check conditional on no sync targets found in the target list. This is not the prettiest code here so we have a bit of hackish behavior required to straighten both the behavior and the nonsensical error message out. Addresses FS#26899. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 37ff0f5658e356a4fbd9ad212ccab2acb0d9bb46 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 15 10:58:06 2011 +1000 Update documentation regarding signature extensions Commit e7b56f48 allowed makepkg to handle pgp signatures with the .sign extension. Update the man page to reflect this. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 2 +- etc/makepkg.conf.in | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/po/sv.po | 63 +++++++------- lib/libalpm/po/zh_CN.po | 4 +- lib/libalpm/sync.c | 27 ++++-- scripts/po/ca.po | 10 +- scripts/po/de.po | 11 ++- scripts/po/el.po | 8 +- scripts/po/fr.po | 8 +- scripts/po/it.po | 8 +- scripts/po/nb.po | 8 +- scripts/po/pt.po | 54 ++++++++----- scripts/po/ro.po | 11 ++- scripts/po/ru.po | 97 +++++++++++---------- scripts/po/sr.po | 8 +- scripts/po/sr(a)latin.po | 10 +- scripts/po/tr.po | 43 ++++++--- scripts/po/zh_CN.po | 10 +- src/pacman/po/ca.po | 2 +- src/pacman/po/de.po | 11 ++- src/pacman/po/el.po | 9 +- src/pacman/po/fr.po | 8 +- src/pacman/po/it.po | 10 +- src/pacman/po/nb.po | 8 +- src/pacman/po/pl.po | 8 +- src/pacman/po/pt.po | 9 +- src/pacman/po/ro.po | 8 +- src/pacman/po/sr.po | 8 +- src/pacman/po/sr(a)latin.po | 8 +- src/pacman/po/sv.po | 208 +++++++++++++++++++++++---------------------- src/pacman/po/tr.po | 8 +- src/pacman/po/zh_CN.po | 8 +- 33 files changed, 377 insertions(+), 322 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg.conf: disable motd printing for rsync DLAGENT
by Dave Reisner 16 Nov '11

16 Nov '11

Fixes FS#26806. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Dear Sirs, It is with great auspiciousness and delight that I present to you this most complex work of art for which many candles were burned into the night. I implore all of you to review my work as I'm sure that the slightest breeze may alter something as subtle as the font encoding, thereby hindering application of this most vital of vital patches. With humble regards, Sir David McPatcherton, Jr, III of Crapsville etc/makepkg.conf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 65d8ab9..e9152c8 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -11,7 +11,7 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' 'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync -z %u %o' + 'rsync::/usr/bin/rsync --no-motd -z %u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools: -- 1.7.7.3

2 1

[pacman-dev] [PATCH] repo-add: ensure database and signature files are always viewed in whole
by Dan McGee 15 Nov '11

15 Nov '11

This addresses a short but sweet race condition currently existing in repo-add and repo-remove. We do the smart thing and zip the database to a location in a temporary directory. However, we then proceed to move this file directly from the temporary directory to our final location, which is more than likely a cross-filesystem move (/tmp on tmpfs) and thus non-atomic. Instead, break the move into two parts- first, move the file to a name with a '.tmp.' prefix in the correct directory, then move it to the correct name. This second move is guaranteed to be atomic, so any reader of the database file will get either the old version, the new version, or a file that doesn't exist. We also perform a hardlink if possible instead of a move when shifting the old database out of the way; this ensures there is no chance of a database file not existing during the whole process. Only one small race condition should now be present- when the database has been fully moved into place and th signature has not, you may see a mismatch. There seems to be no good way to address this, and it existed before this patch. A final note- if someone had locked-down permissions on the directory that the database files are in (e.g., could only write to foo.db.tar.gz, foo.db, foo.db.tar.gz.old, foo.db.old, and the lock file), this would break. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- As I was writing the commit message for this I also realized we could just `bsdtar cf` straight to the '.tmp.' prefix and save ourselves a copy- this probably makes more sense. Thoughts on the general ideas of the patch, besides the above simplification? scripts/repo-add.sh.in | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index fc008fc..d3e72fd 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -655,14 +655,26 @@ if (( success )); then create_signature "$tmpdir/$filename" - [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" + if [[ -f $REPO_DB_FILE ]]; then + ln -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" 2>/dev/null || \ + mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" + fi if [[ -f $REPO_DB_FILE.sig ]]; then - mv -f "$REPO_DB_FILE.sig" "$REPO_DB_FILE.old.sig" + ln -f "$REPO_DB_FILE.sig" "$REPO_DB_FILE.old.sig" 2>/dev/null || \ + mv -f "$REPO_DB_FILE.sig" "$REPO_DB_FILE.old.sig" else rm -f "$REPO_DB_FILE.old.sig" fi - [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" - [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" + + # These odd double-moves ensure the database and signature files are seen all + # or nothing and not halfway through a filesystem to filesystem copy. + mv "$tmpdir/$filename" ".tmp.$REPO_DB_FILE" + mv ".tmp.$REPO_DB_FILE" "$REPO_DB_FILE" + if [[ -f $tmpdir/$filename.sig ]]; then + mv "$tmpdir/$filename.sig" ".tmp.$REPO_DB_FILE.sig" + mv ".tmp.$REPO_DB_FILE.sig" "$REPO_DB_FILE.sig" + fi + dblink="${REPO_DB_FILE%.tar*}" target=${REPO_DB_FILE##*/} rm -f "$dblink" "$dblink.sig" -- 1.7.7.3

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-80-gf1ec3b9
by dan＠archlinux.org 15 Nov '11

15 Nov '11

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 f1ec3b9b10d1657412d6592180c56887c3a6ae20 (commit) via a3f9399295e6c94b7f8f8249d4a6b28e63fd2dbb (commit) from 1de5070bb39e56ee9ce381b0cc40752eaed60783 (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 f1ec3b9b10d1657412d6592180c56887c3a6ae20 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 15 09:11:03 2011 -0600 Remove unnecessary casts in callback code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a3f9399295e6c94b7f8f8249d4a6b28e63fd2dbb Author: Jonathan Conder <jonno.conder(a)gmail.com> Date: Sat Oct 29 15:03:24 2011 +1300 create a typedef for enum _alpm_errno_t This is consistent with the other enums and structs, and should be slightly more readable. Signed-off-by: Jonathan Conder <jonno.conder(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 2 +- lib/libalpm/alpm.c | 4 ++-- lib/libalpm/alpm.h | 10 +++++----- lib/libalpm/error.c | 4 ++-- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 4 ++-- lib/libalpm/sync.c | 4 ++-- src/pacman/callback.c | 12 ++++++------ src/pacman/conf.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 6 +++--- src/pacman/util.c | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- src/util/testpkg.c | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Recreate empty missing filesystem directories
by Dan McGee 15 Nov '11

15 Nov '11

This is fixed in pacman 4.0, but thought people might find this super simple script helpful. A lot of people will find `/etc/cron.hourly/` missing due to the removal of the adjtime cronjob; but at least on my system there were a few more missing directories found. $ sudo /tmp/find-missing-dirs.sh Password: /usr/share/icons/hicolor/16x16/devices/ /usr/share/icons/hicolor/22x22/devices/ /usr/share/icons/hicolor/32x32/devices/ $ sudo /tmp/find-missing-dirs.sh | xargs sudo mkdir $ sudo /tmp/find-missing-dirs.sh -Dan $ cat /tmp/find-missing-dirs.sh #!/bin/bash IFS=$'\n' for path in $(pacman -Qql | grep '/$' | sort | uniq); do if [[ ! -d $path ]]; then echo $path fi done

1 0

[pacman-dev] [PATCH] Allow sync_prepare to work in certain cases without sync databases
by Dan McGee 15 Nov '11

15 Nov '11

When doing a bare -U operation on a local package that doesn't pull in any dependencies from the sync databases, we can get away with missing database files. This makes the check conditional on no sync targets found in the target list. This is not the prettiest code here so we have a bit of hackish behavior required to straighten both the behavior and the nonsensical error message out. Addresses FS#26899. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- For maint. Some example behavior: $ sudo ./src/pacman/pacman -U /home/makepkg/packages/pacman-git-20111115-1-x86_64.pkg.tar.xz warning: database file for 'testing' does not exist loading packages... resolving dependencies... looking for inter-conflicts... Targets (1): Name Old Version New Version Net Change pacman-git 20111014-1 20111115-1 0.03 MiB Total Installed Size: 5.46 MiB Net Upgrade Size: 0.03 MiB Proceed with installation? [Y/n] y (1/1) checking package integrity [----------------------] 100% (1/1) loading package files [----------------------] 100% (1/1) checking for file conflicts [----------------------] 100% (1/1) checking available disk space [----------------------] 100% (1/1) upgrading pacman-git [----------------------] 100% $ sudo ./src/pacman/pacman -U /tmp/couchdb-1.1.1-1-x86_64.pkg.tar.xz warning: database file for 'testing' does not exist warning: database file for 'extra' does not exist loading packages... resolving dependencies... warning: cannot resolve "erlang", a dependency of "couchdb" warning: cannot resolve "js", a dependency of "couchdb" :: The following package cannot be upgraded due to unresolvable dependencies: couchdb Do you want to skip the above package for this upgrade? [y/N] n error: failed to prepare transaction (could not satisfy dependencies) :: couchdb: requires erlang :: couchdb: requires js $ sudo ./src/pacman/pacman -S couchdb warning: database file for 'testing' does not exist warning: database file for 'extra' does not exist error: failed to prepare transaction (could not find database) lib/libalpm/deps.c | 2 +- lib/libalpm/sync.c | 27 ++++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 6040158..89f6d69 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -631,7 +631,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, /* first check if one provider is already installed locally */ for(i = providers; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(_alpm_pkghash_find(_alpm_db_get_pkgcache_hash(handle->db_local), pkg->name)) { + if(_alpm_db_get_pkgfromcache(handle->db_local, pkg->name)) { alpm_list_free(providers); return pkg; } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 54b9794..cf20971 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -357,7 +357,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_list_t *i, *j; alpm_list_t *deps = NULL; alpm_list_t *unresolvable = NULL; - alpm_list_t *remove = NULL; + size_t from_sync = 0; int ret = 0; alpm_trans_t *trans = handle->trans; @@ -365,19 +365,27 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) *data = NULL; } - /* ensure all sync database are valid since we will be using them */ + for(i = trans->add; i; i = i->next) { + alpm_pkg_t *spkg = i->data; + from_sync += (spkg->origin == PKG_FROM_SYNCDB); + } + + /* ensure all sync database are valid if we will be using them */ for(i = handle->dbs_sync; i; i = i->next) { const alpm_db_t *db = i->data; if(db->status & DB_STATUS_INVALID) { RET_ERR(handle, ALPM_ERR_DB_INVALID, -1); } - if(db->status & DB_STATUS_MISSING) { + /* missing databases are not allowed if we have sync targets */ + if(from_sync && db->status & DB_STATUS_MISSING) { RET_ERR(handle, ALPM_ERR_DB_NOT_FOUND, -1); } } if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { - alpm_list_t *resolved = NULL; /* target list after resolvedeps */ + alpm_list_t *resolved = NULL; + alpm_list_t *remove = NULL; + alpm_list_t *localpkgs; /* Build up list by repeatedly resolving each transaction package */ /* Resolve targets dependencies */ @@ -394,7 +402,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* Compute the fake local database for resolvedeps (partial fix for the * phonon/qt issue) */ - alpm_list_t *localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local), + localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local), trans->add, _alpm_pkg_cmp); /* Resolve packages in the transaction one at a time, in addition @@ -409,11 +417,13 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) dependencies not already on the list */ } alpm_list_free(localpkgs); + alpm_list_free(remove); /* If there were unresolvable top-level packages, prompt the user to see if they'd like to ignore them rather than failing the sync */ if(unresolvable != NULL) { int remove_unresolvable = 0; + enum _alpm_errno_t saved_err = handle->pm_errno; QUESTION(handle, ALPM_QUESTION_REMOVE_PKGS, unresolvable, NULL, NULL, &remove_unresolvable); if(remove_unresolvable) { @@ -421,14 +431,15 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) transaction. The packages will be removed from the actual transaction when the transaction packages are replaced with a dependency-reordered list below */ - handle->pm_errno = 0; /* pm_errno was set by resolvedeps */ + handle->pm_errno = 0; if(data) { alpm_list_free_inner(*data, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free(*data); *data = NULL; } } else { - /* pm_errno is set by resolvedeps */ + /* pm_errno was set by resolvedeps, callback may have overwrote it */ + handle->pm_errno = saved_err; alpm_list_free(resolved); ret = -1; goto cleanup; @@ -617,8 +628,6 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } cleanup: - alpm_list_free(remove); - return ret; } -- 1.7.7.3

1 0

[pacman-dev] [PATCH] Update documentation regarding signature extensions
by Allan McRae 15 Nov '11

15 Nov '11

Commit e7b56f48 allowed makepkg to handle pgp signatures with the .sign extension. Update the man page to reflect this. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 2318505..fad93e5 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -108,7 +108,7 @@ It is also possible to change the name of the downloaded file, which is helpful with weird URLs and for handling multiple source files with the same name. The syntax is: `source=('filename::url')`. + -Files in the source array with extensions `.sig` or `.asc` are recognized by +Files in the source array with extensions `.sig`, `.sign` or `.asc` are recognized by makepkg as PGP signatures and will be automatically used to verify the integrity of the corresponding source file. -- 1.7.7.3

1 0

[pacman-dev] [PATCH] Add helper method for creating and opening archive object
by Dan McGee 14 Nov '11

14 Nov '11

This moves the common setup code of about 5 different callers into one method. Error messages will now be common and shared in all places; several paths did not have any messages at all before. In addition, we now pick an ideal block size for the archive read based off the larger value of our default buffer size or the st.st_blksize field. For a filesystem such as NFS, this is often much larger than the default 8192- values such as 32768 and 131072 are common. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This is more academic than anything, but it does reduce all the archive setup boilerplate code we had which is probably a win in itself. I also caught a few resource leaks in error paths looking at this, whether that be unclosed archive objects, file descriptors, etc. configure.ac | 1 + lib/libalpm/add.c | 22 ++++------- lib/libalpm/be_package.c | 70 +++++++++++++++++----------------- lib/libalpm/be_sync.c | 23 +---------- lib/libalpm/util.c | 95 +++++++++++++++++++++++++++++++++++----------- lib/libalpm/util.h | 3 + 6 files changed, 123 insertions(+), 91 deletions(-) diff --git a/configure.ac b/configure.ac index c23da75..7fe1af2 100644 --- a/configure.ac +++ b/configure.ac @@ -201,6 +201,7 @@ AC_CHECK_FUNCS([dup2 getcwd geteuid getmntinfo gettimeofday memmove memset \ mkdir realpath regcomp rmdir setenv setlocale strcasecmp \ strchr strcspn strdup strerror strndup strrchr strsep strstr \ strtol swprintf tcflush wcwidth uname]) +AC_CHECK_MEMBERS([struct stat.st_blksize],,,[[#include <sys/stat.h>]]) # For the diskspace code FS_STATS_TYPE diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 44b852f..78615bb 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -525,23 +525,14 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(!(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { struct archive *archive; struct archive_entry *entry; - int cwdfd; + struct stat buf; + int fd, cwdfd; _alpm_log(handle, ALPM_LOG_DEBUG, "extracting files\n"); - if((archive = archive_read_new()) == NULL) { - handle->pm_errno = ALPM_ERR_LIBARCHIVE; - ret = -1; - goto cleanup; - } - - archive_read_support_compression_all(archive); - archive_read_support_format_all(archive); - - _alpm_log(handle, ALPM_LOG_DEBUG, "archive: %s\n", pkgfile); - if(archive_read_open_filename(archive, pkgfile, - ALPM_BUFFER_SIZE) != ARCHIVE_OK) { - handle->pm_errno = ALPM_ERR_PKG_OPEN; + fd = _alpm_open_archive(db->handle, pkgfile, &buf, + &archive, ALPM_ERR_PKG_OPEN); + if(fd < 0) { ret = -1; goto cleanup; } @@ -556,6 +547,8 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(chdir(handle->root) != 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not change directory to %s (%s)\n"), handle->root, strerror(errno)); + archive_read_finish(archive); + CLOSE(fd); ret = -1; goto cleanup; } @@ -597,6 +590,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, errors += extract_single_file(handle, archive, entry, newpkg, oldpkg); } archive_read_finish(archive); + CLOSE(fd); /* restore the old cwd if we have it */ if(cwdfd >= 0) { diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 90a1972..4f530e0 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -40,6 +40,11 @@ #include "package.h" #include "deps.h" /* _alpm_splitdep */ +struct package_changelog { + struct archive *archive; + int fd; +}; + /** * Open a package changelog for reading. Similar to fopen in functionality, * except that the returned 'file stream' is from an archive. @@ -50,31 +55,38 @@ static void *_package_changelog_open(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); - struct archive *archive = NULL; + struct package_changelog *changelog; + struct archive *archive; struct archive_entry *entry; const char *pkgfile = pkg->origin_data.file; + struct stat buf; + int fd; - if((archive = archive_read_new()) == NULL) { - RET_ERR(pkg->handle, ALPM_ERR_LIBARCHIVE, NULL); - } - - archive_read_support_compression_all(archive); - archive_read_support_format_all(archive); - - if(archive_read_open_filename(archive, pkgfile, - ALPM_BUFFER_SIZE) != ARCHIVE_OK) { - RET_ERR(pkg->handle, ALPM_ERR_PKG_OPEN, NULL); + fd = _alpm_open_archive(pkg->handle, pkgfile, &buf, + &archive, ALPM_ERR_PKG_OPEN); + if(fd < 0) { + return NULL; } while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { const char *entry_name = archive_entry_pathname(entry); if(strcmp(entry_name, ".CHANGELOG") == 0) { - return archive; + changelog = malloc(sizeof(struct package_changelog)); + if(!changelog) { + pkg->handle->pm_errno = ALPM_ERR_MEMORY; + archive_read_finish(archive); + CLOSE(fd); + return NULL; + } + changelog->archive = archive; + changelog->fd = fd; + return changelog; } } /* we didn't find a changelog */ archive_read_finish(archive); + CLOSE(fd); errno = ENOENT; return NULL; @@ -92,7 +104,8 @@ static void *_package_changelog_open(alpm_pkg_t *pkg) static size_t _package_changelog_read(void *ptr, size_t size, const alpm_pkg_t UNUSED *pkg, void *fp) { - ssize_t sret = archive_read_data((struct archive *)fp, ptr, size); + struct package_changelog *changelog = fp; + ssize_t sret = archive_read_data(changelog->archive, ptr, size); /* Report error (negative values) */ if(sret < 0) { RET_ERR(pkg->handle, ALPM_ERR_LIBARCHIVE, 0); @@ -110,7 +123,12 @@ static size_t _package_changelog_read(void *ptr, size_t size, */ static int _package_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp) { - return archive_read_finish((struct archive *)fp); + int ret; + struct package_changelog *changelog = fp; + ret = archive_read_finish(changelog->archive); + CLOSE(changelog->fd); + free(changelog); + return ret; } /** Package file operations struct accessor. We implement this as a method @@ -370,24 +388,10 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); } - /* try to create an archive object to read in the package */ - if((archive = archive_read_new()) == NULL) { - RET_ERR(handle, ALPM_ERR_LIBARCHIVE, NULL); - } - - archive_read_support_compression_all(archive); - archive_read_support_format_all(archive); - - OPEN(fd, pkgfile, O_RDONLY); - if(fd < 0 || archive_read_open_fd(archive, fd, - ALPM_BUFFER_SIZE) != ARCHIVE_OK) { - const char *err = fd < 0 ? strerror(errno) : archive_error_string(archive); - _alpm_log(handle, ALPM_LOG_ERROR, - _("could not open file %s: %s\n"), pkgfile, err); - if(fd < 0 && errno == ENOENT) { + fd = _alpm_open_archive(handle, pkgfile, &st, &archive, ALPM_ERR_PKG_OPEN); + if(fd < 0) { + if(errno == ENOENT) { handle->pm_errno = ALPM_ERR_PKG_NOT_FOUND; - } else { - handle->pm_errno = ALPM_ERR_PKG_OPEN; } goto error; } @@ -397,10 +401,6 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, handle->pm_errno = ALPM_ERR_MEMORY; goto error; } - if(fstat(fd, &st) != 0) { - handle->pm_errno = ALPM_ERR_PKG_OPEN; - goto error; - } STRDUP(newpkg->filename, pkgfile, handle->pm_errno = ALPM_ERR_MEMORY; goto error); newpkg->size = st.st_size; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index aa26002..54c4f87 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -433,26 +433,9 @@ static int sync_db_populate(alpm_db_t *db) return -1; } - if((archive = archive_read_new()) == NULL) { - RET_ERR(db->handle, ALPM_ERR_LIBARCHIVE, -1); - } - - archive_read_support_compression_all(archive); - archive_read_support_format_all(archive); - - _alpm_log(db->handle, ALPM_LOG_DEBUG, - "opening database archive %s\n", dbpath); - OPEN(fd, dbpath, O_RDONLY); - if(fd < 0 || archive_read_open_fd(archive, fd, - ALPM_BUFFER_SIZE) != ARCHIVE_OK) { - const char *err = fd < 0 ? strerror(errno) : archive_error_string(archive); - _alpm_log(db->handle, ALPM_LOG_ERROR, - _("could not open file %s: %s\n"), dbpath, err); - db->handle->pm_errno = ALPM_ERR_DB_OPEN; - goto cleanup; - } - if(fstat(fd, &buf) != 0) { - db->handle->pm_errno = ALPM_ERR_DB_OPEN; + fd = _alpm_open_archive(db->handle, dbpath, &buf, + &archive, ALPM_ERR_DB_OPEN); + if(fd < 0) { goto cleanup; } est_count = estimate_package_count(&buf, archive); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 5070cb9..ffd835a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -233,6 +233,64 @@ size_t _alpm_strip_newline(char *str) /* Compression functions */ /** + * Open an archive for reading and perform the necessary boilerplate. + * This takes care of creating the libarchive 'archive' struct, setting up + * compression and format options, opening a file descriptor, setting up the + * buffer size, and performing a stat on the path once opened. + * @param handle the context handle + * @param path the path of the archive to open + * @param buf space for a stat buffer for the given path + * @param archive pointer to place the created archive object + * @param error error code to set on failure to open archive + * @return -1 on failure, >=0 file descriptor on success + */ +int _alpm_open_archive(alpm_handle_t *handle, const char *path, + struct stat *buf, struct archive **archive, enum _alpm_errno_t error) +{ + int fd; + size_t bufsize = ALPM_BUFFER_SIZE; + + if((*archive = archive_read_new()) == NULL) { + RET_ERR(handle, ALPM_ERR_LIBARCHIVE, -1); + } + + archive_read_support_compression_all(*archive); + archive_read_support_format_all(*archive); + + _alpm_log(handle, ALPM_LOG_DEBUG, "opening archive %s\n", path); + OPEN(fd, path, O_RDONLY); + if(fd < 0) { + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not open file %s: %s\n"), path, strerror(errno)); + archive_read_finish(*archive); + RET_ERR(handle, error, -1); + } + + if(fstat(fd, buf) != 0) { + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not stat file %s: %s\n"), path, strerror(errno)); + archive_read_finish(*archive); + CLOSE(fd); + RET_ERR(handle, error, -1); + } +#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE + if(buf->st_blksize > ALPM_BUFFER_SIZE) { + bufsize = buf->st_blksize; + } +#endif + + if(archive_read_open_fd(*archive, fd, bufsize) != ARCHIVE_OK) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), + path, archive_error_string(*archive)); + archive_read_finish(*archive); + CLOSE(fd); + RET_ERR(handle, error, -1); + } + + return fd; +} + +/** * @brief Unpack a specific file in an archive. * * @param handle the context handle @@ -259,34 +317,26 @@ int _alpm_unpack_single(alpm_handle_t *handle, const char *archive, * @brief Unpack a list of files in an archive. * * @param handle the context handle - * @param archive the archive to unpack + * @param path the archive to unpack * @param prefix where to extract the files * @param list a list of files within the archive to unpack or NULL for all * @param breakfirst break after the first entry found * * @return 0 on success, 1 on failure */ -int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, +int _alpm_unpack(alpm_handle_t *handle, const char *path, const char *prefix, alpm_list_t *list, int breakfirst) { int ret = 0; mode_t oldmask; - struct archive *_archive; + struct archive *archive; struct archive_entry *entry; - int cwdfd; - - if((_archive = archive_read_new()) == NULL) { - RET_ERR(handle, ALPM_ERR_LIBARCHIVE, 1); - } - - archive_read_support_compression_all(_archive); - archive_read_support_format_all(_archive); + struct stat buf; + int fd, cwdfd; - if(archive_read_open_filename(_archive, archive, - ALPM_BUFFER_SIZE) != ARCHIVE_OK) { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), archive, - archive_error_string(_archive)); - RET_ERR(handle, ALPM_ERR_PKG_OPEN, 1); + fd = _alpm_open_archive(handle, path, &buf, &archive, ALPM_ERR_PKG_OPEN); + if(fd < 0) { + return 1; } oldmask = umask(0022); @@ -305,7 +355,7 @@ int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, goto cleanup; } - while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) { + while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { const char *entryname; mode_t mode; @@ -321,7 +371,7 @@ int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, char *found = alpm_list_find_str(list, entry_prefix); free(entry_prefix); if(!found) { - if(archive_read_data_skip(_archive) != ARCHIVE_OK) { + if(archive_read_data_skip(archive) != ARCHIVE_OK) { ret = 1; goto cleanup; } @@ -339,14 +389,14 @@ int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, } /* Extract the archive entry. */ - int readret = archive_read_extract(_archive, entry, 0); + int readret = archive_read_extract(archive, entry, 0); if(readret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ _alpm_log(handle, ALPM_LOG_WARNING, _("warning given when extracting %s (%s)\n"), - entryname, archive_error_string(_archive)); + entryname, archive_error_string(archive)); } else if(readret != ARCHIVE_OK) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not extract %s (%s)\n"), - entryname, archive_error_string(_archive)); + entryname, archive_error_string(archive)); ret = 1; goto cleanup; } @@ -358,7 +408,8 @@ int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, cleanup: umask(oldmask); - archive_read_finish(_archive); + archive_read_finish(archive); + CLOSE(fd); if(cwdfd >= 0) { if(fchdir(cwdfd) != 0) { _alpm_log(handle, ALPM_LOG_ERROR, diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index df16543..e7e15be 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -117,6 +117,9 @@ int _alpm_makepath_mode(const char *path, mode_t mode); int _alpm_copyfile(const char *src, const char *dest); char *_alpm_strtrim(char *str); size_t _alpm_strip_newline(char *str); + +int _alpm_open_archive(alpm_handle_t *handle, const char *path, + struct stat *buf, struct archive **archive, enum _alpm_errno_t error); int _alpm_unpack_single(alpm_handle_t *handle, const char *archive, const char *prefix, const char *filename); int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, -- 1.7.7.3

1 0

[pacman-dev] [PATCH] create a typedef for enum _alpm_errno_t
by Jonathan Conder 14 Nov '11

14 Nov '11

This is consistent with the other enums and structs, and should be slightly more readable. Signed-off-by: Jonathan Conder <jonno.conder(a)gmail.com> --- README | 2 +- lib/libalpm/alpm.c | 4 ++-- lib/libalpm/alpm.h | 10 +++++----- lib/libalpm/error.c | 4 ++-- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 4 ++-- lib/libalpm/sync.c | 4 ++-- src/pacman/callback.c | 2 +- src/pacman/conf.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 6 +++--- src/pacman/util.c | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- src/util/testpkg.c | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README b/README index 0e5a512..c4199dd 100644 --- a/README +++ b/README @@ -389,7 +389,7 @@ API CHANGES BETWEEN 3.5 AND 4.0 - PM_ prefixes for enum values are now ALPM_ - pm prefixes for structs and enums are now alpm_ - alpm_initialize now has parameters: char *root, char *dbpath, - _alpm_errno_t *err and returns an alpm_handle_t struct. + alpm_errno_t *err and returns an alpm_handle_t struct. - alpm_release now takes an alpm_handle_t *. - alpm_db_register_sync() now requires a extra parameter of a alpm_siglevel_t. - alpm_pkg_load() now requires an extra parameter of an alpm_siglevel_t diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 3884334..e957f1a 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -47,9 +47,9 @@ * @return a context handle on success, NULL on error, err will be set if provided */ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, - enum _alpm_errno_t *err) + alpm_errno_t *err) { - enum _alpm_errno_t myerr; + alpm_errno_t myerr; const char *lf = "db.lck"; size_t lockfilelen; alpm_handle_t *myhandle = _alpm_handle_new(); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 9fda940..9b2d8a9 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1115,7 +1115,7 @@ char *alpm_compute_sha256sum(const char *filename); /** @addtogroup alpm_api_errors Error Codes * @{ */ -enum _alpm_errno_t { +typedef enum _alpm_errno_t { ALPM_ERR_MEMORY = 1, ALPM_ERR_SYSTEM, ALPM_ERR_BADPERMS, @@ -1179,19 +1179,19 @@ enum _alpm_errno_t { ALPM_ERR_LIBCURL, ALPM_ERR_EXTERNAL_DOWNLOAD, ALPM_ERR_GPGME -}; +} alpm_errno_t; /** Returns the current error code from the handle. */ -enum _alpm_errno_t alpm_errno(alpm_handle_t *handle); +alpm_errno_t alpm_errno(alpm_handle_t *handle); /** Returns the string corresponding to an error number. */ -const char *alpm_strerror(enum _alpm_errno_t err); +const char *alpm_strerror(alpm_errno_t err); /* End of alpm_api_errors */ /** @} */ alpm_handle_t *alpm_initialize(const char *root, const char *dbpath, - enum _alpm_errno_t *err); + alpm_errno_t *err); int alpm_release(alpm_handle_t *handle); enum alpm_caps { diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index b3f5681..044dec7 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -29,12 +29,12 @@ #include "alpm.h" #include "handle.h" -enum _alpm_errno_t SYMEXPORT alpm_errno(alpm_handle_t *handle) +alpm_errno_t SYMEXPORT alpm_errno(alpm_handle_t *handle) { return handle->pm_errno; } -const char SYMEXPORT *alpm_strerror(enum _alpm_errno_t err) +const char SYMEXPORT *alpm_strerror(alpm_errno_t err) { switch(err) { /* System */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 7402be5..01f5955 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -339,7 +339,7 @@ static char *canonicalize_path(const char *path) { return new_path; } -enum _alpm_errno_t _alpm_set_directory_option(const char *value, +alpm_errno_t _alpm_set_directory_option(const char *value, char **storage, int must_exist) { struct stat st; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 8477dca..d568fb4 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -93,7 +93,7 @@ struct __alpm_handle_t { alpm_siglevel_t siglevel; /* Default signature verification level */ /* error code */ - enum _alpm_errno_t pm_errno; + alpm_errno_t pm_errno; }; alpm_handle_t *_alpm_handle_new(void); @@ -102,7 +102,7 @@ void _alpm_handle_free(alpm_handle_t *handle); int _alpm_handle_lock(alpm_handle_t *handle); int _alpm_handle_unlock(alpm_handle_t *handle); -enum _alpm_errno_t _alpm_set_directory_option(const char *value, +alpm_errno_t _alpm_set_directory_option(const char *value, char **storage, int must_exist); #endif /* _ALPM_HANDLE_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 52049a8..3de5c07 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -748,7 +748,7 @@ static int apply_deltas(alpm_handle_t *handle) * @return 1 if file was removed, 0 otherwise */ static int prompt_to_delete(alpm_handle_t *handle, const char *filepath, - enum _alpm_errno_t reason) + alpm_errno_t reason) { int doremove = 0; QUESTION(handle, ALPM_QUESTION_CORRUPTED_PKG, (char *)filepath, @@ -965,7 +965,7 @@ static int check_validity(alpm_handle_t *handle, char *path; alpm_siglist_t *siglist; alpm_siglevel_t level; - enum _alpm_errno_t error; + alpm_errno_t error; }; size_t current = 0, current_bytes = 0; alpm_list_t *i, *errors = NULL; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 6f39013..3fb5465 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -341,7 +341,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, *response = yesno(_(":: File %s is corrupted (%s).\n" "Do you want to delete it?"), (char *)data1, - alpm_strerror(*(enum _alpm_errno_t *)data2)); + alpm_strerror(*(alpm_errno_t *)data2)); break; case ALPM_QUESTION_IMPORT_KEY: { diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 2d3009e..004922e 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -522,7 +522,7 @@ static int _add_mirror(alpm_db_t *db, char *value) static int setup_libalpm(void) { int ret = 0; - enum _alpm_errno_t err; + alpm_errno_t err; alpm_handle_t *handle; pm_printf(ALPM_LOG_DEBUG, "setup_libalpm called\n"); diff --git a/src/pacman/remove.c b/src/pacman/remove.c index e63b5c4..425ce45 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -104,7 +104,7 @@ int pacman_remove(alpm_list_t *targets) /* Step 2: prepare the transaction based on its type, targets and flags */ if(alpm_trans_prepare(config->handle, &data) == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerror(err)); switch(err) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index cc70203..1003a42 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -600,7 +600,7 @@ static int process_pkg(alpm_pkg_t *pkg) int ret = alpm_add_pkg(config->handle, pkg); if(ret == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); if(err == ALPM_ERR_TRANS_DUP_TARGET || err == ALPM_ERR_PKG_IGNORED) { /* just skip duplicate or ignored targets */ @@ -766,7 +766,7 @@ int sync_prepare_execute(void) /* Step 2: "compute" the transaction based on targets and flags */ if(alpm_trans_prepare(config->handle, &data) == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerror(err)); switch(err) { @@ -835,7 +835,7 @@ int sync_prepare_execute(void) } if(alpm_trans_commit(config->handle, &data) == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerror(err)); switch(err) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 42f17ea..c0dcb9f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -65,7 +65,7 @@ int trans_init(alpm_transflag_t flags, int check_valid) void trans_init_error(void) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), alpm_strerror(err)); if(err == ALPM_ERR_HANDLE_LOCK) { diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 7964609..d6bd0e8 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -94,7 +94,7 @@ static void usage(void) { int main(int argc, char *argv[]) { const char *dbpath = DBPATH; - enum _alpm_errno_t err; + alpm_errno_t err; int a = 1; alpm_list_t *dbnames = NULL; diff --git a/src/util/pactree.c b/src/util/pactree.c index bb15b1b..f95c5e8 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -443,7 +443,7 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) int main(int argc, char *argv[]) { int freelist = 0, ret = 0; - enum _alpm_errno_t err; + alpm_errno_t err; const char *target_name; alpm_pkg_t *pkg; alpm_list_t *dblist = NULL; diff --git a/src/util/testdb.c b/src/util/testdb.c index 783d499..b15bbe5 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -185,7 +185,7 @@ static void usage(void) int main(int argc, char *argv[]) { int ret = 0; - enum _alpm_errno_t err; + alpm_errno_t err; const char *dbpath = DBPATH; int a = 1; alpm_list_t *dbnames = NULL; diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 90758e1..6385e41 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) { int retval = 1; /* default = false */ alpm_handle_t *handle; - enum _alpm_errno_t err; + alpm_errno_t err; alpm_pkg_t *pkg = NULL; const alpm_siglevel_t level = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL; -- 1.7.7

3 2

[pacman-dev] [translation] pacman 4.0.1 release
by Dan McGee 14 Nov '11

14 Nov '11

I'd like to release 4.0.1 later this week. String changes are very minimal if you were up to date before; 3 new ones in pacman scripts and 2 capitalization changes in pacman. https://www.transifex.net/projects/p/archlinux-pacman/r/4-0-1/ Languages below could use some love if anyone is interested- please sign up as a team member through Transifex to get started: * Chinese (Taiwan) * Swedish * Danish * Russian * Kazakh * Slovak These are close but not quite up to date as of 4.0.0: * Polish * Turkish * Finnish * Portuguese Thanks! -Dan

2 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-38-gc0ce103
by dan＠archlinux.org 14 Nov '11

14 Nov '11

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, maint has been updated via c0ce10397a8ef4811cdde6f727a3fdd3890e8a5d (commit) via fcf0a8b20328c57996ff61247d5ff4b13356f72a (commit) from 42e2f8bfbf1361a891cea6b440071eed78a3d389 (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 c0ce10397a8ef4811cdde6f727a3fdd3890e8a5d Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 13 22:16:08 2011 -0600 Update translations from Transifex Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fcf0a8b20328c57996ff61247d5ff4b13356f72a Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 13 21:55:52 2011 -0600 Updates in preparation for 4.0.1 release Bump the version, update the translation template files, and fill in NEWS with relevant commits and changes since 4.0.0. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 10 ++ configure.ac | 4 +- lib/libalpm/po/ca.po | 2 +- lib/libalpm/po/cs.po | 17 ++-- lib/libalpm/po/da.po | 8 +- lib/libalpm/po/de.po | 2 +- lib/libalpm/po/el.po | 2 +- lib/libalpm/po/en_GB.po | 2 +- lib/libalpm/po/es.po | 2 +- lib/libalpm/po/fi.po | 2 +- lib/libalpm/po/fr.po | 2 +- lib/libalpm/po/hu.po | 2 +- lib/libalpm/po/it.po | 2 +- lib/libalpm/po/kk.po | 8 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/lt.po | 4 +- lib/libalpm/po/nb.po | 173 +++++++++++++++--------------- lib/libalpm/po/pl.po | 2 +- lib/libalpm/po/pt.po | 2 +- lib/libalpm/po/pt_BR.po | 8 +- lib/libalpm/po/ro.po | 2 +- lib/libalpm/po/ru.po | 8 +- lib/libalpm/po/sk.po | 2 +- lib/libalpm/po/sr.po | 2 +- lib/libalpm/po/sr(a)latin.po | 2 +- lib/libalpm/po/sv.po | 8 +- lib/libalpm/po/tr.po | 8 +- lib/libalpm/po/uk.po | 2 +- lib/libalpm/po/zh_CN.po | 2 +- lib/libalpm/po/zh_TW.po | 8 +- scripts/po/ca.po | 15 ++- scripts/po/cs.po | 18 +++- scripts/po/da.po | 22 +++-- scripts/po/de.po | 15 ++- scripts/po/el.po | 23 +++-- scripts/po/en_GB.po | 14 ++- scripts/po/es.po | 15 ++- scripts/po/fi.po | 145 ++++++++++++++++---------- scripts/po/fr.po | 15 ++- scripts/po/hu.po | 15 ++- scripts/po/it.po | 15 ++- scripts/po/kk.po | 22 +++-- scripts/po/lt.po | 15 ++- scripts/po/nb.po | 104 ++++++++++-------- scripts/po/pacman-scripts.pot | 13 ++- scripts/po/pl.po | 76 ++++++++----- scripts/po/pt.po | 235 +++++++++++++++++++++++++++-------------- scripts/po/pt_BR.po | 13 ++- scripts/po/ro.po | 15 ++- scripts/po/ru.po | 22 +++-- scripts/po/sk.po | 15 ++- scripts/po/sr.po | 15 ++- scripts/po/sr(a)latin.po | 15 ++- scripts/po/sv.po | 22 +++-- scripts/po/tr.po | 183 +++++++++++++++++++------------ scripts/po/uk.po | 79 ++++++++------ scripts/po/zh_CN.po | 15 ++- scripts/po/zh_TW.po | 13 ++- src/pacman/po/ca.po | 66 ++++++----- src/pacman/po/cs.po | 38 ++++---- src/pacman/po/da.po | 58 +++++----- src/pacman/po/de.po | 14 ++-- src/pacman/po/el.po | 14 ++-- src/pacman/po/en_GB.po | 12 +- src/pacman/po/es.po | 16 ++-- src/pacman/po/fi.po | 123 +++++++++++----------- src/pacman/po/fr.po | 14 ++-- src/pacman/po/hu.po | 14 ++-- src/pacman/po/it.po | 14 ++-- src/pacman/po/kk.po | 15 +-- src/pacman/po/lt.po | 124 +++++++++++----------- src/pacman/po/nb.po | 14 ++-- src/pacman/po/pacman.pot | 8 +- src/pacman/po/pl.po | 85 ++++++++------- src/pacman/po/pt.po | 14 ++-- src/pacman/po/pt_BR.po | 12 +- src/pacman/po/ro.po | 14 ++-- src/pacman/po/ru.po | 15 +-- src/pacman/po/sk.po | 14 ++-- src/pacman/po/sr.po | 14 ++-- src/pacman/po/sr(a)latin.po | 14 ++-- src/pacman/po/sv.po | 11 +-- src/pacman/po/tr.po | 30 ++--- src/pacman/po/uk.po | 14 ++-- src/pacman/po/zh_CN.po | 14 ++-- src/pacman/po/zh_TW.po | 26 ++--- 86 files changed, 1345 insertions(+), 962 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-78-g1de5070
by dan＠archlinux.org 13 Nov '11

13 Nov '11

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 1de5070bb39e56ee9ce381b0cc40752eaed60783 (commit) via 10241a6d766fcebb3dbc930facb3c1b2c6ab4992 (commit) via 902305f1633298ff0ef7cd2bfbed0e91aae91646 (commit) via 64d54f674150fdcf4b925f7f27067c7ec0446863 (commit) via 42e2f8bfbf1361a891cea6b440071eed78a3d389 (commit) from 1a994bf180003b814b135a5acd6f3e2aa67121fc (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 1de5070bb39e56ee9ce381b0cc40752eaed60783 Merge: 10241a6 42e2f8b Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 13 13:38:57 2011 -0600 Merge branch 'maint' commit 10241a6d766fcebb3dbc930facb3c1b2c6ab4992 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 30 22:38:56 2011 -0400 add fnmatch support for HoldPkg Adds test remove031. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 902305f1633298ff0ef7cd2bfbed0e91aae91646 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 30 13:33:14 2011 -0400 add support for back end fnmatch'd options This is work originally provided by Sascha Kruse on FS#20360 with only minor adjustments to the implementation. It's been expanded to cover: NoUpgrade, NoExtract, IgnorePkg, IgnoreGroup. Adds tests ignore008, sync139, sync502, and sync503. Also satisfies FS#18988. Original-work-by: Sascha Kruse <knopwob(a)googlemail.com> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 64d54f674150fdcf4b925f7f27067c7ec0446863 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Nov 11 15:56:18 2011 -0500 invert iteration order for ignoregroup This is a simple change that allows comparions to be more in line with how other checks are done. It will be necessary for ensuing patchwork that implements fnmatch for comparing and assumes a specific argument ordering. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.txt | 14 +++++++---- lib/libalpm/add.c | 4 +- lib/libalpm/package.c | 6 ++-- lib/libalpm/remove.c | 4 +- lib/libalpm/util.c | 6 ++++ lib/libalpm/util.h | 1 + scripts/makepkg.sh.in | 2 +- src/pacman/remove.c | 8 +++++- test/pacman/tests/ignore008.py | 29 ++++++++++++++++++++++ test/pacman/tests/{remove030.py => remove031.py} | 6 ++-- test/pacman/tests/sync139.py | 23 +++++++++++++++++ test/pacman/tests/sync502.py | 17 +++++++++++++ test/pacman/tests/{sync501.py => sync503.py} | 4 +- 13 files changed, 105 insertions(+), 19 deletions(-) create mode 100644 test/pacman/tests/ignore008.py copy test/pacman/tests/{remove030.py => remove031.py} (61%) create mode 100644 test/pacman/tests/sync139.py create mode 100644 test/pacman/tests/sync502.py copy test/pacman/tests/{sync501.py => sync503.py} (77%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-36-g42e2f8b
by dan＠archlinux.org 13 Nov '11

13 Nov '11

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, maint has been updated via 42e2f8bfbf1361a891cea6b440071eed78a3d389 (commit) from e7b56f48d704f57f023d7ca3cdc9d492fb31a9cb (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 42e2f8bfbf1361a891cea6b440071eed78a3d389 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Nov 10 06:05:11 2011 -0500 makepkg: check for value before using eval'd var This prevent bsdtar from exploding when install= or changelog= are present without a value. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] invert iteration order for ignoregroup
by Dave Reisner 13 Nov '11

13 Nov '11

This is a simple change that allows comparions to be more in line with how other checks are done. It will be necessary for ensuing patchwork that implements fnmatch for comparing and assumes a specific argument ordering. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/package.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 0b0bf6e..e0f4ff2 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -695,9 +695,9 @@ int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) } /* next see if the package is in a group that is ignored */ - for(groups = handle->ignoregroup; groups; groups = groups->next) { + for(groups = alpm_pkg_get_groups(pkg); groups; groups = groups->next) { char *grp = groups->data; - if(alpm_list_find_str(alpm_pkg_get_groups(pkg), grp)) { + if(alpm_list_find_str(handle->ignoregroup, grp)) { return 1; } } -- 1.7.7.3

2 3