- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix test suite when GPGME is disabled
by Dan McGee 19 Jul '11

19 Jul '11

As noted by Allan, we failed pretty hard if gpgme was compiled out. With these changes, only sign001.py fails. This can/will be fixed later once we beef up the test suite with more signing tests anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_sync.c | 6 ++++++ lib/libalpm/db.c | 1 - lib/libalpm/handle.c | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index d7e14ba..cd69513 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -600,6 +600,12 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, _alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename); +#ifndef HAVE_GPGME + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); + } +#endif + db = _alpm_db_new(treename, 0); if(db == NULL) { RET_ERR(handle, ALPM_ERR_DB_CREATE, NULL); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 0c2b26a..746293f 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -327,7 +327,6 @@ alpm_db_t *_alpm_db_new(const char *treename, int is_local) CALLOC(db, 1, sizeof(alpm_db_t), return NULL); STRDUP(db->treename, treename, return NULL); db->is_local = is_local; - db->siglevel = 0; return db; } diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 9bffd4f..be51bfc 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -45,8 +45,10 @@ alpm_handle_t *_alpm_handle_new() CALLOC(handle, 1, sizeof(alpm_handle_t), return NULL); +#ifdef HAVE_GPGME handle->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL | ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; +#endif return handle; } @@ -579,7 +581,13 @@ int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level) { CHECK_HANDLE(handle, return -1); +#ifdef HAVE_GPGME handle->siglevel = level; +#else + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } +#endif return 0; } -- 1.7.6

1 1

[pacman-dev] Added SigLevel parsing code
by Kerrick Staley 19 Jul '11

19 Jul '11

-Kerrick Staley

4 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-475-gdad96cc
by dan＠archlinux.org 18 Jul '11

