- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] [makepkg] Print out new version on change
by William Giokas 16 Dec '12

16 Dec '12

When building sources that have a pkgver() function, makepkg prints: ==> Making package: $pkgname $pkgver-$pkgrel $(date) which, normally, works out fine. Only problem is using vcs sources with a pkgver() function, it will print out the old version. So, if there is an update, the user won't know what version the package changed to till after the build. This patch adds in a line that prints out ==> Updated version from $oldversion to $newversion if the version has changed. Signed-off-by: William Giokas <1007380(a)gmail.com> --- scripts/makepkg.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2fe6605..ff7296f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -699,6 +699,7 @@ update_pkgver() { if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" + msg "$(gettext "Updated version from %s to %s")" $pkgver $newpkgver source "$BUILDFILE" else warning "$(gettext "%s is not writeable -- pkgver will not be updated")" \ -- 1.8.0.1.350.gee26a6e

2 9

[pacman-dev] [PATCH] Update Doxyfile
by Allan McRae 16 Dec '12

16 Dec '12

A few parameters were outdated and this produced warnings from Doxygen Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/Doxyfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/Doxyfile b/doc/Doxyfile index 6423a35..4e64534 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -1,4 +1,4 @@ -# Doxyfile 1.7.5.1 +# Doxyfile 1.8.2 #--------------------------------------------------------------------------- # Project related configuration options @@ -37,11 +37,14 @@ INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 4 ALIASES = +TCL_SUBST = OPTIMIZE_OUTPUT_FOR_C = YES OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO EXTENSION_MAPPING = +MARKDOWN_SUPPORT = YES +AUTOLINK_SUPPORT = YES BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO @@ -52,11 +55,13 @@ INLINE_GROUPED_CLASSES = NO INLINE_SIMPLE_STRUCTS = NO TYPEDEF_HIDES_STRUCT = NO SYMBOL_CACHE_SIZE = 0 +LOOKUP_CACHE_SIZE = 0 #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- EXTRACT_ALL = NO EXTRACT_PRIVATE = NO +EXTRACT_PACKAGE = NO EXTRACT_STATIC = NO EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = NO @@ -84,7 +89,6 @@ GENERATE_DEPRECATEDLIST= YES ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO SHOW_FILES = YES SHOW_NAMESPACES = YES FILE_VERSION_FILTER = @@ -145,13 +149,14 @@ HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = +HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = HTML_COLORSTYLE_HUE = 220 HTML_COLORSTYLE_SAT = 100 HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = YES -HTML_ALIGN_MEMBERS = YES HTML_DYNAMIC_SECTIONS = NO +HTML_INDEX_NUM_ENTRIES = 100 GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project @@ -175,9 +180,8 @@ QHG_LOCATION = GENERATE_ECLIPSEHELP = NO ECLIPSE_DOC_ID = org.doxygen.Project DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = NO -USE_INLINE_TREES = NO +ENUM_VALUES_PER_LINE = 4 TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 @@ -280,6 +284,7 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES GROUP_GRAPHS = YES UML_LOOK = NO +UML_LIMIT_NUM_FIELDS = 10 TEMPLATE_RELATIONS = NO INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES -- 1.8.0.2

1 0

[pacman-dev] [PATCH] Fixed missing asciidoc id
by dangets＠gmail.com 16 Dec '12

16 Dec '12

From: Danny George <dangets(a)gmail.com> Generated webpage contained dead links to section 'Package and Database Signature Checking' --- doc/pacman.conf.5.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index a9c5db3..b7049e1 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -226,6 +226,7 @@ even be used for different architectures. Set the signature verification level for this repository. For more information, see <<SC,Package and Database Signature Checking>> below. +[[SC]] Package and Database Signature Checking --------------------------------------- The 'SigLevel' directive is valid in both the `[options]` and repository -- 1.8.0.1

2 1

[pacman-dev] [PATCH 2/2] doc: Fix section link in pacman-key man page
by Allan McRae 16 Dec '12

