- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] New pactest: unresolvable001.py
by Nagy Gabor 17 May '10

17 May '10

To test the regression of commit a4084b91. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/unresolvable001.py | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/unresolvable001.py diff --git a/pactest/tests/unresolvable001.py b/pactest/tests/unresolvable001.py new file mode 100644 index 0000000..c98a4c0 --- /dev/null +++ b/pactest/tests/unresolvable001.py @@ -0,0 +1,21 @@ +self.description = "An unresolvable dependency" + +packageA1 = pmpkg("dep") +self.addpkg2db("local", packageA1) + +packageA1up = pmpkg("dep", "2.0-1") +packageA1up.depends = ["fake"]; +self.addpkg2db("sync", packageA1up) + +packageA2up = pmpkg("package") +packageA2up.depends = ["dep"]; +self.addpkg2db("sync", packageA2up) + +self.args = "-S package dep --ask=32" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=package") +self.addrule("PKG_EXIST=dep") +self.addrule("PKG_VERSION=dep|1.0-1") + +self.expectfailure = True -- 1.7.1

3 3

[pacman-dev] [PATCH] Partial fix for the phonon/qt issue
by Nagy Gabor 17 May '10

17 May '10

This patch fixes the phonon/qt issue, if all to-be-upgraded packages are explicit targets (ie. only not-yet-installed packages are pulled by resolvedeps). This condition covers the most common situations, for example it should hold with every -Su operation. After this patch sync405.py passes, but sync406.py doesn't. The work is inspired by the patch of Henning Garus, thanks for his work: http://mailman.archlinux.org/pipermail/pacman-dev/2010-February/010429.html (I moved the alpm_list_diff computation to sync.c in order to compute it only once.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 10 +++------- lib/libalpm/deps.h | 2 +- lib/libalpm/sync.c | 6 +++++- pactest/tests/sync405.py | 2 -- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 7dc734d..26f9b16 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -578,7 +578,7 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, /* Computes resolvable dependencies for a given package and adds that package * and those resolvable dependencies to a list. * - * @param local is the local database + * @param localpkgs is the list of local packages * @param dbs_sync are the sync databases * @param pkg is the package to resolve * @param packages is a pointer to a list of packages which will be @@ -594,7 +594,7 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, * unresolvable dependency, in which case the [*packages] list will be * unmodified by this function */ -int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, +int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, alpm_list_t **data) { @@ -605,10 +605,6 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, ALPM_LOG_FUNC; - if(local == NULL) { - return(-1); - } - if(_alpm_pkg_find(*packages, pkg->name) != NULL) { return(0); } @@ -624,7 +620,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, for(i = alpm_list_last(*packages); i; i = i->next) { pmpkg_t *tpkg = i->data; targ = alpm_list_add(NULL, tpkg); - deps = alpm_checkdeps(_alpm_db_get_pkgcache(local), 0, remove, targ); + deps = alpm_checkdeps(localpkgs, 0, remove, targ); alpm_list_free(targ); for(j = deps; j; j = j->next) { pmdepmissing_t *miss = j->data; diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 6681c59..ffc3aee 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -49,7 +49,7 @@ void _alpm_depmiss_free(pmdepmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse); void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, int prompt); -int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, +int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, alpm_list_t **data); int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 6b625ed..be36941 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -431,17 +431,21 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } } + /* Compute the fake local database for resolvedeps (partial fix for the phonon/qt issue) */ + alpm_list_t *localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(db_local), trans->add, _alpm_pkg_cmp); + /* Resolve packages in the transaction one at a time, in addtion building up a list of packages which could not be resolved. */ for(i = trans->add; i; i = i->next) { pmpkg_t *pkg = i->data; - if(_alpm_resolvedeps(db_local, dbs_sync, pkg, trans->add, + if(_alpm_resolvedeps(localpkgs, dbs_sync, pkg, trans->add, &resolved, remove, data) == -1) { unresolvable = alpm_list_add(unresolvable, pkg); } /* Else, [resolved] now additionally contains [pkg] and all of its dependencies not already on the list */ } + alpm_list_free(localpkgs); /* If there were unresolvable top-level packages, prompt the user to see if they'd like to ignore them rather than failing the sync */ diff --git a/pactest/tests/sync405.py b/pactest/tests/sync405.py index d170cec..941a1af 100644 --- a/pactest/tests/sync405.py +++ b/pactest/tests/sync405.py @@ -22,5 +22,3 @@ self.addrule("PKG_EXIST=qt") self.addrule("PKG_EXIST=phonon") self.addrule("PKG_VERSION=qt|4.6.1-1") - -self.expectfailure = True -- 1.7.1