18 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via dad96ccce2eea8b171cd2d14ec20b8185f0009a8 (commit) via 89c070b263a9e1e4e0734b25c8bc33367a34e504 (commit) via 29a96bcfe179a82adbd575057e2ef9d48a6a72fb (commit) via 48e2a1a119ce84681f25855221b6e2fc2689a760 (commit) via 297cd7897bfe060ce46d703e15ad7cbe37aedced (commit) via c0fe1743e5ba034f70f0740a8f0863d64d0e480a (commit) via f0e34be9903e5523c4bffd35f2659303f80c22fc (commit) via 36db8c50471b4860f6f492c618053bce2559ab73 (commit) via 49427d1fb4f7cb9cfb76e430343510fba5f09e6a (commit) via bf120635a7fdbb2caeb73fa0774bf718f2a127ae (commit) via 3934a842b8121d6fe950fcac323e92e5e35f1538 (commit) via 3294039a00f3aa65181ed23518dc5c73e0201268 (commit) via 0b92d9ed9c6bffcf4b47645a365ea6c3d162e89e (commit) via 1c39e4fbade29d570858ca6eca4958ab72cfbdd0 (commit) via 3a04267cdd0b1324c8153c813e9bc5726b005670 (commit) via 65847fad44216e290986b40b404701432c17ff5a (commit) from e20995560640d11491905bfa80aa993c2efde7c4 (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 dad96ccce2eea8b171cd2d14ec20b8185f0009a8 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Jul 6 18:26:56 2011 +0200 replace access() calls for debug info where applicable Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89c070b263a9e1e4e0734b25c8bc33367a34e504 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Jul 6 17:24:19 2011 +0200 signing.c: check if needed files are readable If we can't read the keyring, gpgme will output confusing debug information and fail to verify the signature, so we should log some debug information. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 29a96bcfe179a82adbd575057e2ef9d48a6a72fb Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Jul 6 17:22:59 2011 +0200 add _alpm_access() wrapper This is a wrapper function for access() which logs some debug information and eases handling in case of split directory and filename. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 48e2a1a119ce84681f25855221b6e2fc2689a760 Merge: c0fe174 297cd78 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 18 10:41:37 2011 -0500 Merge branch 'maint' commit c0fe1743e5ba034f70f0740a8f0863d64d0e480a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 17 01:48:47 2011 +1000 Fix compilation without gpgme Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f0e34be9903e5523c4bffd35f2659303f80c22fc Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 17 09:12:18 2011 +1000 configure: output more compile settings Add information on CPPFLAGS, LDFLAGS and LIBS to the end of the configure output. This is very helpful in tracing issues when adjusting the configure file and also will allow us to more easily replicate any issues discovered due to a users build environment. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36db8c50471b4860f6f492c618053bce2559ab73 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 01:27:45 2011 +1000 makepkg.conf: remove curl from other common tools It is now set as the main tool, so make wget another common one. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 49427d1fb4f7cb9cfb76e430343510fba5f09e6a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 14:28:04 2011 +1000 repo-add: do not print full path of signature file The full path to the signature file when it is created is in a temporary directory so only print the filename. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bf120635a7fdbb2caeb73fa0774bf718f2a127ae Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 21:05:51 2011 +1000 repo-add: always remove repo signature symlink This prevents a dangling symlink being left behind if the repo goes from being signed to unsigned. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3934a842b8121d6fe950fcac323e92e5e35f1538 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 18 10:33:45 2011 -0400 contrib/paclog-pkglist: whitespace cleanup add a modeline and change 2 space indent to a tab. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3294039a00f3aa65181ed23518dc5c73e0201268 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 17 11:04:03 2011 -0400 contrib/paclog-pkglist: rework as bash wrapping awk Avoid some pain in awk's limited handling of command line arguments by wrapping this in a Bash script. We also default to @localstatedir@/log/pacman.log when no args are specified, meaning that -h or --help is required to get the help message. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0b92d9ed9c6bffcf4b47645a365ea6c3d162e89e Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 18 10:34:39 2011 -0500 Add a new epoch pactest Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1c39e4fbade29d570858ca6eca4958ab72cfbdd0 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jul 16 10:07:25 2011 -0500 Handle removal of empty directories properly This addresses FS#25141. We shouldn't remove every empty directory we come across during the removal process unless it is truly not known to any other package. This will prevent removal of essential directories such as '/var/lock/'. This is accomplished by first checking the empty/non-empty status of a directory, which was previously done implicitly by calling rmdir() and ignoring errors. We do this to avoid the next (new) check in most cases, which is to look at all local packages to see if the to-be-removed directory is present in another packages' filelist. If we do not find it anywhere, then we remove it, else we keep the file around. The pactest has been updated to test more cases, as well as finding a flaw in the original expected to fail case- we need separate DIR and FILE based EXIST rules. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3a04267cdd0b1324c8153c813e9bc5726b005670 Author: Rogutės Sparnuotos <rogutes(a)googlemail.com> Date: Thu Jun 16 11:40:40 2011 +0300 makepkg: only test for writable PKGDEST when needed. There is no need for a writable PKGDEST when using the --nobuild or --geninteg flags. Allan: added --geninteg Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 65847fad44216e290986b40b404701432c17ff5a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 16 23:01:39 2011 +1000 Move some .gitignore entries Put a .gitignore entry at the right level and sort that file alphabetically. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - configure.ac | 4 + contrib/Makefile.am | 4 +- contrib/{paclog-pkglist => paclog-pkglist.in} | 61 ++++++++++------- etc/makepkg.conf.in | 2 +- lib/libalpm/remove.c | 47 +++++++++++-- lib/libalpm/signing.c | 14 +++- lib/libalpm/trans.c | 3 +- lib/libalpm/util.c | 89 +++++++++++++++++++++++++ lib/libalpm/util.h | 2 + scripts/.gitignore | 5 +- scripts/makepkg.sh.in | 4 +- scripts/repo-add.sh.in | 5 +- test/pacman/pmrule.py | 8 ++ test/pacman/tests/epoch005.py | 25 +++++++ test/pacman/tests/remove070.py | 24 +++++-- 16 files changed, 242 insertions(+), 56 deletions(-) rename contrib/{paclog-pkglist => paclog-pkglist.in} (53%) create mode 100644 test/pacman/tests/epoch005.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-8-g297cd78
by dan＠archlinux.org 18 Jul '11

18 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 297cd7897bfe060ce46d703e15ad7cbe37aedced (commit) from e378170c2555b656ef87715d8284d038037ced5f (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 297cd7897bfe060ce46d703e15ad7cbe37aedced Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 17 00:09:19 2011 +1000 makepkg: fix issue with filenames with spaces and noextract Specifying a filename with spaces in a PKGBUILDs noextract array fails due to a lack of quoting. Fixes FS#25100. Reported-by: Thomas Weißschuh <thomas_weissschuh(a)lavabit.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Handle removal of empty directories properly
by Dan McGee 18 Jul '11

18 Jul '11

This addresses FS#25141. We shouldn't remove every empty directory we come across during the removal process unless it is truly not known to any other package. This will prevent removal of essential directories such as '/var/lock/'. This is accomplished by first checking the empty/non-empty status of a directory, which was previously done implicitly by calling rmdir() and ignoring errors. We do this to avoid the next (new) check in most cases, which is to look at all local packages to see if the to-be-removed directory is present in another packages' filelist. If we do not find it anywhere, then we remove it, else we keep the file around. The pactest has been updated to test more cases, as well as finding a flaw in the original expected to fail case- we need separate DIR and FILE based EXIST rules. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/remove.c | 41 ++++++++++++++++++++++++++++++++++----- lib/libalpm/util.c | 29 ++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + test/pacman/pmrule.py | 8 +++++++ test/pacman/tests/remove070.py | 24 +++++++++++++++------- 5 files changed, 89 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index b15dbaa..b946abc 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -232,8 +232,8 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, * see the big comment block in db_find_fileconflicts() for an * explanation. */ if(alpm_list_find_str(skip_remove, fileobj->name)) { - _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in skip_remove, skipping removal\n", - file); + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s is in skip_remove, skipping removal\n", file); return; } @@ -247,11 +247,40 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, } if(S_ISDIR(buf.st_mode)) { - if(rmdir(file)) { - /* this is okay, other packages are probably using it (like /usr) */ - _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s\n", file); + ssize_t filecount = _alpm_files_in_directory(handle, file); + /* if we have files, no need to remove the directory */ + if(filecount > 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s (%zd files)\n", + file, filecount); + } else if(filecount < 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "keeping directory %s (could not count files)\n", file); } else { - _alpm_log(handle, ALPM_LOG_DEBUG, "removing directory %s\n", file); + /* one last check- does any other package own this file? */ + alpm_list_t *local, *local_pkgs; + int found = 0; + local_pkgs = _alpm_db_get_pkgcache(handle->db_local); + for(local = local_pkgs; local && !found; local = local->next) { + alpm_pkg_t *local_pkg = local->data; + alpm_list_t *files; + + /* we duplicated the package when we put it in the removal list, so we + * so we can't use direct pointer comparison here. */ + if(_alpm_pkg_cmp(info, local_pkg) == 0) { + continue; + } + files = alpm_pkg_get_files(local_pkg); + if(_alpm_filelist_contains(files, fileobj->name)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "keeping directory %s (owned by %s)\n", file, local_pkg->name); + found = 1; + } + } + if(!found) { + rmdir(file); + _alpm_log(handle, ALPM_LOG_DEBUG, + "removing directory %s (no remaining owners)\n", file); + } } } else { /* if the file needs backup and has been modified, back it up to .pacsave */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index cd7f19c..af2db76 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -388,6 +388,35 @@ int _alpm_rmrf(const char *path) return 0; } +ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path) +{ + ssize_t files = 0; + struct dirent *ent; + DIR *dir = opendir(path); + + if(!dir) { + if(errno == ENOTDIR) { + _alpm_log(handle, ALPM_LOG_DEBUG, "%s was not a directory\n", path); + } else { + _alpm_log(handle, ALPM_LOG_DEBUG, "could not read directory %s\n", + path); + } + return -1; + } + while((ent = readdir(dir)) != NULL) { + const char *name = ent->d_name; + + if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { + continue; + } + + files++; + } + + closedir(dir); + return files; +} + int _alpm_logaction(alpm_handle_t *handle, const char *fmt, va_list args) { int ret = 0; diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 450dac9..2b71c5c 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -100,6 +100,7 @@ int _alpm_unpack_single(alpm_handle_t *handle, const char *archive, int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); int _alpm_rmrf(const char *path); +ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path); int _alpm_logaction(alpm_handle_t *handle, const char *fmt, va_list args); int _alpm_run_chroot(alpm_handle_t *handle, const char *path, char *const argv[]); int _alpm_ldconfig(alpm_handle_t *handle); diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index 0f6ae60..cb7ae88 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -146,6 +146,14 @@ def check(self, test): else: print "FILE rule '%s' not found" % case success = -1 + elif kind == "DIR": + filename = os.path.join(test.root, key) + if case == "EXIST": + if not os.path.isdir(filename): + success = 0 + else: + print "DIR rule '%s' not found" % case + success = -1 elif kind == "LINK": filename = os.path.join(test.root, key) if case == "EXIST": diff --git a/test/pacman/tests/remove070.py b/test/pacman/tests/remove070.py index e0587e1..898e2f5 100644 --- a/test/pacman/tests/remove070.py +++ b/test/pacman/tests/remove070.py @@ -1,21 +1,29 @@ -self.description = "Remove a package with an empty directory needed by another package" +self.description = "Remove a package with various directory overlaps" + +self.filesystem = ["lib/alsoonfs/randomfile"] p1 = pmpkg("pkg1") -p1.files = ["bin/pkg1", "opt/"] +p1.files = ["bin/pkg1", + "opt/", + "lib/onlyinp1/", + "lib/alsoonfs/"] p2 = pmpkg("pkg2") -p2.files = ["bin/pkg2", "opt/"] +p2.files = ["bin/pkg2", + "opt/", + "lib/onlyinp2/"] for p in p1, p2: - self.addpkg2db("local", p) + self.addpkg2db("local", p) self.args = "-R %s" % p1.name self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") -self.addrule("!FILE_EXIST=bin/pkg1") -self.addrule("FILE_EXIST=bin/pkg2") -self.addrule("FILE_EXIST=opt/") -self.expectfailure = True +self.addrule("DIR_EXIST=bin/") +self.addrule("DIR_EXIST=opt/") +self.addrule("!DIR_EXIST=lib/onlyinp1/") +self.addrule("DIR_EXIST=lib/onlyinp2/") +self.addrule("DIR_EXIST=lib/alsoonfs/") -- 1.7.6

4 3

[pacman-dev] [PATCH 1/3] contrib/paclog-pkglist: fix script name in usage
by Dave Reisner 18 Jul '11

18 Jul '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Just an oversight when I renamed the script, as pointed out by Allan. Sadly, awk doesn't have an equivalent of ${0##*/} when excuted under a #!/bin/awk shebang (ARGV[0] will always show 'awk'), so we just hard code it. contrib/paclog-pkglist | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/paclog-pkglist b/contrib/paclog-pkglist index 2c66e63..5948a0d 100755 --- a/contrib/paclog-pkglist +++ b/contrib/paclog-pkglist @@ -19,8 +19,8 @@ BEGIN { if (ARGC < 2) { - printf "usage: log2pkglist <pacman log>\n" - printf "example: log2pkglist /var/log/pacman.log\n" + printf "usage: paclog-pkglist <pacman log>\n" + printf "example: paclog-pkglist /var/log/pacman.log\n" exit } } -- 1.7.6

2 5

[pacman-dev] [PATCH] repo-add: always remove repo signature symlink
by Allan McRae 18 Jul '11

18 Jul '11

This prevents a dangling symlink being left behind if the repo goes from being signed to unsigned. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index db8f6b0..c598ad9 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -652,12 +652,11 @@ if (( success )); then [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" dblink="${REPO_DB_FILE%.tar*}" target=${REPO_DB_FILE##*/} - rm -f "$dblink" + rm -f "$dblink" "$dblink.sig" ln -s "$target" "$dblink" 2>/dev/null || \ ln "$target" "$dblink" 2>/dev/null || \ cp "$REPO_DB_FILE" "$dblink" if [[ -f "$target.sig" ]]; then - rm -f "$dblink.sig" ln -s "$target.sig" "$dblink.sig" 2>/dev/null || \ ln "$target.sig" "$dblink.sig" 2>/dev/null || \ cp "$REPO_DB_FILE.sig" "$dblink.sig" -- 1.7.6

1 0

[pacman-dev] [PATCH] makepkg: refactor checking source integrity
by Allan McRae 18 Jul '11

18 Jul '11

Move the source integrity checking into its own function as the code was duplicated and is now more complicated with the separation of the two checks types. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 296bab3..0682e4f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -753,6 +753,21 @@ check_pgpsigs() { fi } +check_source_integrity() { + if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then + warning "$(gettext "Skipping all source file integrity checks.")" + elif (( SKIPCHECKSUMS )); then + warning "$(gettext "Skipping verification of source file checksums.")" + check_pgpsigs + elif (( SKIPPGPCHECK )); then + warning "$(gettext "Skipping verification of source file PGP signatures.")" + check_checksums + else + check_checksums + check_pgpsigs + fi +} + extract_sources() { msg "$(gettext "Extracting Sources...")" local netfile @@ -2214,18 +2229,7 @@ if (( SOURCEONLY )); then (( SOURCEONLY == 2 )); then download_sources fi - if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then - warning "$(gettext "Skipping all source file integrity checks.")" - elif (( SKIPCHECKSUMS )); then - warning "$(gettext "Skipping verification of source file checksums.")" - check_pgpsigs - elif (( SKIPPGPCHECK )); then - warning "$(gettext "Skipping verification of source file PGP signatures.")" - check_checksums - else - check_checksums - check_pgpsigs - fi + check_source_integrity cd "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it @@ -2299,18 +2303,7 @@ elif (( REPKG )); then fi else download_sources - if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then - warning "$(gettext "Skipping all source file integrity checks.")" - elif (( SKIPCHECKSUMS )); then - warning "$(gettext "Skipping verification of source file checksums.")" - check_pgpsigs - elif (( SKIPPGPCHECK )); then - warning "$(gettext "Skipping verification of source file PGP signatures.")" - check_checksums - else - check_checksums - check_pgpsigs - fi + check_source_integrity extract_sources fi -- 1.7.6

1 0

[pacman-dev] [PATCH] repo-add: do not print full path of signature file
by Allan McRae 18 Jul '11

18 Jul '11

The full path to the signature file when it is created is in a temporary directory so only print the filename. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 19fe660..db8f6b0 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -195,7 +195,7 @@ create_signature() { gpg --detach-sign --use-agent ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$? if (( ! ret )); then - msg2 "$(gettext "Created signature file %s.")" "$dbfile.sig" + msg2 "$(gettext "Created signature file %s.")" "${dbfile##*/}.sig" else warning "$(gettext "Failed to sign package database.")" fi -- 1.7.6

1 0

[pacman-dev] [PATCH 1/2] Remove most usages of strncmp()
by Dan McGee 17 Jul '11

17 Jul '11

The supposed safety blanket of this function is better handled by explicit length checking and usages of strlen() on known NULL-terminated strings rather than hoping things fit in a buffer. We also have no need to fully fill a PATH_MAX length variable with NULLs every time as long as a single terminating byte is there. Remove usages of it by using strcpy() or memcpy() as appropriate, after doing length checks via strlen(). Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/handle.c | 2 +- src/pacman/query.c | 17 ++++++++++------- src/pacman/util.c | 11 ++++------- src/util/vercmp.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 22f3fc8..b48d5b6 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -298,7 +298,7 @@ static char *canonicalize_path(const char *path) { len += 1; } CALLOC(new_path, len + 1, sizeof(char), return NULL); - strncpy(new_path, path, len); + strcpy(new_path, path); new_path[len - 1] = '/'; return new_path; } diff --git a/src/pacman/query.c b/src/pacman/query.c index 045dc7f..4fc4584 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -110,8 +110,7 @@ static int query_fileowner(alpm_list_t *targets) int ret = 0; char path[PATH_MAX]; const char *root; - char *append; - size_t max_length; + size_t rootlen; alpm_list_t *t; alpm_db_t *db_local; @@ -125,9 +124,13 @@ static int query_fileowner(alpm_list_t *targets) * once, then we can just overwrite whatever file was there on the previous * iteration. */ root = alpm_option_get_root(config->handle); - strncpy(path, root, PATH_MAX - 1); - append = path + strlen(path); - max_length = PATH_MAX - (append - path) - 1; + rootlen = strlen(root); + if(rootlen + 1 > PATH_MAX) { + /* we are in trouble here */ + pm_fprintf(stderr, ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, ""); + return 1; + } + strcpy(path, root); db_local = alpm_option_get_localdb(config->handle); @@ -208,11 +211,11 @@ static int query_fileowner(alpm_list_t *targets) continue; } - if(strlen(pkgfile) > max_length) { + if(rootlen + 1 + strlen(pkgfile) > PATH_MAX) { pm_fprintf(stderr, ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, pkgfile); } /* concatenate our file and the root path */ - strcpy(append, pkgfile); + strcpy(path + rootlen, pkgfile); pdname = mdirname(path); ppath = resolve_path(pdname); diff --git a/src/pacman/util.c b/src/pacman/util.c index 9ced7aa..203f927 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -361,22 +361,21 @@ char *strreplace(const char *str, const char *needle, const char *replace) * x "size difference between replace and needle" */ newsz = strlen(str) + 1 + alpm_list_count(list) * (replacesz - needlesz); - newstr = malloc(newsz); + newstr = calloc(newsz, sizeof(char)); if(!newstr) { return NULL; } - *newstr = '\0'; p = str; newp = newstr; for(i = list; i; i = alpm_list_next(i)) { q = alpm_list_getdata(i); - if(q > p){ + if(q > p) { /* add chars between this occurence and last occurence, if any */ - strncpy(newp, p, (size_t)(q - p)); + memcpy(newp, p, (size_t)(q - p)); newp += q - p; } - strncpy(newp, replace, replacesz); + memcpy(newp, replace, replacesz); newp += replacesz; p = q + needlesz; } @@ -385,9 +384,7 @@ char *strreplace(const char *str, const char *needle, const char *replace) if(*p) { /* add the rest of 'p' */ strcpy(newp, p); - newp += strlen(p); } - *newp = '\0'; return newstr; } diff --git a/src/util/vercmp.c b/src/util/vercmp.c index 88cf49a..f4356fb 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <stdio.h> /* printf */ -#include <string.h> /* strncpy */ +#include <string.h> #define BASENAME "vercmp" -- 1.7.6

3 3