16 Dec '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman-key.8.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index f235dcd..8ef749b 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -86,7 +86,7 @@ Operations *\--populate*:: Reload the default keys from the (optionally provided) keyrings in +{pkgdatadir}/keyrings+. For more information, see - <<SC,Providing a Keyring for Import>> below. + <<PK,Providing a Keyring for Import>> below. *-u, \--updatedb*:: Equivalent to '\--check-trustdb' in GnuPG. This operation can be specified with @@ -115,7 +115,7 @@ Options keyserver if one was not already configured. -Providing a Keyring for Import +Providing a Keyring for Import[[PK]] ------------------------------ A distribution or other repository provided may want to provide a set of PGP keys used in the signing of its packages and repository databases that can -- 1.8.0.2

1 0

[pacman-dev] [PATCH 1/3] Fix pacman's log messages not being translated
by Olivier Brunel 15 Dec '12

15 Dec '12

Log messages should be translated as well. (Those from ALPM already are.) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/callback.c | 6 +++--- src/pacman/pacman.c | 2 +- src/pacman/sync.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 01c6b61..c56c96a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -176,7 +176,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) } break; case ALPM_EVENT_ADD_DONE: - alpm_logaction(config->handle, "installed %s (%s)\n", + alpm_logaction(config->handle, _("installed %s (%s)\n"), alpm_pkg_get_name(data1), alpm_pkg_get_version(data1)); display_optdepends(data1); @@ -187,7 +187,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) } break; case ALPM_EVENT_REMOVE_DONE: - alpm_logaction(config->handle, "removed %s (%s)\n", + alpm_logaction(config->handle, _("removed %s (%s)\n"), alpm_pkg_get_name(data1), alpm_pkg_get_version(data1)); break; @@ -197,7 +197,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) } break; case ALPM_EVENT_UPGRADE_DONE: - alpm_logaction(config->handle, "upgraded %s (%s -> %s)\n", + alpm_logaction(config->handle, _("upgraded %s (%s -> %s)\n"), alpm_pkg_get_name(data1), alpm_pkg_get_version(data2), alpm_pkg_get_version(data1)); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 1ca746d..7db46d7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -743,7 +743,7 @@ static void cl_to_log(int argc, char *argv[]) *p++ = ' '; } strcpy(p, argv[i]); - alpm_logaction(config->handle, "Running '%s'\n", cl_text); + alpm_logaction(config->handle, _("Running '%s'\n"), cl_text); free(cl_text); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 532a667..938f9d6 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -787,7 +787,7 @@ static int sync_trans(alpm_list_t *targets) if(config->op_s_upgrade) { printf(_(":: Starting full system upgrade...\n")); - alpm_logaction(config->handle, "starting full system upgrade\n"); + alpm_logaction(config->handle, _("starting full system upgrade\n")); if(alpm_sync_sysupgrade(config->handle, config->op_s_upgrade >= 2) == -1) { pm_printf(ALPM_LOG_ERROR, "%s\n", alpm_strerror(alpm_errno(config->handle))); trans_release(); @@ -954,7 +954,7 @@ int pacman_sync(alpm_list_t *targets) if(config->op_s_sync) { /* grab a fresh package list */ printf(_(":: Synchronizing package databases...\n")); - alpm_logaction(config->handle, "synchronizing package lists\n"); + alpm_logaction(config->handle, _("synchronizing package lists\n")); if(!sync_synctree(config->op_s_sync, sync_dbs)) { return 1; } -- 1.8.0.2

6 12

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-477-g5186f70
by allan＠archlinux.org 14 Dec '12

14 Dec '12

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 5186f702d3d426eec8a2c84bb2a8556ffa9e0736 (commit) via 7d27b2b0f425460be5074f50a4233c9db08fe72b (commit) via ddd2b9e6f638fa98d02c6c64e2717b175dcb3ae7 (commit) via 01e093d0aee1cf5dad70a6c5fbabb024d960b121 (commit) via 327c272bb4540cee396f7e83ff98899876363a79 (commit) via cfd9f1cc6948bc99d48e968efa4dd57f3375b93c (commit) via 18ddf90ff41a9de6611400065b18f6de8dc35b01 (commit) via 097d5a478b32aece93013580fdb06cacbaf0e9a0 (commit) via 0445c68d9b7738553dd1a5088110b8b0a1e1f7f9 (commit) via da3a0333de34b37d073e1d27e9a07a7fa80025ee (commit) via ad3a26c615dbc931275f0ee2f04879d867b06974 (commit) from f5d904d97f66d5e3337578541f2f440e846b9490 (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 5186f702d3d426eec8a2c84bb2a8556ffa9e0736 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 9 11:13:55 2012 +1000 Remove leading "./" from filenames in mtree file A properly formatted mtree file may stick a leading "./" in front of file names in the root directory. Strip this if present. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7d27b2b0f425460be5074f50a4233c9db08fe72b Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 7 22:21:20 2012 +1000 Check file types match before comparing properties Bail early in file validation checks if the file type given in the mtree file does not match that in the filesystem. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ddd2b9e6f638fa98d02c6c64e2717b175dcb3ae7 Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 7 21:41:15 2012 +1000 Check "install" and "changelog" files for changes The "install" and "changelog" entries for a package in the local database are now checked for changes with -Qkk. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 01e093d0aee1cf5dad70a6c5fbabb024d960b121 Author: Allan McRae <allan(a)archlinux.org> Date: Fri May 4 15:50:59 2012 +1000 Perform full checking of files with -Qkk The follow fields are checked: Directory: uid, gid, mode File: uid, gid, mode, size, time Symbolic Link: uid, gid, mode, link, time A skeleton is added for checking a files md5sum and sha256sum when reading this information is supported by libarchive. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 327c272bb4540cee396f7e83ff98899876363a79 Author: Allan McRae <allan(a)archlinux.org> Date: Fri May 4 13:56:55 2012 +1000 Basic running of pacman -Qkk to check mtree files If a package has an mtree file, using pacman -Qkk will read that file and use it to perform more in depth package checking. Currently this only checks for file presence. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cfd9f1cc6948bc99d48e968efa4dd57f3375b93c Author: Allan McRae <allan(a)archlinux.org> Date: Fri May 4 13:30:08 2012 +1000 Separate checking a files existence into a function Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 18ddf90ff41a9de6611400065b18f6de8dc35b01 Author: Allan McRae <allan(a)archlinux.org> Date: Fri May 4 12:07:50 2012 +1000 Move check function into its own file There is going to be a lot of overlap in the code for the quick and full checks that can be abstracted into their own functions. Also many other file checking functions will be needed for the full check. Put all these in a separate source file. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 097d5a478b32aece93013580fdb06cacbaf0e9a0 Author: Allan McRae <allan(a)archlinux.org> Date: Wed May 2 11:08:07 2012 +1000 Add public functions for accessing mtree data Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0445c68d9b7738553dd1a5088110b8b0a1e1f7f9 Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 1 18:12:13 2012 +1000 Add internal functions for reading mtree file from local db Signed-off-by: Allan McRae <allan(a)archlinux.org> commit da3a0333de34b37d073e1d27e9a07a7fa80025ee Author: Allan McRae <allan(a)archlinux.org> Date: Mon Apr 30 16:26:54 2012 +1000 Extract .MTREE file into local package database Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ad3a26c615dbc931275f0ee2f04879d867b06974 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Apr 30 16:15:47 2012 +1000 makepkg: add mtree file into package Add an mtree file to the package with all file information. This can be added to the local pacman database on install allowing full package verification. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 5 + lib/libalpm/alpm.h | 21 ++ lib/libalpm/be_local.c | 75 +++++++ lib/libalpm/package.c | 46 +++++ lib/libalpm/package.h | 8 + scripts/makepkg.sh.in | 10 +- src/pacman/Makefile.am | 1 + src/pacman/check.c | 335 ++++++++++++++++++++++++++++++++ lib/libalpm/add.h => src/pacman/check.h | 19 +- src/pacman/pacman.c | 2 +- src/pacman/query.c | 62 +----- 11 files changed, 515 insertions(+), 69 deletions(-) create mode 100644 src/pacman/check.c copy lib/libalpm/add.h => src/pacman/check.h (68%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 01/11] makepkg: add mtree file into package
by Allan McRae 14 Dec '12

14 Dec '12

Add an mtree file to the package with all file information. This can be added to the local pacman database on install allowing full package verification. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Added sha256 sum to the mtree file in addition to the md5sum following the example of our package checksums in the repo db. scripts/makepkg.sh.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e4e76cd..c057905 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1810,8 +1810,6 @@ create_package() { done # tar it up - msg2 "$(gettext "Compressing package...")" - local fullver=$(get_full_version) local pkg_file="$PKGDEST/${pkgname}-${fullver}-${pkgarch}${PKGEXT}" local ret=0 @@ -1822,6 +1820,14 @@ create_package() { # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob + + msg2 "$(gettext "Generating .MTREE file...")" + bsdtar -czf .MTREE --format=mtree \ + --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \ + "${comp_files[@]}" * + comp_files+=(".MTREE") + + msg2 "$(gettext "Compressing package...")" # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail # bsdtar's gzip compression always saves the time stamp, making one -- 1.8.0.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-466-gf5d904d
by allan＠archlinux.org 14 Dec '12

14 Dec '12

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 f5d904d97f66d5e3337578541f2f440e846b9490 (commit) via 422a4021e482c51d4f21303dfd4eff4c15ba1114 (commit) via a9ad5a75f29c1175ec7916c715b007c2d388e0cb (commit) via 1dc3de3f69efe11d112e23c19db3e23695b426eb (commit) via 95f566d98a5ee361c0a7aca234e152d4f4ded791 (commit) via 53d610e0a5d39e544812c85d77a7049d6578c148 (commit) via 0c74ffd6b6e8f96d388c1e8219902beb369bf1b8 (commit) via 964640fbfcde48b7937a6c18964c78a3b11db3de (commit) via c8417f3386155028015f7f9fc43f4c64a60acf4c (commit) via 5a5e712c749edb8bca448f119769d8bbe381c348 (commit) via 8e736e1c9a4fb4ba375fe1f02be9e956f5f472d9 (commit) via 62f1c590fc26efe7047f7dcbeac8a0910cfb50a5 (commit) via 7a24f909fc21deb16271be5bc2cc5178f880c77a (commit) via d0e5cd2c7faef6159ab353714fa5227739994b2f (commit) via 9a24f1ffc50deb7d979430ac85475b10b4a98d28 (commit) via 63a2874fe4db43ab1b0299163b1ceb82c4d8e00b (commit) via eb9e74ecc7b7aa489de07bc52bb6d5220943154e (commit) via 0c2edbdd4992f3107d7a2bd600829fcb3f344d48 (commit) via 4a427dbc1bca50c516c41e4ae2cb0122c686f88d (commit) via 5a247ccbd4953e9bdd383ad30ca90ed740c9db3d (commit) via 927fdc0079c48b5bb401ac6e112d2d864919c5cc (commit) via 1c2cfc5bad81b242c06a88361b6d8fca9160949a (commit) via 9cd7ff807dc1014d8335b551524aca1994bb1e0d (commit) via 948f135a73dec553b6e9983740b0e501f3a6e8c2 (commit) via 88e7ea421ebbef86daa20ee0f9aff768a445b467 (commit) via 28d404f16aca8ae1b7640b32c221c8b8860f8ce0 (commit) via 80bc89c14768590e6ce3d33efaea8852a4db586c (commit) via 2fad78974d74338fa6bf895b8b092c38ab41bd10 (commit) via c1abfeae1ec39a196262622662850b7d277a4734 (commit) via 6860e2f7032aed392f2526a7fb72cbf08dd3c25f (commit) from 254329f6fb10a1fa59a0259fa5b2930530f63aae (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 f5d904d97f66d5e3337578541f2f440e846b9490 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 29 15:35:41 2012 +1000 Do not warn about missing database if being downloaded When a configured repo database is not already downloaded, a warning message such as "warning: database file for 'testing' does not exist" is printed. Disable this warning when the database is scheduled to be downloaded in the transaction. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 422a4021e482c51d4f21303dfd4eff4c15ba1114 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 13 16:49:01 2012 +1000 Fix future signature timestamp warning The warning given for a signature timstamp being in the future compared to the system time stated the opposite. Also, move this warning to debug output. It is useless in its current form as the package or database that is giving the error is not mentioned and so other debug output is needed to find the offending signature. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a9ad5a75f29c1175ec7916c715b007c2d388e0cb Author: Jason St. John <jstjohn(a)purdue.edu> Date: Fri Nov 16 18:31:43 2012 -0500 Replace space-based indents in prototypes with tabs The previous commit removed the Vim modelines which replaced tabs with spaces. This commit replaces the space-based indents with tabs. Tabs are generally more compatible with various user preferences regarding indentation of code. Using space-based indents is not flexible regarding user preferences at all. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> commit 1dc3de3f69efe11d112e23c19db3e23695b426eb Author: Jason St. John <jstjohn(a)purdue.edu> Date: Fri Nov 16 18:31:42 2012 -0500 Remove Vim modelines in prototype files It makes little sense to "force" users to replace tabs with spaces, with a width of 2. These settings should be configured by the user in their own ~/.vimrc. This is a resubmission based on Allan's feedback on the ML. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> commit 95f566d98a5ee361c0a7aca234e152d4f4ded791 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Tue Dec 11 06:34:35 2012 -0500 Print package name before changelog entry with -Qc Fixes FS#32362 Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 53d610e0a5d39e544812c85d77a7049d6578c148 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 1 00:40:46 2012 -0500 query.c: simplify is_foreign Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0c74ffd6b6e8f96d388c1e8219902beb369bf1b8 Author: William Giokas <1007380(a)gmail.com> Date: Thu Nov 29 01:08:55 2012 -0600 Added LOGDEST variable Places logs in a pre-defined location. The logs are always neatly labeled with package names and numbers, and this way can be more easily sent to network shares as they are written or compressed/cleaned en masse. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 964640fbfcde48b7937a6c18964c78a3b11db3de Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 13:15:04 2012 -0500 Plug various minor memory leaks Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c8417f3386155028015f7f9fc43f4c64a60acf4c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 25 16:02:47 2012 -0500 makepkg: normalize whitespace in $pkgdesc when writing .PKGINFO Specifically, we shouldn't allow newlines in the pkgdesc field, as pacman will ignore the continuation and end the description prematurely as written to the local DB. Normalize ALL whitespace, replacing it with single whitespace characters. Fixes strange errors as seen by FS#32852. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5a5e712c749edb8bca448f119769d8bbe381c348 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 25 16:00:58 2012 -0500 pkgdelta: avoid use of eval and IFS manipulation Instead of blindly consuming data from the .PKGINFO file, parse it more closely and only declare variables as needed. Should help to avoid nonsensical errors and possibly dangerous command execution as seen in FS#32852. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8e736e1c9a4fb4ba375fe1f02be9e956f5f472d9 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Aug 12 21:03:04 2012 +1000 Display install status of optdependencies When a packages (new) optdepends are printed in install (update), add a note of their current installation status. Packages currently installed are labelled with [installed] and packages to be installed in this transaction are labelled [pending]. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 62f1c590fc26efe7047f7dcbeac8a0910cfb50a5 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Aug 12 20:48:53 2012 +1000 Make alpm_pkg_find public This function is particularly useful, so make it public. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7a24f909fc21deb16271be5bc2cc5178f880c77a Author: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Date: Sun Aug 12 16:40:04 2012 +1000 Add pactest for "Optional for" output Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d0e5cd2c7faef6159ab353714fa5227739994b2f Author: Allan McRae <allan(a)archlinux.org> Date: Sun Aug 12 16:28:42 2012 +1000 Add "Optional for" to package information output Much like packages that require a give package are displayed in the "Required by" field of its information output, alos display packages that optionally require the package. Inspired-by: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9a24f1ffc50deb7d979430ac85475b10b4a98d28 Author: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Date: Sat Aug 11 22:29:04 2012 +1000 Add pactests for displaying optdep installation status Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 63a2874fe4db43ab1b0299163b1ceb82c4d8e00b Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 11 21:42:37 2012 +1000 Display optdep install status in package query output Indicate which optional dependencies are installed when viewing local package information (-Qi). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit eb9e74ecc7b7aa489de07bc52bb6d5220943154e Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 11 16:07:44 2012 +1000 Notify of removed package required as optdepend When a package is being removed, provide a notification (via a callback) if any local package requires it as an optdepend. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0c2edbdd4992f3107d7a2bd600829fcb3f344d48 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 6 22:35:22 2012 +1000 It turns out we do care about directories... This is a bug that has been around since at least 2007. On a package upgrade (either by -S or -U) a new directory could overwrite any file. This is caused by the filelist difference calculation ignoring all directories and thus no new directories were checked for conflicting files on the filesystem. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4a427dbc1bca50c516c41e4ae2cb0122c686f88d Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Dec 12 00:29:50 2012 +1000 Add pactests for not detecting directory conflicts with upgrades Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5a247ccbd4953e9bdd383ad30ca90ed740c9db3d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Sep 16 12:53:40 2012 -0400 Fix overzealous package removal with unmet dependencies Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> [Allan: Remove expected failure from fixed pactests] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 927fdc0079c48b5bb401ac6e112d2d864919c5cc Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 16 03:59:43 2012 +1000 pactest: variant of package removal due to unmet dependencies Duplicate of sync140.py but with the alphabetical ordering of the packages changed. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1c2cfc5bad81b242c06a88361b6d8fca9160949a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 16 01:41:33 2012 +1000 pactest: removal of packages with unmet dependencies Provide a package for removing packages with unmet dependencies. Currently pacman removes too many packages from the transaction (FS#30649). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9cd7ff807dc1014d8335b551524aca1994bb1e0d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Aug 6 22:18:15 2012 -0400 _alpm_filelist_resolve: add useful return code Return -1 if a path is too long to resolve or we run out of memory. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 948f135a73dec553b6e9983740b0e501f3a6e8c2 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 21 00:17:18 2012 +1000 Avoid upgrade conflict with unchanged effective path This applies to a case such as when /lib is a symlink to /usr/lib. If a package is installed which contains /lib/libfoo.so, pacman will complain if this package is then "fixed" to contain /usr/lib/libfoo.so. Since these have the same effective path and it exists within the same package, ignore the conflict. Fixes FS#30681. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 88e7ea421ebbef86daa20ee0f9aff768a445b467 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 20 22:25:18 2012 +1000 Resolve file paths during inter-package conflict check File paths are resolved if necessary during inter-package conflict checks so that packages carrying the same effective file due to directory symlinks on the filesystem are flagged as conflicting. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 28d404f16aca8ae1b7640b32c221c8b8860f8ce0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Aug 6 22:18:14 2012 -0400 _alpm_filelist_resolve: use original filenames where possible If a filename isn't resolved, the original can be used instead of strdup()ing it. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 80bc89c14768590e6ce3d33efaea8852a4db586c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Aug 6 22:08:04 2012 -0400 Add _alpm_filelist_resolve The _alpm_filelist_resolve function takes a filelist and creates a list with any symlinks in directory paths resolved. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2fad78974d74338fa6bf895b8b092c38ab41bd10 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 18 23:34:32 2012 +1000 Add resolved_path to alpm_filelist_t Add an array to hold the resolved paths of the files in alpm_filelist_t. When the file name and its resolved file name are identical, the pointer to the original file name is used to avoid duplicate memory allocation. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c1abfeae1ec39a196262622662850b7d277a4734 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 18 12:25:37 2012 +1000 Detect inter-package conflicts between files and directories Detect a conflict between a file/symlink in one package and a directory in another when both are being installed at once. A side effect is the creation of conflicts between a directory symlink and a real directory (e.g lib -> usr/lib in pkg1 and /lib in pkg2). Given we can not guarantee pkg1 is installed before pkg2, this is a genuine conflict. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6860e2f7032aed392f2526a7fb72cbf08dd3c25f Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 17 20:44:18 2012 +1000 pactest: Provide a full filelist to the pactests that need it It turns out when you set the filelist for a package to include "usr/lib/foo" in the pactest suite, it thinks there is only the file "usr/lib/foo" in there... No "usr/" or "usr/lib/" directory. This makes life difficult when testing code that scrolls through a filelist looking for directory entries. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.txt | 5 + etc/makepkg.conf.in | 2 + lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 23 +- lib/libalpm/be_local.c | 1 + lib/libalpm/be_sync.c | 3 +- lib/libalpm/conflict.c | 6 + lib/libalpm/deps.c | 94 +++---- lib/libalpm/dload.c | 1 + lib/libalpm/filelist.c | 279 ++++++++++++++++++--- lib/libalpm/filelist.h | 3 + lib/libalpm/package.c | 58 ++++- lib/libalpm/package.h | 1 - lib/libalpm/remove.c | 35 ++- lib/libalpm/signing.c | 11 +- lib/libalpm/sync.c | 22 +- proto/PKGBUILD-split.proto | 58 ++--- proto/PKGBUILD.proto | 16 +- proto/proto.install | 14 +- scripts/makepkg.sh.in | 13 +- scripts/pkgdelta.sh.in | 28 +-- src/pacman/callback.c | 10 + src/pacman/package.c | 25 +- src/pacman/pacman.c | 5 +- src/pacman/query.c | 13 +- src/pacman/util.c | 22 +- test/pacman/tests/fileconflict001.py | 10 +- test/pacman/tests/fileconflict002.py | 2 - test/pacman/tests/fileconflict013.py | 2 - test/pacman/tests/fileconflict015.py | 2 - test/pacman/tests/fileconflict016.py | 9 +- .../{fileconflict016.py => fileconflict017.py} | 13 +- test/pacman/tests/fileconflict020.py | 18 ++ .../{fileconflict012.py => fileconflict021.py} | 9 +- test/pacman/tests/query010.py | 12 + test/pacman/tests/query011.py | 15 ++ test/pacman/tests/query012.py | 13 + test/pacman/tests/sync140.py | 26 ++ test/pacman/tests/sync141.py | 26 ++ test/pacman/tests/unresolvable001.py | 2 - 40 files changed, 678 insertions(+), 231 deletions(-) copy test/pacman/tests/{fileconflict016.py => fileconflict017.py} (66%) create mode 100644 test/pacman/tests/fileconflict020.py copy test/pacman/tests/{fileconflict012.py => fileconflict021.py} (50%) create mode 100644 test/pacman/tests/query010.py create mode 100644 test/pacman/tests/query011.py create mode 100644 test/pacman/tests/query012.py create mode 100644 test/pacman/tests/sync140.py create mode 100644 test/pacman/tests/sync141.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Next push to master
by Allan McRae 13 Dec '12

13 Dec '12

I am about to push another bunch of patches to master. These are a bit more in depth than my previous push but the big thing are all well pactested. It will merge my "merge" branch which has the following: - fixed conflict checking with directory symlinks - fixed package list resolving with "--ignore" - fixed conflict resolving with new directories on upgrade - optdeps informational output - then a whole bunch of small fixes It was going to be a smaller pull, but the more important fixes all overlapped other patches to such a degree that this was the best way forward. I'll push this in the next day. Allan

1 0

[pacman-dev] [PATCH] Added a -n option to repo-add to only add new packages
by dangets＠gmail.com 13 Dec '12

13 Dec '12

From: Danny George <dangets(a)gmail.com> Packages are already in the pkg db were given a warning, and then readded anyway. With -n specified, the warning is printed, but skips readding it. Signed-off-by: Danny George <dangets(a)gmail.com> --- scripts/repo-add.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 5a3bf23..162beec 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -30,6 +30,7 @@ declare -r confdir='@sysconfdir@' QUIET=0 DELTA=0 +ONLYADDNEW=0 WITHFILES=0 SIGN=0 VERIFY=0 @@ -55,6 +56,7 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "\n" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -d, --delta generate and add delta for package update\n")" + printf -- "$(gettext " -n, --new only add packages that aren't already in the database\n")" printf -- "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n")" @@ -290,6 +292,9 @@ db_write_entry() { if [[ -d $tmpdir/tree/$pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" + if (( ONLYADDNEW )); then + return 0; + fi else if (( DELTA )); then pkgentry=$(find_pkgentry "$pkgname") @@ -603,6 +608,7 @@ while (( $# )); do case $1 in -q|--quiet) QUIET=1;; -d|--delta) DELTA=1;; + -n|--new) ONLYADDNEW=1;; -f|--files) WITHFILES=1;; -s|--sign) check_gpg -- 1.8.0.1

2 1