3 5

[pacman-dev] [PATCH] makepkg: Always resolve dependencies When --syncdeps is explicitly passed
by Nezmer 17 May '10

17 May '10

This change makes sense for me in general. The use-case I ran into was needing the dependencies when repackaging. Signed-off-by: Nezmer <git(a)nezmer.info> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a2db90b..34261b5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1867,7 +1867,7 @@ if (( SOURCEONLY )); then fi # fix flyspray bug #5973 -if (( NODEPS || NOBUILD || REPKG )); then +if (( (NODEPS || NOBUILD || REPKG) && ! DEP_BIN )); then # no warning message needed for nobuild, repkg if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" -- 1.7.0.4

3 3

[pacman-dev] [PATCH] redirect scriptlet stderr through alpm
by Jonathan Conder 17 May '10

17 May '10

Fixes FS#18770, and hopefully an occasional deadlock in my frontend as well. This introduces a new EVENT: PM_TRANS_EVT_SCRIPTLET_ERROR, and moves all scriptlet-related callbacks into the parent process. I modelled my work on the GLib function g_spawn_sync, but I am quite unfamiliar with POSIX so there could be some issues with the implementation. However, all the tests I have performed so far (against v3.3.3) seemed to work fine (even the kernel installed and gave me the right warnings). This patch might also make it easier to configure the shell used for install scriptlets. I'm not 100% happy with the code structure at the moment, so any suggestions would be welcome. Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> --- lib/libalpm/alpm.h | 4 + lib/libalpm/util.c | 162 ++++++++++++++++++++++++++++++++++++++----------- src/pacman/callback.c | 3 + 3 files changed, 133 insertions(+), 36 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 3329132..2692777 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -364,6 +364,10 @@ typedef enum _pmtransevt_t { * A line of text is passed to the callback. */ PM_TRANS_EVT_SCRIPTLET_INFO, + /** Scriptlet has printed information to stderr. + * A line of text is passed to the callback. + */ + PM_TRANS_EVT_SCRIPTLET_ERROR, /** Files will be downloaded from a repository. * The repository's tree name is passed to the callback. */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 32eaa44..1f76372 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -444,10 +444,52 @@ int _alpm_logaction(int usesyslog, FILE *f, const char *fmt, va_list args) return(ret); } +static int _fddup2(int fds[2], int i, int fd) +{ + while(dup2(fds[i], fd) == -1) { + if(errno != EINTR) { + return(-1); + } + } + return(0); +} + +static int _fdselect(int fdout, int fderr, fd_set *fds) +{ + int nfds = -1; + FD_ZERO(fds); + + if(fdout >= 0) { + FD_SET(fdout, fds); + if(fdout > nfds) { + nfds = fdout; + } + } + if(fderr >= 0) { + FD_SET(fderr, fds); + if(fderr > nfds) { + nfds = fderr; + } + } + if(++nfds == 0) { + return(2); + } + + if(select(nfds, fds, NULL, NULL, NULL) == -1) { + if(errno == EINTR) { + FD_ZERO(fds); + } else { + return(1); + } + } + return(0); +} + int _alpm_run_chroot(const char *root, const char *cmd) { char cwd[PATH_MAX]; pid_t pid; + int fdout[2], fderr[2]; int restore_cwd = 0; int retval = 0; @@ -471,6 +513,13 @@ int _alpm_run_chroot(const char *root, const char *cmd) /* Flush open fds before fork() to avoid cloning buffers */ fflush(NULL); + /* Create pipes to redirect stderr and stdout */ + if(pipe(fdout) == -1 || pipe(fderr) == -1) { + _alpm_log(PM_LOG_ERROR, _("could not create a pipe (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; + } + /* fork- parent and child each have seperate code blocks below */ pid = fork(); if(pid == -1) { @@ -480,56 +529,97 @@ int _alpm_run_chroot(const char *root, const char *cmd) } if(pid == 0) { - FILE *pipe; /* this code runs for the child only (the actual chroot/exec) */ - _alpm_log(PM_LOG_DEBUG, "chrooting in %s\n", root); + close(fdout[0]); + close(fderr[0]); + + /* redirect standard output and error */ + _fddup2(fdout, 1, 1); + _fddup2(fderr, 1, 2); + close(fdout[1]); + close(fderr[1]); + if(chroot(root) != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change the root directory (%s)\n"), - strerror(errno)); + fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno)); exit(1); } + if(chdir("/") != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change directory to / (%s)\n"), - strerror(errno)); + fprintf(stderr, _("could not change directory to / (%s)\n"), strerror(errno)); exit(1); } + + /* run the scriptlet and exit */ umask(0022); - pipe = popen(cmd, "r"); - if(!pipe) { - _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)\n"), - strerror(errno)); - exit(1); - } - while(!feof(pipe)) { - char line[PATH_MAX]; - if(fgets(line, PATH_MAX, pipe) == NULL) - break; - alpm_logaction("%s", line); - EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); - } - retval = pclose(pipe); - exit(WEXITSTATUS(retval)); + execl("/bin/sh", "sh", "-c", cmd, (char *) NULL); + fprintf(stderr, _("call to execl failed (%s)\n"), strerror(errno)); + exit(1); } else { - /* this code runs for the parent only (wait on the child) */ - pid_t retpid; + /* this code runs for the parent only (process output from the child) */ + fd_set fds; + FILE *fout, *ferr; int status; - do { - retpid = waitpid(pid, &status, 0); - } while(retpid == -1 && errno == EINTR); - if(retpid == -1) { - _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), - strerror(errno)); + + close(fdout[1]); + close(fderr[1]); + + /* use buffered streams to read line by line */ + if((fout = fdopen(fdout[0], "r")) == NULL || (ferr = fdopen(fderr[0], "r")) == NULL) { retval = 1; - goto cleanup; + close(fdout[0]); + close(fderr[0]); } else { - /* check the return status, make sure it is 0 (success) */ - if(WIFEXITED(status)) { - _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); - if(WEXITSTATUS(status) != 0) { - _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); - retval = 1; + while((retval = _fdselect(fdout[0], fderr[0], &fds)) == 0) { + char line[PATH_MAX]; + + if(FD_ISSET(fdout[0], &fds)) { + if(fgets(line, PATH_MAX, fout) != NULL) { + alpm_logaction("%s", line); + EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); + } else { + fdout[0] = -1; + } + } + + if(FD_ISSET(fderr[0], &fds)) { + if(fgets(line, PATH_MAX, ferr) != NULL) { + alpm_logaction("%s", line); + EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_ERROR, line, NULL); + } else { + fderr[0] = -1; + } } } + + fclose(fout); + fclose(ferr); + } + + while(waitpid(pid, &status, 0) == -1) { + if (errno != EINTR) { + _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), + strerror(errno)); + retval = 1; + goto cleanup; + } + } + + /* report error from above after the child has exited */ + if(retval == 1) { + _alpm_log(PM_LOG_ERROR, _("could not read from pipe (%s)\n"), + strerror(errno)); + goto cleanup; + } else { + retval = 0; + } + + /* check the return status, make sure it is 0 (success) */ + if(WIFEXITED(status)) { + _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); + if(WEXITSTATUS(status) != 0) { + _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); + retval = 1; + } } } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index f5bf17d..a33178e 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -226,6 +226,9 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) case PM_TRANS_EVT_SCRIPTLET_INFO: printf("%s", (char*)data1); break; + case PM_TRANS_EVT_SCRIPTLET_ERROR: + fprintf(stderr, "%s", (char*)data1); + break; case PM_TRANS_EVT_RETRIEVE_START: printf(_(":: Retrieving packages from %s...\n"), (char*)data1); break; -- 1.7.1

