- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Add alpm_option_match_noextract
by Allan McRae 18 Nov '14

18 Nov '14

This is useful for frontends testing whether a file is in NoExtract Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 1 + lib/libalpm/handle.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1831fcf..234bd6b 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -827,6 +827,7 @@ alpm_list_t *alpm_option_get_noextracts(alpm_handle_t *handle); int alpm_option_add_noextract(alpm_handle_t *handle, const char *path); int alpm_option_set_noextracts(alpm_handle_t *handle, alpm_list_t *noextract); int alpm_option_remove_noextract(alpm_handle_t *handle, const char *path); +int alpm_option_match_noextract(alpm_handle_t *handle, const char *path); /** @} */ /** @name Accessors to the list of ignored packages. diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 6545592..5ef619e 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -542,6 +542,11 @@ int SYMEXPORT alpm_option_remove_noextract(alpm_handle_t *handle, const char *pa return _alpm_option_strlist_rem(handle, &(handle->noextract), path); } +int SYMEXPORT alpm_option_match_noextract(alpm_handle_t *handle, const char *path) +{ + return _alpm_fnmatch_patterns(handle->noextract, path); +} + int SYMEXPORT alpm_option_add_ignorepkg(alpm_handle_t *handle, const char *pkg) { return _alpm_option_strlist_add(handle, &(handle->ignorepkg), pkg); -- 2.1.3

1 1

[pacman-dev] [PATCH 1/3] Make (_alpm_)fnmatch_patterns available to front-end
by Allan McRae 18 Nov '14

18 Nov '14

This function will be useful in determining if any files are in the NoExtract array when checking for missing files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 4 ++-- lib/libalpm/util.c | 31 ------------------------------- lib/libalpm/util.h | 1 - src/common/util-common.c | 32 ++++++++++++++++++++++++++++++++ src/common/util-common.h | 4 ++++ 5 files changed, 38 insertions(+), 34 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index bbf2a51..9f7c9fa 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -190,7 +190,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, } /* if a file is in NoExtract then we never extract it */ - if(_alpm_fnmatch_patterns(handle->noextract, entryname) == 0) { + if(fnmatch_patterns(handle->noextract, entryname) == 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract," " skipping extraction of %s\n", entryname, filename); @@ -266,7 +266,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, } else { /* case 3: */ /* if file is in NoUpgrade, don't touch it */ - if(_alpm_fnmatch_patterns(handle->noupgrade, entryname) == 0) { + if(fnmatch_patterns(handle->noupgrade, entryname) == 0) { notouch = 1; } else { alpm_backup_t *backup; diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 43d0d7b..39ac890 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1224,37 +1224,6 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a return ret; } -/** Checks whether a string matches at least one shell wildcard pattern. - * Checks for matches with fnmatch. Matches are inverted by prepending - * patterns with an exclamation mark. Preceding exclamation marks may be - * escaped. Subsequent matches override previous ones. - * @param patterns patterns to match against - * @param string string to check against pattern - * @return 0 if string matches pattern, negative if they don't match and - * positive if the last match was inverted - */ -int _alpm_fnmatch_patterns(alpm_list_t *patterns, const char *string) -{ - alpm_list_t *i; - char *pattern; - short inverted; - - for(i = alpm_list_last(patterns); i; i = alpm_list_previous(i)) { - pattern = i->data; - - inverted = pattern[0] == '!'; - if(inverted || pattern[0] == '\\') { - pattern++; - } - - if(_alpm_fnmatch(pattern, string) == 0) { - return inverted; - } - } - - return -1; -} - /** Checks whether a string matches a shell wildcard pattern. * Wrapper around fnmatch. * @param pattern pattern to match against diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 6f47073..9422646 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -137,7 +137,6 @@ alpm_time_t _alpm_parsedate(const char *line); int _alpm_raw_cmp(const char *first, const char *second); int _alpm_raw_ncmp(const char *first, const char *second, size_t max); int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int amode); -int _alpm_fnmatch_patterns(alpm_list_t *patterns, const char *string); int _alpm_fnmatch(const void *pattern, const void *string); void *_alpm_realloc(void **data, size_t *current, const size_t required); void *_alpm_greedy_grow(void **data, size_t *current, const size_t required); diff --git a/src/common/util-common.c b/src/common/util-common.c index ab74e7c..1930d64 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -20,6 +20,7 @@ #include <errno.h> #include <stdlib.h> #include <string.h> +#include <fnmatch.h> #include "util-common.h" @@ -103,6 +104,37 @@ int llstat(char *path, struct stat *buf) return ret; } +/** Checks whether a string matches at least one shell wildcard pattern. + * Checks for matches with fnmatch. Matches are inverted by prepending + * patterns with an exclamation mark. Preceding exclamation marks may be + * escaped. Subsequent matches override previous ones. + * @param patterns patterns to match against + * @param string string to check against pattern + * @return 0 if string matches pattern, negative if they don't match and + * positive if the last match was inverted + */ +int fnmatch_patterns(alpm_list_t *patterns, const char *string) +{ + alpm_list_t *i; + char *pattern; + short inverted; + + for(i = alpm_list_last(patterns); i; i = alpm_list_previous(i)) { + pattern = i->data; + + inverted = pattern[0] == '!'; + if(inverted || pattern[0] == '\\') { + pattern++; + } + + if(fnmatch(pattern, string, 0) == 0) { + return inverted; + } + } + + return -1; +} + /** Wrapper around fgets() which properly handles EINTR * @param s string to read into * @param size maximum length to read diff --git a/src/common/util-common.h b/src/common/util-common.h index ca8db5a..17f8d87 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -20,6 +20,8 @@ #ifndef _PM_UTIL_COMMON_H #define _PM_UTIL_COMMON_H +#include <alpm_list.h> + #include <stdio.h> #include <sys/stat.h> /* struct stat */ @@ -28,6 +30,8 @@ char *mdirname(const char *path); int llstat(char *path, struct stat *buf); +int fnmatch_patterns(alpm_list_t *patterns, const char *string); + char *safe_fgets(char *s, int size, FILE *stream); #ifndef HAVE_STRNDUP -- 2.1.3

2 5

[pacman-dev] [PATCH] _alpm_backup_dup: fix memory leak in error case
by Allan McRae 18 Nov '14

18 Nov '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/backup.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index c2989b6..aeb4131 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -87,10 +87,15 @@ alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup) alpm_backup_t *newbackup; CALLOC(newbackup, 1, sizeof(alpm_backup_t), return NULL); - STRDUP(newbackup->name, backup->name, return NULL); - STRDUP(newbackup->hash, backup->hash, return NULL); + STRDUP(newbackup->name, backup->name, goto error); + STRDUP(newbackup->hash, backup->hash, goto error); return newbackup; + +error: + free(newbackup->name); + free(newbackup); + return NULL; } /* vim: set noet: */ -- 2.1.3

2 4

[pacman-dev] [PATCH] pacsort: only look at versions in file mode
by Dave Reisner 17 Nov '14

17 Nov '14

alpm_pkg_vercmp rightfully considers foo-1-1 to be newer than foo-1:1-1 because of the leading characters. So, in file mode, pacsort must necessarily ignore the package name when performing comparisons. Create a struct, for convenience, which overlays pointers and lengths to the name and version within a filename. Using this, we can avoid some amount of heap allocation, and do better at comparing versions for similar package names. ref: https://bugs.archlinux.org/task/37631 --- Since I forgot about this, and now it's now been declared release blocking, here's the easy solution (with a TODO for the rest). src/util/pacsort.c | 78 +++++++++++++++++++++++++++++++++++++++++------- test/util/pacsorttest.sh | 11 ++++++- 2 files changed, 78 insertions(+), 11 deletions(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 86f2fc6..b3ef1b5 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -28,6 +28,15 @@ #define DELIM ' ' +#ifndef MIN +#define MIN(a, b) \ + __extension__({ \ + __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + _a < _b ? _a : _b; \ + }) +#endif + struct buffer_t { char *mem; size_t len; @@ -40,6 +49,14 @@ struct list_t { size_t maxcount; }; +struct pkgmeta_t { + const char *pkgname; + size_t pkgname_len; + + const char *pkgver; + size_t pkgver_len; +}; + static struct options_t { int order; int sortkey; @@ -256,6 +273,37 @@ static const char *nth_column(const char *string) return prev; } +static void extract_pkgmeta(const char *path, struct pkgmeta_t *meta) { + const char *pkgver_end; + const char *slash; + + memset(meta, 0, sizeof(struct pkgmeta_t)); + + slash = strrchr(path, '/'); + if(slash == NULL) { + meta->pkgname = path; + } else { + meta->pkgname = slash + 1; + } + + pkgver_end = strrchr(meta->pkgname, '-'); + + /* read backwards through pkgrel */ + for(meta->pkgver = pkgver_end - 1; + meta->pkgver > meta->pkgname && *meta->pkgver != '-'; + --meta->pkgver) + ; + /* read backwards through pkgver */ + for(--meta->pkgver; + meta->pkgver > meta->pkgname && *meta->pkgver != '-'; + --meta->pkgver) + ; + ++meta->pkgver; + + meta->pkgname_len = meta->pkgver - meta->pkgname - 1; + meta->pkgver_len = pkgver_end - meta->pkgver; +} + static int vercmp(const void *p1, const void *p2) { const char *name1, *name2; @@ -276,19 +324,29 @@ static int vercmp(const void *p1, const void *p2) * Will be considered equal by this version comparison */ if(opts.filemode) { + /* TODO: Extract this data earlier so that we don't need to do this parsing + * (potentially multiple times) on the sort callback. */ if(fnmatch("*-*.pkg.tar.?z", name1, 0) == 0 && fnmatch("*-*.pkg.tar.?z", name2, 0) == 0) { - const char *start, *end; - - start = strrchr(name1, '/'); - start = start ? start + 1 : name1; - end = strrchr(name1, '-'); - fn1 = strndup(start, end - start); + struct pkgmeta_t pkgmeta1, pkgmeta2; + int namecmp; + + /* Extract name and version */ + extract_pkgmeta(name1, &pkgmeta1); + extract_pkgmeta(name2, &pkgmeta2); + + /* If the package names aren't the same, there's no sense in comparing + * the versions. Short circuit and return a comparison based on the + * pkgnames. This probably could be cleaner, but I'm favoring clarity + * over cleverness. */ + namecmp = memcmp(pkgmeta1.pkgname, pkgmeta2.pkgname, + MIN(pkgmeta1.pkgname_len, pkgmeta2.pkgname_len)); + if(pkgmeta1.pkgname_len != pkgmeta2.pkgname_len || namecmp != 0) { + return opts.order * namecmp; + } - start = strrchr(name2, '/'); - start = start ? start + 1 : name2; - end = strrchr(name2, '-'); - fn2 = strndup(start, end - start); + fn1 = strndup(pkgmeta1.pkgver, pkgmeta1.pkgver_len); + fn2 = strndup(pkgmeta2.pkgver, pkgmeta2.pkgver_len); name1 = fn1; name2 = fn2; diff --git a/test/util/pacsorttest.sh b/test/util/pacsorttest.sh index a2adac9..3373cbc 100755 --- a/test/util/pacsorttest.sh +++ b/test/util/pacsorttest.sh @@ -21,7 +21,7 @@ # default binary if one was not specified as $1 bin=${1:-${PMTEST_UTIL_DIR}pacsort} # holds counts of tests -total=23 +total=26 run=0 failure=0 @@ -89,6 +89,15 @@ runtest $in $in "filename sort with uneven leading path components" "--files" in="firefox-18.0-2-i686.pkg.tar.xz\nfirefox-18.0.1-1-x86_64.pkg.tar.gz\n" runtest $in $in "filename sort with different extensions" "--files" +in="/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n/packages/dialog-1:1.2_20130928-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort with epoch" "--files" + +in="/packages/dia-log-1:1.2_20130928-1-x86_64.pkg.tar.xz\n/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort with epoch" "--files" + +in="/packages/dialoggg-1:1.2_20130928-1-x86_64.pkg.tar.xz\n/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort with epoch" "--files" + # generate some long input/expected for the next few tests declare normal reverse names_normal names_reverse for ((i=1; i<600; i++)); do -- 2.1.3

3 2

[pacman-dev] [PATCH] makepkg: symlink files in noextract into $srcdir
by Allan McRae 17 Nov '14

17 Nov '14

File in noextract should still be symlinked into $srcdir so that they can be accessed without using $SRCDEST. Using noextract on VCS files makes no sense as these are not being extracted, so now this does nothing. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4e9da4b..771aa72 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -391,6 +391,12 @@ extract_file() { rm -f "$srcdir/${file}" ln -s "$filepath" "$srcdir/" + if in_array "$file" "${noextract[@]}"; then + # skip source files in the noextract=() array + # these are marked explicitly to NOT be extracted + return 0 + fi + # do not rely on extension for file type local file_type=$(file -bizL "$file") local ext=${file##*.} @@ -1556,11 +1562,6 @@ extract_sources() { get_all_sources_for_arch 'all_sources' for netfile in "${all_sources[@]}"; do local file=$(get_filename "$netfile") - if in_array "$file" "${noextract[@]}"; then - # skip source files in the noextract=() array - # these are marked explicitly to NOT be extracted - continue - fi local proto=$(get_protocol "$netfile") case "$proto" in bzr*) -- 2.1.3

1 0

[pacman-dev] Feature freeze - 4.2 release
by Allan McRae 17 Nov '14

17 Nov '14

Hi all, I got the last of the patches on my TODO list reviewed, so now we are in a feature freeze. The remaining bugs that need addressed before a freeze are: FS#41028 - pacman -Qk should ignore files missing due to NoExtract FS#37631 - [pacsort] wants to delete the wrong package file when an epoq is added FS#38990 - Clarify IgnorePkg description FS#41531 - pacsysclean is broken FS#41862 - [pacman-git] noextract option in PKGBUILD doesn't symlink file into ${srcdir} Cheers, Allan

3 4

[pacman-dev] [PATCH] Remove logging of NoExtract events
by Allan McRae 17 Nov '14

17 Nov '14

With globbing in NoExtract, these log events can quickly pile up hiding important information from the log. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 604e0c7..ee2b7ec 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -194,8 +194,6 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract," " skipping extraction of %s\n", entryname, filename); - alpm_logaction(handle, ALPM_CALLER_PREFIX, - "note: %s is in NoExtract, skipping extraction\n", entryname); archive_read_data_skip(archive); return 0; } -- 2.1.3

1 0

[pacman-dev] [PATCH 1/4] makepkg: checkout a revision specified in SVN fragment in download_svn.
by Lukáš Jirkovský 17 Nov '14

17 Nov '14

Previously the sources were dowloaded in HEAD revision in the download_svn(). If a specific revision was requested in fragment, the code was updated to that revision in extract_svn(). However, because SVN is a centralized system, this means that the changed sources has to be downloaded again. By moving the fragment handling to download_svn(), we get the correct revision without having to download it later in extract_svn(). Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> --- scripts/makepkg.sh.in | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 28e8e7a..aeb231a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -706,10 +706,23 @@ download_svn() { fi url=${url%%#*} + local ref=HEAD + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + revision) + ref="${fragment##*=}" + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "svn" mkdir -p "$dir/.makepkg" - if ! svn checkout --config-dir "$dir/.makepkg" "$url" "$dir"; then + if ! svn checkout -r ${ref} --config-dir "$dir/.makepkg" "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" plain "$(gettext "Aborting...")" exit 1 @@ -717,7 +730,7 @@ download_svn() { elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn" cd_safe "$dir" - if ! svn update; then + if ! svn update -r ${ref}; then # only warn on failure to allow offline builds warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "svn" fi @@ -727,11 +740,6 @@ download_svn() { extract_svn() { local netfile=$1 - local fragment=${netfile#*#} - if [[ $fragment = "$netfile" ]]; then - unset fragment - fi - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" @@ -742,29 +750,8 @@ extract_svn() { pushd "$srcdir" &>/dev/null rm -rf "${dir##*/}" - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - revision) - ref="${fragment##*=}" - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi - cp -a "$dir" . - if [[ -n ${ref} ]]; then - cd_safe "$(get_filename "$netfile")" - if ! svn update -r ${ref}; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" - plain "$(gettext "Aborting...")" - fi - fi - popd &>/dev/null } -- 1.8.5.1

7 28

[pacman-dev] [PATCH] Fix crash when using external downloader
by Allan McRae 17 Nov '14

17 Nov '14

Commit 9d96bed9 attempts to use the same effective URL for the db and its signature download. However, this information is not available when we use an external downloader, resulting in a crash. Fall back to the old method when the effective URL is unavailable. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 62fd0f0..5245948 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -241,12 +241,25 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) unlink(sigpath); free(sigpath); - /* if we downloaded a DB, we want the .sig from the same server */ - /* print final_db_url into a buffer (leave space for .sig) */ - len = strlen(final_db_url) + 5; + /* if we downloaded a DB, we want the .sig from the same server - + this information is only available from the internal downloader */ + if(handle->fetchcb == NULL) { + /* print final_db_url into a buffer (leave space for .sig) */ + len = strlen(final_db_url) + 5; + } else { + /* print server + filename into a buffer (leave space for .sig) */ + len = strlen(server) + strlen(db->treename) + 9; + } + /* TODO fix leak syncpath and umask unset */ MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(payload.fileurl, len, "%s.sig", final_db_url); + + if(handle->fetchcb == NULL) { + snprintf(payload.fileurl, len, "%s.sig", final_db_url); + } else { + snprintf(payload.fileurl, len, "%s/%s.db.sig", server, db->treename); + } + payload.handle = handle; payload.force = 1; payload.errors_ok = (level & ALPM_SIG_DATABASE_OPTIONAL); -- 2.1.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-490-g0d24994
by allan＠archlinux.org 17 Nov '14

17 Nov '14

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 0d249949345e69fc1728df236569d1153582244c (commit) via 694901259031c19178cbfaa7087a2950d2dde477 (commit) via db2562113ba014442568f9ba76a0c6a01674fcd4 (commit) via be3ce88bb21cc62a3788a7aca6322a312f6b87d7 (commit) via f66ae5334eb1b5b816346cc3e69d01cf5e7fe306 (commit) via f6b3c9d8038085a9b8ac2151a0ca3dafd637d3e2 (commit) via ecf0e37fc5b583c3694e6847e9f38edb8bae413a (commit) via 6029a77ac0f7667e1cc40fe0239b45e6217f0c25 (commit) via bd746568f6554789537baf96e5f75ff35737bd98 (commit) via 03aa44a3ecab8ede51d3a6a780017b59babe2965 (commit) via f77933ea1e45638d518206c839315d3feece2c01 (commit) via 9594f513a46220b12f515201dd3b034a7c648992 (commit) via 37aeb436443f9e37991ab557b91eea035d68ffc4 (commit) via de442b6867b9f21c3a01a6c03339cf86812944a8 (commit) via 167a598265b9f81f5afc71380c4f6b871caeb76b (commit) from bd744d067da1ac455e8a9cdfb622c655f14e485d (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 0d249949345e69fc1728df236569d1153582244c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Sep 23 14:04:48 2014 -0400 makepkg: only strip vcs prefixes from front of url Referenced by FS#41811 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 694901259031c19178cbfaa7087a2950d2dde477 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Sep 23 14:04:47 2014 -0400 makepkg: do not strip bzr+ from bzr+ssh urls bzr does not recognize bare ssh:// urls. Fixes FS#41811 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit db2562113ba014442568f9ba76a0c6a01674fcd4 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 1 11:38:44 2014 +0200 makepkg: bzr: update existing sources in srcdir without removing them first. The local changes are discarded when updating. This matches the behaviour when non-VCS sources are used. It also allows incremental builds. This also changes the checkout during bzr source "extraction" to a heavyweight checkout so that pulling a specific revision does not alter the original download. Original-work-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit be3ce88bb21cc62a3788a7aca6322a312f6b87d7 Author: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Date: Mon Dec 9 21:31:22 2013 +0100 makepkg: hg: update existing sources in srcdir without removing them first. The local changes are discarded when updating. This matches the behaviour when non-VCS sources are used. It also allows incremental builds. Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f66ae5334eb1b5b816346cc3e69d01cf5e7fe306 Author: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Date: Mon Dec 9 21:31:20 2013 +0100 makepkg: checkout a revision specified in SVN fragment in download_svn. Previously the sources were dowloaded in HEAD revision in the download_svn(). If a specific revision was requested in fragment, the code was updated to that revision in extract_svn(). However, because SVN is a centralized system, this means that the changed sources has to be downloaded again. By moving the fragment handling to download_svn(), we get the correct revision without having to download it later in extract_svn(). Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f6b3c9d8038085a9b8ac2151a0ca3dafd637d3e2 Author: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Date: Mon Dec 9 21:31:23 2013 +0100 makepkg: git: update existing sources in srcdir without removing them first. The local changes are discarded when updating. This matches the behaviour when non-VCS sources are used. It also allows incremental builds. Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ecf0e37fc5b583c3694e6847e9f38edb8bae413a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Nov 9 15:53:16 2014 +1000 makepkg: improve stripping pkgdesc of whitespace for .PKGINFO Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6029a77ac0f7667e1cc40fe0239b45e6217f0c25 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 8 23:06:43 2014 -0500 makepkg: introduce .SRCINFO files for source packages Similar to .PKGINFO, .SRCINFO provides structured metadata from the PKGBUILD to be included with source packages. The format is structured such that it contains a "pkgbase" and one to many "pkgname" sections. Each "pkgname" section represents an "output package", and inherits all of the attributes of the "pkgbase" section, and then can define their own additive fields. For example, a simple PKGBUILD: pkgbase=ponies pkgname=('applejack' 'pinkiepie') pkgver=1.2.3 pkgrel=1 arch=('x86_64' 'i686') depends=('friendship' 'magic') build() { ...; } package_applejack() { provides=('courage') ...; } package_pinkiepie() { provides=('laughter') ...; } Would yield the following .SRCINFO file: pkgbase = ponies pkgdesc = friendship is magic pkgver = 1.2.3 pkgrel = 1 arch = x86_64 arch = i686 depends = friendship depends = magic pkgname = applejack provides = courage pkgname = pinkiepie provides = laughter The code to generate this new file is taken a project which I've been incubating[0] under the guise of 'mkaurball', which creates .AURINFO files for the AUR. AURINFO is the exactly same file as .SRCINFO, but named as such to make it clear that this is specific to the AUR. Because we're parsing shell in the packaging functions rather than executing it, there *are* some limitations, but these only really crop up in more "exotic" PKGBUILDs. Smoketesting[1] for accuracy in the Arch repos yields 100% accuracy for [core] and [extra]. [community] clocks in at ~98% accuracy (.3% difference per PKGBUILD), largely due to silly haskell packages calling pacman from inside the PKGBUILD to determine dependencies. [multilib] currently shows about 92% accuracy -- a statistic which can be largely improved by utilizing the recently merged arch-specific attribute work. This is also a smaller repo so the numbers are somewhat inflated. In reality, this is only a .8% variance per PKGBUILD. Together, we can make PKGBUILD better. [0] https://github.com/falconindy/pkgbuild-introspection [1] https://github.com/falconindy/pkgbuild-introspection/blob/master/test/smoke… Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bd746568f6554789537baf96e5f75ff35737bd98 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 8 23:30:30 2014 -0500 makepkg: simplify epoch handling We can avoid setting a default value for epoch since we intend to mean unset and "0" as the same thing. This is also a more consistent default as the display of epoch=0 is no epoch at all in the full package version. The extra paranoia in get_full_version can be removed due to lint_epoch guarding against non-integer values of epoch. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 03aa44a3ecab8ede51d3a6a780017b59babe2965 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 20 17:33:02 2014 -0400 makepkg: ignore empty global attributes in extraction This bug isn't currently exposed by any of the existing codepaths, but an upcoming patch to introduce SRCINFO files to makepkg will expose this. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f77933ea1e45638d518206c839315d3feece2c01 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Nov 5 09:24:35 2014 +0100 Add --assume-installed to shell completion Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9594f513a46220b12f515201dd3b034a7c648992 Author: Florian Pritz <bluewind(a)xinu.at> Date: Tue Nov 4 20:40:51 2014 +0100 Add --assume-installed to pacman --help Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 37aeb436443f9e37991ab557b91eea035d68ffc4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 4 08:10:23 2014 -0500 makepkg.8: remove superfluous "::" in envvar description Signed-off-by: Allan McRae <allan(a)archlinux.org> commit de442b6867b9f21c3a01a6c03339cf86812944a8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 4 08:10:22 2014 -0500 bash_completion: add --noarchive to makepkg's completions Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 167a598265b9f81f5afc71380c4f6b871caeb76b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 4 08:10:21 2014 -0500 updpkgsums: avoid exec'ing awk, so the trap actually works Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 8 +- contrib/updpkgsums.sh.in | 2 +- contrib/zsh_completion.in | 3 + doc/makepkg.8.txt | 2 +- scripts/makepkg.sh.in | 214 ++++++++++++++++++++++++++++++++++----------- src/pacman/pacman.c | 2 + 6 files changed, 173 insertions(+), 58 deletions(-) hooks/post-receive -- The official pacman repository

1 0