- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Place packages symlinks in build dir when DESTDIR is used
by Eric Bélanger 06 Nov '09

06 Nov '09

When DESTDIR is used, symlinks to the packages will be put in the build directory. This combines the convenience of a global package cache with the ease of having a package (i.e. a symlink) in the build directory for testing and installation purpose. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 92b0454..dc9124b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1000,6 +1000,8 @@ create_package() { "$PKGEXT" ; EXT=$PKGEXT ;; esac local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${EXT}" + local pkglinks_name="${startdir}/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" + local pkglinks_target="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" local ret=0 @@ -1018,6 +1020,10 @@ create_package() { ret=$? fi + if [ $ret -eq 0 ]; then + [ ! -f "${pkglinks_name}" ] && ln -s "${pkglinks_target}" "${pkglinks_name}" && ret=$? + fi + if [ $ret -ne 0 ]; then error "$(gettext "Failed to create package file.")" exit 1 # TODO: error code -- 1.6.5.2

7 30

[pacman-dev] [PATCH 2/2] makepkg: Fixed logging for split packages
by Eric Bélanger 04 Nov '09

04 Nov '09

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e2b28c1..180e128 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -142,7 +142,7 @@ clean_up() { rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* elif [ "$SPLITPKG" -eq 1 ]; then for pkg in ${pkgname[@]}; do - rm -f "${pkg}-${pkgver}-${pkgrel}-${CARCH}-package.log"* + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package_${pkg}.log"* done fi fi @@ -707,6 +707,8 @@ run_function() { msg "$(gettext "Starting %s()...")" "$pkgfunc" cd "$srcdir" + local _pkgbase=$pkgbase + # ensure all necessary build variables are exported export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST # save our shell options so pkgfunc() can't override what we need @@ -714,7 +716,7 @@ run_function() { local ret=0 if [ "$LOGGING" -eq 1 ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-$pkgfunc.log" + BUILDLOG="${startdir}/${_pkgbase}-${pkgver}-${pkgrel}-${CARCH}-$pkgfunc.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do -- 1.6.5.2

2 3

[pacman-dev] gnupg package signing
by Xavier 02 Nov '09

02 Nov '09

Just to let you know that I resurrected the gpg branch there : http://code.toofishes.net/cgit/xavier/pacman.git/log/?h=gpg I took Dan's newgpg branch (with a few changes) : http://code.toofishes.net/cgit/dan/pacman.git/commit/?h=newgpg then merged the pending patches we had : http://archlinux.org/pipermail/pacman-dev/2008-December/007808.html http://archlinux.org/pipermail/pacman-dev/2008-December/007836.html http://archlinux.org/pipermail/pacman-dev/2008-December/007837.html and rebased it all on master. Actually I don't see what else needs to be done on the implementation side, it looks almost complete to me. Now the big remaining problem is everything related to key administration still needs to be figured out, and this is critical in term of security. But it might not need additional tool support.

3 7

[pacman-dev] [PATCH] makepkg: extend test for hyphen prefixes to pkgbase and all pkgnames
by Cedric Staniewski 01 Nov '09

01 Nov '09

Since commit fb97d32, which brought in this test, support for split PKGBUILDs was added, and therefore, all values of pkgname and also pkgbase have to be checked now. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- Last patch before the big freeze... scripts/makepkg.sh.in | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9cd7f2e..c451a36 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1139,8 +1139,8 @@ check_sanity() { error "$(gettext "%s is not allowed to be empty.")" "pkgrel" return 1 fi - if [ "${pkgname:0:1}" == "-" ]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" + if [[ ${pkgbase:0:1} = "-" ]]; then + error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgbase" return 1 fi if [ "$pkgver" != "${pkgver//-/}" ]; then @@ -1152,6 +1152,14 @@ check_sanity() { return 1 fi + local name + for name in "${pkgname[@]}"; do + if [[ ${name:0:1} = "-" ]]; then + error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" + return 1 + fi + done + if [ "$arch" != 'any' ]; then if ! in_array $CARCH ${arch[@]}; then if [ "$IGNOREARCH" -eq 0 ]; then -- 1.6.5.1

2 6

[pacman-dev] [PATCH 3/3] Remove rmrf function from frontend
by Laszlo Papp 28 Oct '09

28 Oct '09

* The alpm_rmrf function is available from the frontend, which does the same as this function did. * It was worth to modify _alpm_rmrf to alpm_rmrf for pacman frontend to be able to use it in the future or for other frontend, so the function declaration was moved into the api header file, named alpm.h, and the definition of this function got a SYMEXPORT attribute. * The rmrf funtion calling was changed in ./src/pacman/sync.c for alpm_rmrf * The _alpm_rmrf functions were changed in api for alpm_rmrf Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- lib/libalpm/alpm.h | 3 +++ lib/libalpm/be_files.c | 4 ++-- lib/libalpm/dload.c | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 4 ++-- lib/libalpm/util.h | 1 - src/pacman/sync.c | 2 +- src/pacman/util.c | 43 ------------------------------------------- src/pacman/util.h | 1 - 9 files changed, 10 insertions(+), 52 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c433b73..666a84f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -467,6 +467,9 @@ const char *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict); /* checksums */ char *alpm_compute_md5sum(const char *name); +/* does the same thing as 'rm -rf' */ +int alpm_rmrf(const char *path); + /* * Errors */ diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index ffbaa8d..70625ed 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -230,7 +230,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) } else { const char *syncdbpath = _alpm_db_path(db); /* remove the old dir */ - if(_alpm_rmrf(syncdbpath) != 0) { + if(alpm_rmrf(syncdbpath) != 0) { _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); RET_ERR(PM_ERR_DB_REMOVE, -1); } @@ -919,7 +919,7 @@ int _alpm_db_remove(pmdb_t *db, pmpkg_t *info) pkgpath = get_pkgpath(db, info); - ret = _alpm_rmrf(pkgpath); + ret = alpm_rmrf(pkgpath); free(pkgpath); if(ret != 0) { ret = -1; diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a4c9f1f..218a87b 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -182,7 +182,7 @@ static int download_internal(const char *url, const char *localpath, } if(localf == NULL) { - _alpm_rmrf(tempfile); + alpm_rmrf(tempfile); fileurl->offset = (off_t)0; dl_thisfile = 0; localf = fopen(tempfile, "wb"); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index aea71db..3eac9b0 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -401,7 +401,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, retval = _alpm_run_chroot(root, cmdline); cleanup: - if(clean_tmpdir && _alpm_rmrf(tmpdir)) { + if(clean_tmpdir && alpm_rmrf(tmpdir)) { _alpm_log(PM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir); } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index ad3dc2c..6b0cf34 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -370,7 +370,7 @@ cleanup: } /* does the same thing as 'rm -rf' */ -int _alpm_rmrf(const char *path) +int SYMEXPORT alpm_rmrf(const char *path) { int errflag = 0; struct dirent *dp; @@ -397,7 +397,7 @@ int _alpm_rmrf(const char *path) if(dp->d_ino) { sprintf(name, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { - errflag += _alpm_rmrf(name); + errflag += alpm_rmrf(name); } } } diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 37893c8..2e783c3 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -66,7 +66,6 @@ int _alpm_lckmk(); int _alpm_lckrm(); int _alpm_unpack_single(const char *archive, const char *prefix, const char *fn); int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); -int _alpm_rmrf(const char *path); int _alpm_logaction(int usesyslog, FILE *f, const char *fmt, va_list args); int _alpm_run_chroot(const char *root, const char *cmd); int _alpm_ldconfig(const char *root); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index a2ef616..0164ca9 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -90,7 +90,7 @@ static int sync_cleandb(const char *dbpath, int keep_used) { continue; } - if(rmrf(path)) { + if(alpm_rmrf(path)) { pm_fprintf(stderr, PM_LOG_ERROR, _("could not remove repository directory\n")); closedir(dir); diff --git a/src/pacman/util.c b/src/pacman/util.c index e3dbfbb..9adc0e5 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -99,49 +99,6 @@ int getcols(void) return 0; } -/* does the same thing as 'rm -rf' */ -int rmrf(const char *path) -{ - int errflag = 0; - struct dirent *dp; - DIR *dirp; - - if(!unlink(path)) { - return(0); - } else { - if(errno == ENOENT) { - return(0); - } else if(errno == EPERM) { - /* fallthrough */ - } else if(errno == EISDIR) { - /* fallthrough */ - } else if(errno == ENOTDIR) { - return(1); - } else { - /* not a directory */ - return(1); - } - - if((dirp = opendir(path)) == NULL) { - return(PM_ERR_NOT_A_DIR); - } - for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { - if(dp->d_ino) { - char name[PATH_MAX]; - sprintf(name, "%s/%s", path, dp->d_name); - if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { - errflag += rmrf(name); - } - } - } - closedir(dirp); - if(rmdir(path)) { - errflag++; - } - return(errflag); - } -} - /** Parse the basename of a program from a path. * Grabbed from the uClibc source. * @param path path to parse basename from diff --git a/src/pacman/util.h b/src/pacman/util.h index 7a8c39d..30e5996 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -41,7 +41,6 @@ int trans_init(pmtransflag_t flags); int trans_release(void); int needs_root(void); int getcols(void); -int rmrf(const char *path); char *mbasename(const char *path); char *mdirname(const char *path); void indentprint(const char *str, int indent); -- 1.6.5

6 10

[pacman-dev] [PATCH] makepkg: Add fallback to package function
by Allan McRae 28 Oct '09

28 Oct '09

makepkg looks for a package() function when building a single package but package_$pkgname() style package functions when building a split package. This patch allows the use of a package_$pkgname() function when building a single package for consistency. This is achieved by having makepkg consider a non-split package with a package_$pkgname() function as a split package (creating just the one package). Fixes FS#16622. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dd5f951..a576c52 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1742,10 +1742,6 @@ if [ "$GENINTEG" -eq 1 ]; then exit 0 # $E_OK fi -if [ "$(type -t package)" = "function" ]; then - PKGFUNC=1 -fi - # check the PKGBUILD for some basic requirements check_sanity || exit 1 @@ -1760,6 +1756,12 @@ if [ "${#pkgname[@]}" -gt "1" ]; then SPLITPKG=1 fi +if [ "$(type -t package)" = "function" ]; then + PKGFUNC=1 +elif [ $SPLITPKG -eq 0 -a "$(type -t package_${pkgname})" = "function" ]; then + SPLITPKG=1 +fi + pkgbase=${pkgbase:-${pkgname[0]}} if [ -n "${PKGLIST[@]}" ]; then -- 1.6.5.1

2 1

[pacman-dev] [PATCH 2/2] Fix some errors that cppcheck gave back
by Laszlo Papp 28 Oct '09

28 Oct '09

Fix some warning that cppcheck gave back * opendir(path)) == (DIR *)-1 is maybe the result of miss understanding of the man page, if the opendir wasn't successful it gives back NULL instead of '(DIR *)-1'. * return(PM_ERR_NOT_A_DIR); was established instead of hard coding numbers for return statement. * The ambiguity while cycle with EINTR condition was refactored for a do {} while () cycle to be easier to read/understand Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- lib/libalpm/util.c | 11 ++++++----- src/pacman/util.c | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d910809..ad3dc2c 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -212,8 +212,9 @@ int _alpm_lckmk() _alpm_makepath(dir); FREE(dir); - while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 - && errno == EINTR); + do { + fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000); + } while(fd == -1 && errno == EINTR); if(fd > 0) { FILE *f = fdopen(fd, "w"); fprintf(f, "%ld\n", (long)getpid()); @@ -315,7 +316,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int st = archive_entry_stat(entry); entryname = archive_entry_pathname(entry); - + if(S_ISREG(st->st_mode)) { archive_entry_set_perm(entry, 0644); } else if(S_ISDIR(st->st_mode)) { @@ -389,8 +390,8 @@ int _alpm_rmrf(const char *path) } } } else { - if((dirp = opendir(path)) == (DIR *)-1) { - return(1); + if((dirp = opendir(path)) == NULL) { + return(PM_ERR_NOT_A_DIR); } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 1143bef..e3dbfbb 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -122,8 +122,8 @@ int rmrf(const char *path) return(1); } - if((dirp = opendir(path)) == (DIR *)-1) { - return(1); + if((dirp = opendir(path)) == NULL) { + return(PM_ERR_NOT_A_DIR); } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { -- 1.6.5

4 8

[pacman-dev] About makepkg dlagents
by Ciprian Dorin, Craciun 27 Oct '09

27 Oct '09

About download-agents for makepkg. (This is why I've bothered the developers of pacman this morning with compilation issues... :)) So I wanted to be able to make PKGBUILD and makepkg extract sources for Git repositories. And after asking on the arch-general, I was pointed to the following bug: http://bugs.archlinux.org/task/7816 As a consequence I've started hacking and commed up with the following patches (put at the end). (I've ended up with four pathes from git format-patch... Should I put only the diff between maint branch and my branch?) Also below is the description on the bug-tracker: ~~~~ I've made some hacking staring from pacman Git repository. My work is available at (branch patches/git-dlagent): http://gitorious.org/~ciprian.craciun/pacman/ciprian-craciun-patches In summary: * added a script: /usr/bin/git-dlagent that takes exactly two arguments: URL and output. * updated /etc/makepkg.conf to include the following URL's: git://, git+file://, git+http://, git+https://, git+ssh://, git+rsync; * a Git url looks-like: git+git://projects.archlinux.org/pacman.git#master##pacman.tar where: * what is before the first `#` is the URL used to (maybe) clone the Git repository. * what is after the first `#` and before `##` is the refspec (head / tag / etc.) to export; * what is after `##` (optional this part is) it can be used to make the file-part of the URL look like a tar file; How git-dlagent it works: * in case git+file:// is given `git --git-dir=... archive` is done; * else it tries to do `git archive --remote=...`; (usually this doesn't work unless the repository is git and the barkend is enabled); * but anyway it fallbacks to `git clone ...`, and then a local git archive; ~~~~ (My approach just uses the Git / SVN / etc tools to create a .tar or .zip file, and leave the rest up to makepkg. I've also patched makepkg to ignore those hashes that are equal to `--`.) ~~~~ I would say it integrated prety nice with the whole makepkg, and also does not impact the source code by much. An example of an URL used in PKGBUILD would be the following: git+file:///stores/erebus-1/ciprian/workbench/pacman/.git#patches/master##/$pkgname-$pkgver.tar git://projects.archlinux.org/pacman.git#maint#/pacman-v3.3.2.tar Is anyone interested in adopting this patch? Any comments? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >From c08594be518814646f7e9d9224a0068e9e4d6f34 Mon Sep 17 00:00:00 2001 From: Ciprian Dorin, Craciun <ciprian(a)volution.ro> Date: Mon, 19 Oct 2009 22:53:06 +0300 Subject: [PATCH 1/4] Added option to ignore a source integrity hash. (We just replace the hash with `--`.) Added makepkg download-agent for git. (git-dlagent.bash) --- scripts/git-dlagent.sh.in | 78 +++++++++++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 14 +++++--- 2 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 scripts/git-dlagent.sh.in diff --git a/scripts/git-dlagent.sh.in b/scripts/git-dlagent.sh.in new file mode 100644 index 0000000..a2240a7 --- /dev/null +++ b/scripts/git-dlagent.sh.in @@ -0,0 +1,78 @@ +#!/bin/bash + +set -e -u -o pipefail || exit 1 +test "${#}" -eq 2 + +uri="${1}" +output="${2}" + +git_archive_method=unknown + + +if [[ "${uri}" =~ ^git://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +then + uri="${uri/%##*}" + reference="${uri/#*#}" + uri="${uri/%#*}" + + git_archive_method=remote + +elif [[ "${uri}" =~ ^(git\+)?file:///[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +then + uri="${uri/%##*}" + reference="${uri/#*#}" + uri="${uri/%#*}" + uri="${uri/#git+file:\/\/}" + + git_archive_method=local + +elif [[ "${uri}" =~ ^(git\+)?(ssh|http|https|rsync)://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +then + uri="${uri/%##*}" + reference="${uri/#*#}" + uri="${uri/%#*}" + uri="${uri/#git+}" + + git_archive_method=remote + +else + echo "[ee] \`${uri}\` is not a Git URI." >&2 + exit 1 +fi + + +case "${git_archive_method}" in + + ( local ) + + git --git-dir="${uri}" archive --format=tar --output="${output}" "${reference}" + + exit 0 + ;; + + ( remote ) + + git archive --format=tar --output="${output}" --remote="${uri}" "${reference}" \ + && exit 0 + + echo "[ww] \`${uri}\` does not support git-archive; going after clone." >&2 + + clone="$( mktemp -d )" + + git clone --bare "${uri}" "${clone}" + + git --git-dir="${clone}" archive --format=tar --output="${output}" "${reference}" + + find "${clone}" -delete + + exit 0 + ;; + + ( * ) + echo "[ee] unknown git-archive-method." >&2 + exit 1 + ;; + +esac + +exit 1 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3662228..3cdf2aa 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -591,12 +591,16 @@ check_checksums() { if [ $found -gt 0 ] ; then local expectedsum="$(echo ${integrity_sums[$idx]} | tr '[A-F]' '[a-f]')" - local realsum="$(openssl dgst -${integ} "$file" | awk '{print $NF}')" - if [ "$expectedsum" = "$realsum" ]; then - echo "$(gettext "Passed")" >&2 + if [ "$expectedsum" = '--' ]; then + echo "$(gettext "Skipped")" >&2 else - echo "$(gettext "FAILED")" >&2 - errors=1 + local realsum="$(openssl dgst -${integ} "$file" | awk '{print $NF}')" + if [ "$expectedsum" = "$realsum" ]; then + echo "$(gettext "Passed")" >&2 + else + echo "$(gettext "FAILED")" >&2 + errors=1 + fi fi fi -- 1.6.3.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >From 47c0d7fef2eefa69081c809dd285fa2fcf88eb36 Mon Sep 17 00:00:00 2001 From: Ciprian Dorin, Craciun <ciprian(a)volution.ro> Date: Mon, 19 Oct 2009 22:57:53 +0300 Subject: [PATCH 2/4] Integrated git-dlagent into the build system. --- etc/makepkg.conf.in | 8 +++++++- scripts/Makefile.am | 7 +++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1368ff1..29f6e4e 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -12,7 +12,13 @@ DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' 'rsync::/usr/bin/rsync -z %u %o' - 'scp::/usr/bin/scp -C %u %o') + 'scp::/usr/bin/scp -C %u %o' + 'git::/usr/bin/git-dlagent %u %o' + 'git+file::/usr/bin/git-dlagent %u %o' + 'git+http::/usr/bin/git-dlagent %u %o' + 'git+https::/usr/bin/git-dlagent %u %o' + 'git+ssh::/usr/bin/git-dlagent %u %o' + 'git+rsync::/usr/bin/git-dlagent %u %o') # Other common tools: # /usr/bin/snarf diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 5d65653..524710c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -10,14 +10,16 @@ OURSCRIPTS = \ pacman-optimize \ pkgdelta \ rankmirrors \ - repo-add + repo-add \ + git-dlagent EXTRA_DIST = \ makepkg.sh.in \ pacman-optimize.sh.in \ pkgdelta.sh.in \ rankmirrors.py.in \ - repo-add.sh.in + repo-add.sh.in \ + git-dlagent.sh.in # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp @@ -67,5 +69,6 @@ repo-add: $(srcdir)/repo-add.sh.in repo-remove: $(srcdir)/repo-add.sh.in rm -f repo-remove $(LN_S) repo-add repo-remove +git-dlagent: $(srcdir)/git-dlagent.sh.in # vim:set ts=2 sw=2 noet: -- 1.6.3.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >From 8fc53a663e7b7521133a05b8e28d9fd3f15efaea Mon Sep 17 00:00:00 2001 From: Ciprian Dorin, Craciun <ciprian(a)volution.ro> Date: Mon, 19 Oct 2009 23:48:51 +0300 Subject: [PATCH 3/4] Updated git-dlagent. git-archive is usable only for file:// or git:// or git+ssh:// repositories. --- scripts/git-dlagent.sh.in | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/scripts/git-dlagent.sh.in b/scripts/git-dlagent.sh.in index a2240a7..993c7b5 100644 --- a/scripts/git-dlagent.sh.in +++ b/scripts/git-dlagent.sh.in @@ -26,7 +26,7 @@ then git_archive_method=local -elif [[ "${uri}" =~ ^(git\+)?(ssh|http|https|rsync)://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +elif [[ "${uri}" =~ ^(git\+)?ssh://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] then uri="${uri/%##*}" reference="${uri/#*#}" @@ -35,6 +35,15 @@ then git_archive_method=remote +elif [[ "${uri}" =~ ^(git\+)?(http|https|rsync)://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +then + uri="${uri/%##*}" + reference="${uri/#*#}" + uri="${uri/%#*}" + uri="${uri/#git+}" + + git_archive_method=remote-force + else echo "[ee] \`${uri}\` is not a Git URI." >&2 exit 1 @@ -50,12 +59,14 @@ case "${git_archive_method}" in exit 0 ;; - ( remote ) - - git archive --format=tar --output="${output}" --remote="${uri}" "${reference}" \ - && exit 0 + ( remote | remote-force ) - echo "[ww] \`${uri}\` does not support git-archive; going after clone." >&2 + if test "${git_archive_method}" == remote + then + git archive --format=tar --output="${output}" --remote="${uri}" "${reference}" \ + && exit 0 + echo "[ww] \`${uri}\` does not support git-archive; going after clone." >&2 + fi clone="$( mktemp -d )" -- 1.6.3.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >From 31a684f8fc561d3b4ef6dc20ec05b6089e771bbd Mon Sep 17 00:00:00 2001 From: Ciprian Dorin, Craciun <ciprian(a)volution.ro> Date: Tue, 20 Oct 2009 09:03:23 +0300 Subject: [PATCH 4/4] Fixed git-dlagent (failure to work without the `git+` prefix). Modified the way the URL is interpretted: git+<url-part>#refspec##/<name>.tar And now the archive should contain a folder with the name <name>. (The `##/<name>.tar` is optional.) --- scripts/git-dlagent.sh.in | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/scripts/git-dlagent.sh.in b/scripts/git-dlagent.sh.in index 993c7b5..7b7ec24 100644 --- a/scripts/git-dlagent.sh.in +++ b/scripts/git-dlagent.sh.in @@ -9,25 +9,35 @@ output="${2}" git_archive_method=unknown -if [[ "${uri}" =~ ^git://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +if [[ "${uri}" =~ ^git://[^/#]+[^#]+#[^#]+(##/[a-zA-Z0-9_.-]+\.tar)?$ ]] then + + prefix="${uri/#*##\/}" + prefix="${prefix/%.tar}" uri="${uri/%##*}" reference="${uri/#*#}" uri="${uri/%#*}" git_archive_method=remote -elif [[ "${uri}" =~ ^(git\+)?file:///[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +elif [[ "${uri}" =~ ^(git\+)?file:///[^/#]+[^#]+#[^#]+(##/[a-zA-Z0-9_.-]+\.tar)?$ ]] then + + prefix="${uri/#*##\/}" + prefix="${prefix/%.tar}" uri="${uri/%##*}" reference="${uri/#*#}" uri="${uri/%#*}" - uri="${uri/#git+file:\/\/}" + uri="${uri/#git+}" + uri="${uri/#file:\/\/}" git_archive_method=local -elif [[ "${uri}" =~ ^(git\+)?ssh://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +elif [[ "${uri}" =~ ^(git\+)?ssh://[^/#]+[^#]+#[^#]+(##/[a-zA-Z0-9_.-]+\.tar)?$ ]] then + + prefix="${uri/#*##\/}" + prefix="${prefix/%.tar}" uri="${uri/%##*}" reference="${uri/#*#}" uri="${uri/%#*}" @@ -35,8 +45,11 @@ then git_archive_method=remote -elif [[ "${uri}" =~ ^(git\+)?(http|https|rsync)://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +elif [[ "${uri}" =~ ^(git\+)?(http|https|rsync)://[^/#]+[^#]+#[^#]+(##/[a-zA-Z0-9_.-]+\.tar)?$ ]] then + + prefix="${uri/#*##\/}" + prefix="${prefix/%.tar}" uri="${uri/%##*}" reference="${uri/#*#}" uri="${uri/%#*}" @@ -54,7 +67,7 @@ case "${git_archive_method}" in ( local ) - git --git-dir="${uri}" archive --format=tar --output="${output}" "${reference}" + git --git-dir="${uri}" archive --format=tar --output="${output}" --prefix="${prefix}/" "${reference}" exit 0 ;; @@ -63,7 +76,7 @@ case "${git_archive_method}" in if test "${git_archive_method}" == remote then - git archive --format=tar --output="${output}" --remote="${uri}" "${reference}" \ + git archive --format=tar --output="${output}" --remote="${uri}" --prefix="${prefix}/" "${reference}" \ && exit 0 echo "[ww] \`${uri}\` does not support git-archive; going after clone." >&2 fi @@ -72,7 +85,7 @@ case "${git_archive_method}" in git clone --bare "${uri}" "${clone}" - git --git-dir="${clone}" archive --format=tar --output="${output}" "${reference}" + git --git-dir="${clone}" archive --format=tar --output="${output}" --prefix="${prefix}/" "${reference}" find "${clone}" -delete -- 1.6.3.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

4 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-88-g3f7cc83
by dan＠archlinux.org 27 Oct '09

27 Oct '09

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 3f7cc83e0df79f24c545924d7b38e9fa22302b2a (commit) via 361a25c0861a74d6b35500955ae12e6b1bbadc5b (commit) via fff6d9dc2e6c61f67d6a50e2dde655f388c173a8 (commit) from 7f0f319a3e7c471a41482ba620f74423ef3f9a94 (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 3f7cc83e0df79f24c545924d7b38e9fa22302b2a Merge: 361a25c0861a74d6b35500955ae12e6b1bbadc5b fff6d9dc2e6c61f67d6a50e2dde655f388c173a8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 26 21:07:29 2009 -0500 Merge branch 'maint' commit 361a25c0861a74d6b35500955ae12e6b1bbadc5b Author: Laszlo Papp <djszapi2(a)gmail.com> Date: Fri Oct 23 14:01:17 2009 +0200 Fix a small typo in alpm_list.c Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm_list.c | 2 +- scripts/makepkg.sh.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Change strdup function using for strndup
by Laszlo Papp 24 Oct '09

24 Oct '09

* Size examined str* function usage is a common coding practice, * because it's more safer to avoid breakage while using str* functions. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- Is there any MAX value for these variables? *grp, package name, version, arch, license, replaces, backup, opt.depends, conflict, provide, xfercommand lib/libalpm/backup.c | 6 ++-- lib/libalpm/be_package.c | 6 ++-- lib/libalpm/conflict.c | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/package.c | 6 ++-- lib/libalpm/sync.c | 10 ++++---- lib/libalpm/util.c | 14 +++++----- src/pacman/callback.c | 2 +- src/pacman/conf.c | 4 +- src/pacman/pacman.c | 56 +++++++++++++++++++++++----------------------- src/pacman/util.c | 6 ++-- 12 files changed, 58 insertions(+), 58 deletions(-) diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index a0c6b7f..741f763 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -35,7 +35,7 @@ /* split a backup string "file\thash" into two strings : file and hash */ static int backup_split(const char *string, char **file, char **hash) { - char *str = strdup(string); + char *str = strndup(string, PATH_MAX); char *ptr; /* tab delimiter */ @@ -53,10 +53,10 @@ static int backup_split(const char *string, char **file, char **hash) ptr++; /* now str points to the filename and ptr points to the hash */ if(file) { - *file = strdup(str); + *file = strndup(str, PATH_MAX); } if(hash) { - *hash = strdup(ptr); + *hash = strndup(ptr, PATH_MAX); } FREE(str); return(1); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c1a4343..63fdb8b 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -169,7 +169,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) RET_ERR(PM_ERR_MEMORY, NULL); } - newpkg->filename = strdup(pkgfile); + newpkg->filename = strndup(pkgfile, PATH_MAX); newpkg->size = st.st_size; /* If full is false, only read through the archive until we find our needed @@ -202,7 +202,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) * already been handled (for future possibilities) */ } else { /* Keep track of all files for filelist generation */ - newpkg->files = alpm_list_add(newpkg->files, strdup(entry_name)); + newpkg->files = alpm_list_add(newpkg->files, strndup(entry_name, PATH_MAX)); } if(archive_read_data_skip(archive)) { @@ -234,7 +234,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) /* internal fields for package struct */ newpkg->origin = PKG_FROM_FILE; - newpkg->origin_data.file = strdup(pkgfile); + newpkg->origin_data.file = strndup(pkgfile, PATH_MAX); if(full) { /* "checking for conflicts" requires a sorted list, ensure that here */ diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index e934c01..d063859 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -516,7 +516,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, /* skip removal of file, but not add. this will prevent a second * package from removing the file when it was already installed * by its new owner (whether the file is in backup array or not */ - trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(filestr)); + trans->skip_remove = alpm_list_add(trans->skip_remove, strndup(filestr, PATH_MAX)); _alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr); resolved_conflict = 1; } diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index dca5452..7f44759 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -189,7 +189,7 @@ int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url) len = strlen(url); } if(len) { - newurl = strdup(url); + newurl = strndup(url, len); /* strip the trailing slash if one exists */ if(newurl[len - 1] == '/') { newurl[len - 1] = '\0'; diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 5cbf363..9e28527 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -431,7 +431,7 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) return(-1); } - handle->logfile = strdup(logfile); + handle->logfile = strndup(logfile, PATH_MAX); /* free the old logfile path string, and close the stream so logaction * will reopen a new stream on the new logfile */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 572b863..658b737 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -618,8 +618,8 @@ int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) /* easy comparison to see if versions are identical */ if(strcmp(a, b) == 0) return(0); - str1 = strdup(a); - str2 = strdup(b); + str1 = strndup(a, PATH_MAX); + str2 = strndup(b, PATH_MAX); one = str1; two = str2; @@ -805,7 +805,7 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) /* internal */ newpkg->origin = pkg->origin; if(newpkg->origin == PKG_FROM_FILE) { - newpkg->origin_data.file = strdup(pkg->origin_data.file); + newpkg->origin_data.file = strndup(pkg->origin_data.file, PATH_MAX); } else { newpkg->origin_data.db = pkg->origin_data.db; } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2cdcd47..e16374c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -830,7 +830,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(d->download_size != 0) { /* add the delta filename to the download list if needed */ - files = alpm_list_add(files, strdup(d->delta)); + files = alpm_list_add(files, strndup(d->delta, PATH_MAX)); } /* keep a list of all the delta files for md5sums */ @@ -841,7 +841,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) /* not using deltas */ if(spkg->download_size != 0) { /* add the filename to the download list if needed */ - files = alpm_list_add(files, strdup(fname)); + files = alpm_list_add(files, strndup(fname, PATH_MAX)); } } @@ -881,7 +881,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(test_md5sum(trans, filename, md5sum) != 0) { errors++; - *data = alpm_list_add(*data, strdup(filename)); + *data = alpm_list_add(*data, strndup(filename, PATH_MAX)); } } if(errors) { @@ -916,7 +916,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(test_md5sum(trans, filename, md5sum) != 0) { errors++; - *data = alpm_list_add(*data, strdup(filename)); + *data = alpm_list_add(*data, strndup(filename, PATH_MAX)); continue; } /* load the package file and replace pkgcache entry with it in the target list */ @@ -927,7 +927,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(alpm_pkg_load(filepath, 1, &pkgfile) != 0) { _alpm_pkg_free(pkgfile); errors++; - *data = alpm_list_add(*data, strdup(filename)); + *data = alpm_list_add(*data, strndup(filename, PATH_MAX)); FREE(filepath); continue; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d910809..906cb03 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -97,7 +97,7 @@ int _alpm_makepath_mode(const char *path, mode_t mode) mode_t oldmask = umask(0000); int ret = 0; - orig = strdup(path); + orig = strndup(path, PATH_MAX); incr = calloc(strlen(orig) + 1, sizeof(char)); str = orig; while((ptr = strsep(&str, "/"))) { @@ -204,7 +204,7 @@ int _alpm_lckmk() const char *file = alpm_option_get_lockfile(); /* create the dir of the lockfile first */ - dir = strdup(file); + dir = strndup(file, PATH_MAX); ptr = strrchr(dir, '/'); if(ptr) { *ptr = '\0'; @@ -315,7 +315,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int st = archive_entry_stat(entry); entryname = archive_entry_pathname(entry); - + if(S_ISREG(st->st_mode)) { archive_entry_set_perm(entry, 0644); } else if(S_ISDIR(st->st_mode)) { @@ -324,7 +324,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int /* If specific files were requested, skip entries that don't match. */ if(list) { - char *prefix = strdup(entryname); + char *prefix = strndup(entryname, PATH_MAX); char *p = strstr(prefix,"/"); if(p) { *(p+1) = '\0'; @@ -575,7 +575,7 @@ char *_alpm_filecache_find(const char* filename) snprintf(path, PATH_MAX, "%s%s", (char*)alpm_list_getdata(i), filename); if(access(path, R_OK) == 0) { - retpath = strdup(path); + retpath = strndup(path, PATH_MAX); _alpm_log(PM_LOG_DEBUG, "found cached pkg: %s\n", retpath); return(retpath); } @@ -612,7 +612,7 @@ const char *_alpm_filecache_setup(void) } /* we didn't find a valid cache directory. use /tmp. */ - tmp = alpm_list_add(NULL, strdup("/tmp/")); + tmp = alpm_list_add(NULL, strndup("/tmp/", PATH_MAX)); alpm_option_set_cachedirs(tmp); _alpm_log(PM_LOG_DEBUG, "using cachedir: %s", "/tmp/\n"); _alpm_log(PM_LOG_WARNING, _("couldn't create package cache, using /tmp instead\n")); @@ -629,7 +629,7 @@ const char *_alpm_filecache_setup(void) int _alpm_lstat(const char *path, struct stat *buf) { int ret; - char *newpath = strdup(path); + char *newpath = strndup(path, PATH_MAX); int len = strlen(newpath); /* strip the trailing slash if one exists */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 858bfdf..f6444ed 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -553,7 +553,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) eta_m = eta_s / 60; eta_s -= eta_m * 60; - fname = strdup(filename); + fname = strndup(filename, PATH_MAX); /* strip package or DB extension for cleaner look */ if((p = strstr(fname, PKGEXT)) || (p = strstr(fname, DBEXT))) { *p = '\0'; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 92c6f4e..d118dd0 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <stdio.h> -#include <string.h> /* strdup */ +#include <string.h> /* strndup */ /* pacman */ #include "conf.h" @@ -44,7 +44,7 @@ config_t *config_new(void) newconfig->op = PM_OP_MAIN; newconfig->logmask = PM_LOG_ERROR | PM_LOG_WARNING; /* CONFFILE is defined at compile-time */ - newconfig->configfile = strdup(CONFFILE); + newconfig->configfile = strndup(CONFFILE, PATH_MAX); return(newconfig); } diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index f4f8044..cd6dc9f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -295,12 +295,12 @@ static void setlibpaths(void) if(!config->dbpath) { /* omit leading slash from our static DBPATH, root handles it */ snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), DBPATH + 1); - config->dbpath = strdup(path); + config->dbpath = strndup(path, PATH_MAX); } if(!config->logfile) { /* omit leading slash from our static LOGFILE path, root handles it */ snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), LOGFILE + 1); - config->logfile = strdup(path); + config->logfile = strndup(path, PATH_MAX); } } /* Set other paths if they were configured. Note that unless rootdir @@ -477,7 +477,7 @@ static int parseargs(int argc, char *argv[]) case 'U': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); break; case 'V': config->version = 1; break; case 'b': - config->dbpath = strdup(optarg); + config->dbpath = strndup(optarg, PATH_MAX); break; case 'c': (config->op_s_clean)++; @@ -494,26 +494,26 @@ static int parseargs(int argc, char *argv[]) case 'f': config->flags |= PM_TRANS_FLAG_FORCE; break; case 'g': (config->group)++; break; case 'h': config->help = 1; break; - case 'i': (config->op_q_info)++; (config->op_s_info)++; break; - case 'k': - config->flags |= PM_TRANS_FLAG_DBONLY; - config->op_q_check = 1; - break; - case 'l': config->op_q_list = 1; break; - case 'm': config->op_q_foreign = 1; break; - case 'n': config->flags |= PM_TRANS_FLAG_NOSAVE; break; - case 'o': config->op_q_owns = 1; break; - case 'p': - config->op_q_isfile = 1; - config->op_s_printuris = 1; - config->flags |= PM_TRANS_FLAG_NOCONFLICTS; - config->flags |= PM_TRANS_FLAG_NOLOCK; - break; - case 'q': - config->quiet = 1; - break; - case 'r': - config->rootdir = strdup(optarg); + case 'i': (config->op_q_info)++; (config->op_s_info)++; break; + case 'k': + config->flags |= PM_TRANS_FLAG_DBONLY; + config->op_q_check = 1; + break; + case 'l': config->op_q_list = 1; break; + case 'm': config->op_q_foreign = 1; break; + case 'n': config->flags |= PM_TRANS_FLAG_NOSAVE; break; + case 'o': config->op_q_owns = 1; break; + case 'p': + config->op_q_isfile = 1; + config->op_s_printuris = 1; + config->flags |= PM_TRANS_FLAG_NOCONFLICTS; + config->flags |= PM_TRANS_FLAG_NOLOCK; + break; + case 'q': + config->quiet = 1; + break; + case 'r': + config->rootdir = strndup(optarg, PATH_MAX); break; case 's': config->op_s_search = 1; @@ -723,7 +723,7 @@ static int _parseconfig(const char *file, const char *givensection, /* if we are passed a section, use it as our starting point */ if(givensection != NULL) { - section = strdup(givensection); + section = strndup(givensection, PATH_MAX); } /* if we are passed a db, use it as our starting point */ if(givendb != NULL) { @@ -749,7 +749,7 @@ static int _parseconfig(const char *file, const char *givensection, if(section) { free(section); } - section = strdup(ptr); + section = strndup(ptr, PATH_MAX); section[strlen(section)-1] = '\0'; pm_printf(PM_LOG_DEBUG, "config: new section '%s'\n", section); if(!strlen(section)) { @@ -840,7 +840,7 @@ static int _parseconfig(const char *file, const char *givensection, } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { - config->dbpath = strdup(ptr); + config->dbpath = strndup(ptr, PATH_MAX); pm_printf(PM_LOG_DEBUG, "config: dbpath: %s\n", ptr); } } else if(strcmp(key, "CacheDir") == 0) { @@ -854,12 +854,12 @@ static int _parseconfig(const char *file, const char *givensection, } else if(strcmp(key, "RootDir") == 0) { /* don't overwrite a path specified on the command line */ if(!config->rootdir) { - config->rootdir = strdup(ptr); + config->rootdir = strndup(ptr, PATH_MAX); pm_printf(PM_LOG_DEBUG, "config: rootdir: %s\n", ptr); } } else if (strcmp(key, "LogFile") == 0) { if(!config->logfile) { - config->logfile = strdup(ptr); + config->logfile = strndup(ptr, PATH_MAX); pm_printf(PM_LOG_DEBUG, "config: logfile: %s\n", ptr); } } else if (strcmp(key, "XferCommand") == 0) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 0e5e7f5..fc8822f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -176,10 +176,10 @@ char *mdirname(const char *path) /* null or empty path */ if(path == NULL || path == '\0') { - return(strdup(".")); + return(strndup(".", PATH_MAX)); } - ret = strdup(path); + ret = strndup(path, PATH_MAX); last = strrchr(ret, '/'); if(last != NULL) { @@ -189,7 +189,7 @@ char *mdirname(const char *path) } /* no slash found */ free(ret); - return(strdup(".")); + return(strndup(".", PATH_MAX)); } /* output a string, but wrap words properly with a specified indentation -- 1.6.4.4

4 6