2 4

[pacman-dev] [PATCH] fix for incorrect checking of return code, which causes syntax errors
by Dieter Plaetinck 16 May '10

16 May '10

--- 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 e8aaa8b..9741879 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -693,10 +693,10 @@ extract_sources() { local ret=0 msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" if [[ $cmd = bsdtar ]]; then - $cmd -xf "$file" || ret=? + $cmd -xf "$file" || ret=$? else rm -f "${file%.*}" - $cmd -dcf "$file" > "${file%.*}" || ret=? + $cmd -dcf "$file" > "${file%.*}" || ret=$? fi if (( ret )); then error "$(gettext "Failed to extract %s")" "$file" -- 1.7.1

3 4

[pacman-dev] [PATCH] Fix a serious bug in the download code
by Nagy Gabor 15 May '10

15 May '10

After commit df99495b82 pacman downloaded files from the first repo only, and reported corrupted packages for all files from other repos. The download_size was set to 0 for _all_ transaction packages after downloading some files from the first repo. This code-block was moved to its correct place. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/sync.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 6bc0b37..6b625ed 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -857,12 +857,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) EVENT(trans, PM_TRANS_EVT_RETRIEVE_START, current->treename, NULL); errors = _alpm_download_files(files, current->servers, cachedir); - for(j = trans->add; j; j = j->next) { - pmpkg_t *pkg = j->data; - pkg->infolevel &= ~INFRQ_DSIZE; - pkg->download_size = 0; - } - if (errors) { _alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"), current->treename); @@ -875,6 +869,12 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) } } + for(j = trans->add; j; j = j->next) { + pmpkg_t *pkg = j->data; + pkg->infolevel &= ~INFRQ_DSIZE; + pkg->download_size = 0; + } + /* clear out value to let callback know we are done */ if(handle->totaldlcb) { handle->totaldlcb(0); -- 1.7.1

3 2

[pacman-dev] [PATCH] rankmirrors: Add a --repo option to target a specific repo
by Daenyth 15 May '10

15 May '10

Signed-off-by: Daenyth <Daenyth+Arch(a)gmail.com> --- scripts/rankmirrors.sh.in | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index d5cbadd..9b4e973 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -35,6 +35,7 @@ usage() { echo " -t, --times only output mirrors and their response times" echo " -u, --url test a specific url" echo " -v, --verbose be verbose in ouptut" + echo " -r, --repo specify a specific repo name instead of guessing" exit 0 } @@ -69,13 +70,18 @@ ARCH="$(uname -m)" getfetchurl() { local strippedurl="${1%/}" - local replacedurl="${strippedurl//'$repo'/core}" - replacedurl="${replacedurl//'$arch'/$ARCH}" + local replacedurl="${replacedurl//'$arch'/$ARCH}" + if [[ ! $TARGETREPO ]]; then + replacedurl="${strippedurl//'$repo'/core}" + local tmp="${replacedurl%/*}" + tmp="${tmp%/*}" - local tmp="${replacedurl%/*}" - tmp="${tmp%/*}" + local reponame="${tmp##*/}" + else + replacedurl="${strippedurl//'$repo'/$TARGETREPO}" + local reponame="$TARGETREPO" + fi - local reponame="${tmp##*/}" if [[ -z $reponame || $reponame = $replacedurl ]]; then echo "fail" else @@ -119,6 +125,7 @@ while [[ $1 ]]; do times) TIMESONLY=1 ; shift ;; verbose) VERBOSE=1 ; shift ;; url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; + repo) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; shift 2;; *) err "\`$1' is an invalid argument." esac elif [[ ${1:0:1} = - ]]; then @@ -136,6 +143,7 @@ while [[ $1 ]]; do t) TIMESONLY=1 ;; v) VERBOSE=1 ;; u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; + r) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; snum=2;; n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; *) err "\`-$1' is an invald argument." ;; esac @@ -182,6 +190,7 @@ for line in "${linearray[@]}"; do # Getting values and times and such server="${line#*= }" + server="${server%%#*}" url="$(getfetchurl "$server")" [[ $url = fail ]] && err "url \`$URL' is malformed." time=$(gettime "$url") -- 1.7.1

