- 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