1 0

[pacman-dev] NEWS for 3.4.0 - very, very draft
by Allan McRae 15 May '10

15 May '10

A very draft NEWS item based on "git shortlog --no-merges master --not v3.3.0". May be a bit makepkg-centric, but numbers of patches for makepkg is quite high this time and many pacman patches are the "not-newsworthy" type... Anyway, cut/add entries and I can flash it out some more. pacman: -D --database option show required by in -Sii output Architecture --arch option / check package arch / $arch --print/--print-format only extract new DB entiries -Su foo util: deltacleanup rankmirror -> bash repo-add - can create "empty" repo when removing last package makepkg: new packaging variable - changelog Allow overriding pkgver, pkgrel, arch in split packages Can specify subsets of packages to build from a split package warn about references to build root in package deprecate repackaging without a package function can only use package() function strip options are configurable auto abort on any packaging error SRCPKGDEST --skipinteg syntax checking for backup and optdepends entries contrib: pactree - reverse tree

5 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-179-g25cd6c2
by dan＠archlinux.org 15 May '10

15 May '10

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 25cd6c2e8da4d0659d259a38f00d512f97dbc962 (commit) from f03f09011f878ad0b3aea05602a1cb0a11d839e1 (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 25cd6c2e8da4d0659d259a38f00d512f97dbc962 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri May 14 21:58:31 2010 +0200 Fix a serious bug in the download code After commit df99495b82 pacman downloaded files from the first repo only, and reported corrupted packages for all files from other repos. The download_size was set to 0 for _all_ transaction packages after downloading some files from the first repo. This code-block was moved to its correct place. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-178-gf03f090
by dan＠archlinux.org 14 May '10

14 May '10

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 f03f09011f878ad0b3aea05602a1cb0a11d839e1 (commit) via 10b0acfc20589abd92b5d7517529c92e48cfcc7c (commit) via 07b2ba251f7956b887f00dadc0e2cff91777326b (commit) via df833f6c64033bc4e00e47213a536219bc1611b4 (commit) from 7f02f7cb9fba13a8e9762d30d7e0648b257ec091 (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 f03f09011f878ad0b3aea05602a1cb0a11d839e1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 13 18:11:50 2010 -0500 doc: fix up description of where example PKGBUILD is located As Allan pointed out, this actually ships with pacman (at least with Arch) and not necessarily with ABS or any other package. Also fix the language dealing with the prototype install files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 10b0acfc20589abd92b5d7517529c92e48cfcc7c Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 13 17:46:30 2010 -0500 PKGBUILD.vim: only allow hex characters in checksums Of course, we still have only md5 and sha1 hardcoded here but I resisted the urge to copy paste for the rest of our supported checksums in hope that someone knows how to do it a better way. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07b2ba251f7956b887f00dadc0e2cff91777326b Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 13 17:26:54 2010 -0500 Add 'pkgbase' highlighting to vim syntax file Simple change and probably a bit too copy/paste, but works for now. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit df833f6c64033bc4e00e47213a536219bc1611b4 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Thu May 13 14:36:59 2010 +0200 PKGBUILD.vim : update valid licenses Updated list with : echo $(pacman -Ql licenses | grep "/usr/share/licenses/common/.*/$" | cut -d'/' -f6 ) Maybe PKGBUILD.vim could do this at runtime ? Dan: you forgot the symlinks; readded FDL, GPL, LGPL. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD-split.proto | 2 +- contrib/PKGBUILD.vim | 21 +++++++++++++++------ doc/Makefile.am | 3 +++ doc/PKGBUILD.5.txt | 15 ++++++--------- 4 files changed, 25 insertions(+), 16 deletions(-) hooks/post-receive -- The official pacman repository

1 0