January 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Split common utility functions for libalpm and pacman
by Allan McRae 03 Jan '13

03 Jan '13

There is duplicated code in the util.c files in the libalpm and pacman source code. Split this into a separate file so that it can be shared via a symlink. This prevents code divergence between the two code bases. Also, move mbasename and mdirname from pacman/util.c into util-common.c in preparation for the following patch that uses them to add an extension to pacsave files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is revised based on comments from Dan that suggested a separate directory for the common file and symlinks into both the libalpm and pacman directories so that it would be obvious you are editing a common file. Also pulled in the mbasename/mdirname functions in one patch, because if HAVE_STRNDUP was defined, util-common.c would be an empty translation unit, which gives a error with -Werror=pedantic. Tested that "make distcheck" worked. Makefile.am | 2 +- configure.ac | 1 + lib/libalpm/Makefile.am | 1 + lib/libalpm/util-common.c | 1 + lib/libalpm/util-common.h | 1 + lib/libalpm/util.c | 33 -------------- lib/libalpm/util.h | 5 +-- src/common/Makefile.am | 4 ++ src/common/util-common.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ src/common/util-common.h | 32 ++++++++++++++ src/pacman/Makefile.am | 3 +- src/pacman/util-common.c | 1 + src/pacman/util-common.h | 1 + src/pacman/util.c | 50 --------------------- src/pacman/util.h | 8 +--- 15 files changed, 157 insertions(+), 95 deletions(-) create mode 120000 lib/libalpm/util-common.c create mode 120000 lib/libalpm/util-common.h create mode 100644 src/common/Makefile.am create mode 100644 src/common/util-common.c create mode 100644 src/common/util-common.h create mode 120000 src/pacman/util-common.c create mode 120000 src/pacman/util-common.h diff --git a/Makefile.am b/Makefile.am index 0010a3e..b05feb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ if WANT_DOC SUBDIRS += doc endif -DIST_SUBDIRS = $(SUBDIRS) contrib +DIST_SUBDIRS = $(SUBDIRS) contrib src/common ACLOCAL_AMFLAGS = -I m4 --install diff --git a/configure.ac b/configure.ac index 6059fe5..aa3305d 100644 --- a/configure.ac +++ b/configure.ac @@ -462,6 +462,7 @@ AC_CONFIG_FILES([ lib/libalpm/Makefile lib/libalpm/po/Makefile.in lib/libalpm/libalpm.pc +src/common/Makefile src/pacman/Makefile src/pacman/po/Makefile.in src/util/Makefile diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index c935e2d..5cf66b9 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -53,6 +53,7 @@ libalpm_la_SOURCES = \ sync.h sync.c \ trans.h trans.c \ util.h util.c \ + util-common.h util-common.c \ version.c if !HAVE_LIBSSL diff --git a/lib/libalpm/util-common.c b/lib/libalpm/util-common.c new file mode 120000 index 0000000..cf96517 --- /dev/null +++ b/lib/libalpm/util-common.c @@ -0,0 +1 @@ +../../src/common/util-common.c \ No newline at end of file diff --git a/lib/libalpm/util-common.h b/lib/libalpm/util-common.h new file mode 120000 index 0000000..988c2ac --- /dev/null +++ b/lib/libalpm/util-common.h @@ -0,0 +1 @@ +../../src/common/util-common.h \ No newline at end of file diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index c33e32a..f6e6632 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1256,37 +1256,4 @@ void _alpm_alloc_fail(size_t size) fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", size); } -#ifndef HAVE_STRNDUP -/* A quick and dirty implementation derived from glibc */ -/** Determines the length of a fixed-size string. - * @param s string to be measured - * @param max maximum number of characters to search for the string end - * @return length of s or max, whichever is smaller - */ -static size_t strnlen(const char *s, size_t max) -{ - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); -} - -/** Copies a string. - * Returned string needs to be freed - * @param s string to be copied - * @param n maximum number of characters to copy - * @return pointer to the new string on success, NULL on error - */ -char *strndup(const char *s, size_t n) -{ - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); - - if(new == NULL) - return NULL; - - new[len] = '\0'; - return (char *)memcpy(new, s, len); -} -#endif - /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 734e0e5..3a6b14a 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -28,6 +28,7 @@ #include "alpm.h" #include "package.h" /* alpm_pkg_t */ #include "handle.h" /* alpm_handle_t */ +#include "util-common.h" #include <stdio.h> #include <string.h> @@ -142,10 +143,6 @@ int _alpm_fnmatch(const void *pattern, const void *string); char *strsep(char **, const char *); #endif -#ifndef HAVE_STRNDUP -char *strndup(const char *s, size_t n); -#endif - /* check exported library symbols with: nm -C -D <lib> */ #define SYMEXPORT __attribute__((visibility("default"))) #define SYMHIDDEN __attribute__((visibility("internal"))) diff --git a/src/common/Makefile.am b/src/common/Makefile.am new file mode 100644 index 0000000..4950333 --- /dev/null +++ b/src/common/Makefile.am @@ -0,0 +1,4 @@ +EXTRA_DIST = \ + util-common.h util-common.c + +# vim:set ts=2 sw=2 noet: diff --git a/src/common/util-common.c b/src/common/util-common.c new file mode 100644 index 0000000..e2b5939 --- /dev/null +++ b/src/common/util-common.c @@ -0,0 +1,109 @@ +/* + * util-common.c + * + * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdlib.h> +#include <string.h> + +#include "util-common.h" + + +/** Parse the basename of a program from a path. +* @param path path to parse basename from +* +* @return everything following the final '/' +*/ +const char *mbasename(const char *path) +{ + const char *last = strrchr(path, '/'); + if(last) { + return last + 1; + } + return path; +} + +/** Parse the dirname of a program from a path. +* The path returned should be freed. +* @param path path to parse dirname from +* +* @return everything preceding the final '/' +*/ +char *mdirname(const char *path) +{ + char *ret, *last; + + /* null or empty path */ + if(path == NULL || path == '\0') { + return strdup("."); + } + + if((ret = strdup(path)) == NULL) { + return NULL; + } + + last = strrchr(ret, '/'); + + if(last != NULL) { + /* we found a '/', so terminate our string */ + if(last == ret) { + /* return "/" for root */ + last++; + } + *last = '\0'; + return ret; + } + + /* no slash found */ + free(ret); + return strdup("."); +} + +#ifndef HAVE_STRNDUP +/* A quick and dirty implementation derived from glibc */ +/** Determines the length of a fixed-size string. + * @param s string to be measured + * @param max maximum number of characters to search for the string end + * @return length of s or max, whichever is smaller + */ +static size_t strnlen(const char *s, size_t max) +{ + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); +} + +/** Copies a string. + * Returned string needs to be freed + * @param s string to be copied + * @param n maximum number of characters to copy + * @return pointer to the new string on success, NULL on error + */ +char *strndup(const char *s, size_t n) +{ + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); + + if(new == NULL) + return NULL; + + new[len] = '\0'; + return (char *)memcpy(new, s, len); +} +#endif + +/* vim: set ts=2 sw=2 noet: */ diff --git a/src/common/util-common.h b/src/common/util-common.h new file mode 100644 index 0000000..04d4e9d --- /dev/null +++ b/src/common/util-common.h @@ -0,0 +1,32 @@ +/* + * util-common.h + * + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _PM_UTIL_COMMON_H +#define _PM_UTIL_COMMON_H + +const char *mbasename(const char *path); +char *mdirname(const char *path); + +#ifndef HAVE_STRNDUP +char *strndup(const char *s, size_t n); +#endif + +#endif /* _PM_UTIL_COMMON_H */ + +/* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 311f7c5..ed51573 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -38,7 +38,8 @@ pacman_SOURCES = \ sync.c \ callback.h callback.c \ upgrade.c \ - util.h util.c + util.h util.c \ + util-common.h util-common.c LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la diff --git a/src/pacman/util-common.c b/src/pacman/util-common.c new file mode 120000 index 0000000..a2f6c50 --- /dev/null +++ b/src/pacman/util-common.c @@ -0,0 +1 @@ +../common/util-common.c \ No newline at end of file diff --git a/src/pacman/util-common.h b/src/pacman/util-common.h new file mode 120000 index 0000000..3f0b982 --- /dev/null +++ b/src/pacman/util-common.h @@ -0,0 +1 @@ +../common/util-common.h \ No newline at end of file diff --git a/src/pacman/util.c b/src/pacman/util.c index 81eec67..014be1f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -210,56 +210,6 @@ int rmrf(const char *path) } } -/** Parse the basename of a program from a path. -* @param path path to parse basename from -* -* @return everything following the final '/' -*/ -const char *mbasename(const char *path) -{ - const char *last = strrchr(path, '/'); - if(last) { - return last + 1; - } - return path; -} - -/** Parse the dirname of a program from a path. -* The path returned should be freed. -* @param path path to parse dirname from -* -* @return everything preceding the final '/' -*/ -char *mdirname(const char *path) -{ - char *ret, *last; - - /* null or empty path */ - if(path == NULL || path == '\0') { - return strdup("."); - } - - if((ret = strdup(path)) == NULL) { - return NULL; - } - - last = strrchr(ret, '/'); - - if(last != NULL) { - /* we found a '/', so terminate our string */ - if(last == ret) { - /* return "/" for root */ - last++; - } - *last = '\0'; - return ret; - } - - /* no slash found */ - free(ret); - return strdup("."); -} - /* output a string, but wrap words properly with a specified indentation */ void indentprint(const char *str, unsigned short indent, unsigned short cols) diff --git a/src/pacman/util.h b/src/pacman/util.h index 0c58a47..c38291a 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -26,6 +26,8 @@ #include <alpm_list.h> +#include "util-common.h" + #ifdef ENABLE_NLS #include <libintl.h> /* here so it doesn't need to be included elsewhere */ /* define _() as shortcut for gettext() */ @@ -49,8 +51,6 @@ int needs_root(void); int check_syncdbs(size_t need_repos, int check_valid); unsigned short getcols(int fd); int rmrf(const char *path); -const char *mbasename(const char *path); -char *mdirname(const char *path); void indentprint(const char *str, unsigned short indent, unsigned short cols); size_t strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); @@ -80,10 +80,6 @@ int pm_asprintf(char **string, const char *format, ...); int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); -#ifndef HAVE_STRNDUP -char *strndup(const char *s, size_t n); -#endif - #endif /* _PM_UTIL_H */ /* vim: set ts=2 sw=2 noet: */ -- 1.8.1

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-494-g965e1de
by allan＠archlinux.org 03 Jan '13

03 Jan '13

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 965e1de2174148a7a6c0860a7514d9bb1969bf03 (commit) via fe0586e2400aa078f0b974ef8acc541ad9e95140 (commit) via b455bbc91db5a4cde0e6d581fa323cc8fb5b66df (commit) via 342f079f7e5c290e52deaf83700371c5ce217179 (commit) via 04821ea9cab4ecd34ad7b39ad36ffa667f70d4ee (commit) via 241d6b884a3a6c883b6c61a3b175d17e7d317fc5 (commit) via d5a6ce8ca124d1eea343314b23110e006eb313d5 (commit) via 5aaf5bcf830cb808de2484c0f3860a22a21a79b4 (commit) via 23f93118d05ff9219fa22b58a54e0f7d2c54ad86 (commit) via 163ba4016efb0628a16c4dd882fb6a2030b3efef (commit) via 495460d71737ade257d8a6a3c06d21f36c08e7dd (commit) via 6a804d55ddf150c8b716747f0c46750de06679b2 (commit) via dd3762edc4b1eb0cde2610164fd4f1a496e671b9 (commit) via 2616cb5fdce0c54e829a88318d671dd5032f0aac (commit) via 038b1815d0ab1a8c0aab4d6cfc18541df5c6cd33 (commit) via 60d258819294e7b84c7ec501d9bfe6fe6965d41c (commit) via 1dd3405813434e71ead02bdcb66b6da0544632c4 (commit) from 5186f702d3d426eec8a2c84bb2a8556ffa9e0736 (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 965e1de2174148a7a6c0860a7514d9bb1969bf03 Author: Danny George <dangets(a)gmail.com> Date: Thu Dec 13 07:53:37 2012 -0700 Add a -n option to repo-add to only add new packages Packages are already in the pkg db were given a warning, and then readded anyway. With -n specified, the warning is printed, but skips readding it. Signed-off-by: Danny George <dangets(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fe0586e2400aa078f0b974ef8acc541ad9e95140 Author: William Giokas <1007380(a)gmail.com> Date: Thu Dec 13 09:56:11 2012 -0600 makepkg: Print out full version on pkgver update When building sources with a pkgver function, makepkg will print out the original version before pkgver() is run, claiming that that is the package that will be built. This patch simply re-prints the output later, after pkgver() has been run so people can see which package they are actually building. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b455bbc91db5a4cde0e6d581fa323cc8fb5b66df Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 16 23:13:22 2012 +1000 Update Doxyfile A few parameters were outdated and this produced warnings from Doxygen Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 342f079f7e5c290e52deaf83700371c5ce217179 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 16 23:00:41 2012 +1000 doc: Fix section link in pacman-key man page Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 04821ea9cab4ecd34ad7b39ad36ffa667f70d4ee Author: Danny George <dangets(a)gmail.com> Date: Fri Dec 14 07:20:06 2012 -0700 Fixed missing asciidoc id Generated webpage contained dead links to section 'Package and Database Signature Checking' commit 241d6b884a3a6c883b6c61a3b175d17e7d317fc5 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 16 22:32:54 2012 +1000 makepkg: use --apparent-size when du supports it Amazingly, using "sleep 1" to convince btrfs to report correct file sizes is only a 90% fix. Sometimes more sleep is needed. Instead we use the --apparent-size argument to du to get actual file sizes. This is used only on Linux as the various BSDs do not support this argument. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d5a6ce8ca124d1eea343314b23110e006eb313d5 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 16 22:05:49 2012 +1000 Remove checks for geteuid The geteuid function is defined in POSIX and we will not support any operating systems without it. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5aaf5bcf830cb808de2484c0f3860a22a21a79b4 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 16 22:03:51 2012 +1000 Remove Cygwin support Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 23f93118d05ff9219fa22b58a54e0f7d2c54ad86 Author: Florian Pritz <bluewind(a)xinu.at> Date: Thu Dec 20 00:57:35 2012 +0100 pacdiff: update copyright notice Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 163ba4016efb0628a16c4dd882fb6a2030b3efef Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Dec 19 23:22:22 2012 +0100 pacdiff: Add option to overwrite, clarify remove option Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 495460d71737ade257d8a6a3c06d21f36c08e7dd Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Dec 19 23:21:56 2012 +0100 pacdiff: check cmp's exit code rather than output Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6a804d55ddf150c8b716747f0c46750de06679b2 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Dec 19 23:21:06 2012 +0100 pacdiff: be more verbose if we rename or remove Doesn't hurt and reassures the user that we did the right thing. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dd3762edc4b1eb0cde2610164fd4f1a496e671b9 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Dec 19 23:20:13 2012 +0100 pacdiff: color filename and mention what we found Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2616cb5fdce0c54e829a88318d671dd5032f0aac Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 27 02:53:51 2012 -0600 Use a defined constant in delta.c for num_matches This allows compiling in both clang and gcc without running into oddities regarding const vs. defined constant values. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 038b1815d0ab1a8c0aab4d6cfc18541df5c6cd33 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 27 02:38:11 2012 -0600 util/pactree: correctly free the deps list in walk_deps() If we are reversed, then we were correctly freeing both the list and the contained data. However, we were leaking a list in the case of a non-reversed traversal. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 60d258819294e7b84c7ec501d9bfe6fe6965d41c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jan 1 22:43:20 2013 -0500 parseopts: remove superfluous continue/shift statements Fun fact about bash: the below is valid and will only ever print 'a'! fn() { continue 2 } for x in {1..5}; do for y in {a..e}; do echo "$y" fn done done Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1dd3405813434e71ead02bdcb66b6da0544632c4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 2 14:19:59 2013 +1000 Update copyright year for 2013 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 11 +++++----- contrib/bacman.sh.in | 2 +- contrib/pacdiff.sh.in | 45 ++++++++++++++++++++++++++++++++--------- contrib/updpkgsums.sh.in | 4 ++-- doc/Doxyfile | 15 +++++++++----- doc/index.txt | 2 +- doc/pacman-key.8.txt | 4 ++-- doc/pacman.conf.5.txt | 2 +- doc/repo-add.8.txt | 4 ++++ lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 11 ++++++---- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/Makefile.am | 1 + scripts/library/parseopts.sh | 6 +----- scripts/makepkg.sh.in | 13 +++++------- scripts/pacman-db-upgrade.sh.in | 4 ++-- scripts/pacman-key.sh.in | 4 ++-- scripts/pacman-optimize.sh.in | 4 ++-- scripts/repo-add.sh.in | 6 ++++++ src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 9 ++------- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 2 +- src/util/pactree.c | 4 +++- 84 files changed, 158 insertions(+), 123 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Ensure a terminating newline from scriptlet output
by Simon Gomizelj 02 Jan '13

02 Jan '13

Prevent scriptlets from clobbering pacman.log because they don't end their outputs with a newline. --- lib/libalpm/util.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 033058a..4bafb3f 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -555,24 +555,35 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) exit(1); } else { /* this code runs for the parent only (wait on the child) */ - int status; - FILE *pipe_file; + int status, need_newline = 0; CLOSE(pipefd[1]); - pipe_file = fdopen(pipefd[0], "r"); - if(pipe_file == NULL) { - CLOSE(pipefd[0]); - retval = 1; - } else { - while(!feof(pipe_file)) { - char line[PATH_MAX]; - if(fgets(line, PATH_MAX, pipe_file) == NULL) - break; - alpm_logaction(handle, "%s", line); - EVENT(handle, ALPM_EVENT_SCRIPTLET_INFO, line, NULL); + for(;;) { + char line[BUFSIZ]; + int nbytes_r = read(pipefd[0], line, BUFSIZ); + + if(nbytes_r == 0) { + break; + } else if(nbytes_r == -1) { + if (errno != EINTR) { + _alpm_log(handle, ALPM_LOG_ERROR, _("call to read failed (%s)\n"), strerror(errno)); + CLOSE(pipefd[0]); + retval = 1; + goto cleanup; + } + continue; } - fclose(pipe_file); + + /* we'll need to manually add a newline if the read data doesn't end with one already */ + need_newline = line[nbytes_r - 1] != '\n'; + + alpm_logaction(handle, "%s", line); + EVENT(handle, ALPM_EVENT_SCRIPTLET_INFO, line, NULL); } + CLOSE(pipefd[0]); + + if (need_newline) + alpm_logaction(handle, "\n"); while(waitpid(pid, &status, 0) == -1) { if(errno != EINTR) { -- 1.8.0.2

2 2

[pacman-dev] [PATCH v2 1/5] pacdiff: color filename and mention what we found
by Florian Pritz 02 Jan '13

02 Jan '13

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Now uses tput to get the color codes. contrib/pacdiff.sh.in | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index bfafda2..4c6277d 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -24,6 +24,22 @@ diffprog=${DIFFPROG:-vimdiff} diffsearchpath=${DIFFSEARCHPATH:-/etc} locate=0 +if tput setaf 0 &>/dev/null; then + ALL_OFF="$(tput sgr0)" + BOLD="$(tput bold)" + BLUE="${BOLD}$(tput setaf 4)" + GREEN="${BOLD}$(tput setaf 2)" + YELLOW="${BOLD}$(tput setaf 3)" + PURPLE="${BOLD}$(tput setaf 5)" +else + ALL_OFF="\e[1;0m" + BOLD="\e[1;1m" + BLUE="${BOLD}\e[1;34m" + GREEN="${BOLD}\e[1;32m" + YELLOW="${BOLD}\e[1;33m" + PURPLE="${BOLD}\e[1;35m" +fi + usage() { echo "$myname : a simple pacnew/pacorig/pacsave updater" echo "Usage : $myname [-l]" @@ -62,7 +78,15 @@ fi # see http://mywiki.wooledge.org/BashFAQ/020 while IFS= read -u 3 -r -d '' pacfile; do file="${pacfile%.pac*}" - echo "File: $file" + file_type="pac${pacfile##*.pac}" + + case $file_type in + pacnew) printf "$GREEN%s$ALL_OFF" "$file_type";; + pacorig) printf "$YELLOW%s$ALL_OFF" "$file_type";; + pacsave) printf "$BLUE%s$ALL_OFF" "$file_type";; + esac + + printf " found for $PURPLE%s$ALL_OFF\n" "$file" if [ ! -f "$file" ]; then echo " $file does not exist" rm -i "$pacfile" -- 1.8.0.2

3 11

02 Jan '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/bacman.sh.in | 2 +- contrib/updpkgsums.sh.in | 4 ++-- doc/index.txt | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/makepkg.sh.in | 4 ++-- scripts/pacman-db-upgrade.sh.in | 4 ++-- scripts/pacman-key.sh.in | 4 ++-- scripts/pacman-optimize.sh.in | 4 ++-- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 4 ++-- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 2 +- 74 files changed, 80 insertions(+), 80 deletions(-) diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 7895a40..512de63 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -5,7 +5,7 @@ # stored into the pacman database and system files # # Copyright (c) 2008 locci <carlocci_at_gmail_dot_com> -# Copyright (c) 2008-2012 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2008-2013 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 33e04d9..ffea96b 100755 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -2,7 +2,7 @@ # # updpkgsums - update source checksums in-place in PKGBUILDs # -# Copyright (C) 2012 Dave Reisner <dreisner(a)archlinux.org> +# Copyright (C) 2012-2013 Dave Reisner <dreisner(a)archlinux.org> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -33,7 +33,7 @@ usage() { version() { printf "%s %s\n" "$myname" "$myver" - echo 'Copyright (C) 2012 Dave Reisner <dreisner(a)archlinux.org>' + echo 'Copyright (C) 2012-2013 Dave Reisner <dreisner(a)archlinux.org>' } case $1 in diff --git a/doc/index.txt b/doc/index.txt index 5d93bb7..3d346b8 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -243,7 +243,7 @@ bugs under the Pacman project. Copyright --------- -pacman is Copyright (C) 2006-2012 Pacman Development Team +pacman is Copyright (C) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> and Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org> and is licensed through the GNU General Public License, version 2 or later. diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 7ef6530..57c9300 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -1,7 +1,7 @@ /* * add.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/add.h b/lib/libalpm/add.h index d1368e8..2e1104f 100644 --- a/lib/libalpm/add.h +++ b/lib/libalpm/add.h @@ -1,7 +1,7 @@ /* * add.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index c58a406..cd14adb 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -1,7 +1,7 @@ /* * alpm.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c9dc247..6e8c93d 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1,7 +1,7 @@ /* * alpm.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 39eded1..bcd42b8 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -1,7 +1,7 @@ /* * alpm_list.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 8f743a2..72c7378 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -1,7 +1,7 @@ /* * alpm_list.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 98b5f5e..04168c5 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -1,7 +1,7 @@ /* * backup.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2005 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/backup.h b/lib/libalpm/backup.h index c539406..765195f 100644 --- a/lib/libalpm/backup.h +++ b/lib/libalpm/backup.h @@ -1,7 +1,7 @@ /* * backup.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 6d47fa8..0f60b6d 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1,7 +1,7 @@ /* * be_local.c : backend for the local database * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 8c5b2d1..c3486a8 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -1,7 +1,7 @@ /* * be_package.c : backend for packages * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 6009455..a5a2c10 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -1,7 +1,7 @@ /* * be_sync.c : backend for sync databases * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index f087ace..5fbdfc8 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -1,7 +1,7 @@ /* * conflict.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by David Kimpe <dnaku(a)frugalware.org> diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 0bfdfd7..983ed39 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -1,7 +1,7 @@ /* * conflict.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index fdb7ff9..3a04a87 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -1,7 +1,7 @@ /* * db.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 94659b7..8029293 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -1,7 +1,7 @@ /* * db.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 26ae5d5..536d678 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -1,7 +1,7 @@ /* * delta.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2007-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index b1c8991..90a170c 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -1,7 +1,7 @@ /* * delta.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2007-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 404738d..aebfd0b 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -1,7 +1,7 @@ /* * deps.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index c8e1bc3..1fbeff9 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -1,7 +1,7 @@ /* * deps.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 2582c4c..4526e89 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -1,7 +1,7 @@ /* * diskspace.c * - * Copyright (c) 2010-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h index 591d933..4d876d7 100644 --- a/lib/libalpm/diskspace.h +++ b/lib/libalpm/diskspace.h @@ -1,7 +1,7 @@ /* * diskspace.h * - * Copyright (c) 2010-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 3e1659e..ee19adb 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -1,7 +1,7 @@ /* * download.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index e279d56..ca17200 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -1,7 +1,7 @@ /* * dload.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 86b4efb..a59f4fe 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -1,7 +1,7 @@ /* * error.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index f884e6a..d1aeb83 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -1,7 +1,7 @@ /* * filelist.c * - * Copyright (c) 2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2012-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/filelist.h b/lib/libalpm/filelist.h index 8c4f8eb..bfab416 100644 --- a/lib/libalpm/filelist.h +++ b/lib/libalpm/filelist.h @@ -1,7 +1,7 @@ /* * filelist.h * - * Copyright (c) 2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2012-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/graph.c b/lib/libalpm/graph.c index 69be9e3..81ee6fd 100644 --- a/lib/libalpm/graph.c +++ b/lib/libalpm/graph.c @@ -1,7 +1,7 @@ /* * graph.c - helpful graph structure and setup/teardown methods * - * Copyright (c) 2007-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2007-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h index 463b2cd..bf06047 100644 --- a/lib/libalpm/graph.h +++ b/lib/libalpm/graph.h @@ -1,7 +1,7 @@ /* * graph.h - helpful graph structure and setup/teardown methods * - * Copyright (c) 2007-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2007-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index 7c3d64f..614dbaf 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -1,7 +1,7 @@ /* * group.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/group.h b/lib/libalpm/group.h index 1f776eb..b8cd3e1 100644 --- a/lib/libalpm/group.h +++ b/lib/libalpm/group.h @@ -1,7 +1,7 @@ /* * group.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 816162b..c064379 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -1,7 +1,7 @@ /* * handle.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index c0ad668..c24e97a 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -1,7 +1,7 @@ /* * handle.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 8486716..74143fd 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -1,7 +1,7 @@ /* * log.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h index 22c3d06..b44ea18 100644 --- a/lib/libalpm/log.h +++ b/lib/libalpm/log.h @@ -1,7 +1,7 @@ /* * log.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index d77471f..098c867 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1,7 +1,7 @@ /* * package.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 373fb90..b7c3358 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -1,7 +1,7 @@ /* * package.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by David Kimpe <dnaku(a)frugalware.org> diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index 7b38800..acb1a1c 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -1,7 +1,7 @@ /* * pkghash.c * - * Copyright (c) 2011-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2011-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/pkghash.h b/lib/libalpm/pkghash.h index a2c39c7..546d3ae 100644 --- a/lib/libalpm/pkghash.h +++ b/lib/libalpm/pkghash.h @@ -1,7 +1,7 @@ /* * pkghash.h * - * Copyright (c) 2011-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2011-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index dafbe28..b965391 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -1,7 +1,7 @@ /* * remove.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h index 203eccb..cd53285 100644 --- a/lib/libalpm/remove.h +++ b/lib/libalpm/remove.h @@ -1,7 +1,7 @@ /* * remove.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 9180cc9..22d4d3d 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -1,7 +1,7 @@ /* * signing.c * - * Copyright (c) 2008-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2008-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 19ffef2..da3e01b 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -1,7 +1,7 @@ /* * signing.h * - * Copyright (c) 2008-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2008-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index a4e5860..efd5c3f 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1,7 +1,7 @@ /* * sync.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index 496f525..82ed4be 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -1,7 +1,7 @@ /* * sync.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 0ba24ff..b0488eb 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -1,7 +1,7 @@ /* * trans.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index acde921..f8ef045 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -1,7 +1,7 @@ /* * trans.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 033058a..c33e32a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1,7 +1,7 @@ /* * util.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 9bcd59e..734e0e5 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -1,7 +1,7 @@ /* * util.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index 269a701..59a7a4e 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c057905..ff3fa5b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -3,7 +3,7 @@ # makepkg - make packages compatible for use with pacman # @configure_input@ # -# Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> # Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> # Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> # Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> @@ -2444,7 +2444,7 @@ usage() { version() { printf "makepkg (pacman) %s\n" "$makepkg_version" printf -- "$(gettext "\ -Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 894152f..1b5407a 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -3,7 +3,7 @@ # pacman-db-upgrade - upgrade the local pacman db to a newer format # @configure_input@ # -# Copyright (c) 2010-2012 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ usage() { version() { printf "pacman-db-upgrade (pacman) %s\n" "$myver" printf -- "$(gettext "\ -Copyright (c) 2010-2012 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index e5b6021..ef4ab30 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -4,7 +4,7 @@ # Based on apt-key, from Debian # @configure_input@ # -# Copyright (c) 2010-2012 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -91,7 +91,7 @@ usage() { version() { printf "pacman-key (pacman) %s\n" "${myver}" printf -- "$(gettext "\ -Copyright (c) 2010-2012 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 4a84c0b..53ae1c7 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -3,7 +3,7 @@ # pacman-optimize # @configure_input@ # -# Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> # Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> # # This program is free software; you can redistribute it and/or modify @@ -49,7 +49,7 @@ does not have to move around the disk as much.\n")" version() { printf "pacman-optimize (pacman) %s\n" "$myver" printf -- "$(gettext "\ -Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a249a6e..c9008e0 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -1,7 +1,7 @@ /* * callback.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 2215790..4717360 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -1,7 +1,7 @@ /* * callback.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/check.c b/src/pacman/check.c index 78841c6..a657f95 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -1,7 +1,7 @@ /* * check.c * - * Copyright (c) 2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2012-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pacman/check.h b/src/pacman/check.h index f71637c..9f86a2a 100644 --- a/src/pacman/check.h +++ b/src/pacman/check.h @@ -1,7 +1,7 @@ /* * check.h * - * Copyright (c) 2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2012-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f47b92d..de29975 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -1,7 +1,7 @@ /* * conf.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/conf.h b/src/pacman/conf.h index aee6859..06d2fd5 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -1,7 +1,7 @@ /* * conf.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/database.c b/src/pacman/database.c index dd16013..44bf3af 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -1,7 +1,7 @@ /* * database.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index a654c88..f3a9035 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -1,7 +1,7 @@ /* * deptest.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/package.c b/src/pacman/package.c index 31211f5..330f7ab 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -1,7 +1,7 @@ /* * package.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/package.h b/src/pacman/package.h index 1e021f4..47fbcad 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -1,7 +1,7 @@ /* * package.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 29a489b..0678318 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1,7 +1,7 @@ /* * pacman.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify @@ -217,7 +217,7 @@ static void version(void) { printf("\n"); printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); - printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2012 Pacman Development Team\n"); + printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2013 Pacman Development Team\n"); printf("\\ '-. '-' '-' '-' Copyright (C) 2002-2006 Judd Vinet\n"); printf(" '--'\n"); printf(_(" This program may be freely redistributed under\n" diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h index 710e8fd..4eaf318 100644 --- a/src/pacman/pacman.h +++ b/src/pacman/pacman.h @@ -1,7 +1,7 @@ /* * pacman.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/query.c b/src/pacman/query.c index d8d0fc5..0112423 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -1,7 +1,7 @@ /* * query.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 472adb5..943a555 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -1,7 +1,7 @@ /* * remove.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 532a667..09d7657 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -1,7 +1,7 @@ /* * sync.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index eaa3640..7f69091 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -1,7 +1,7 @@ /* * upgrade.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/util.c b/src/pacman/util.c index 4c471dd..81eec67 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1,7 +1,7 @@ /* * util.c * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/util.h b/src/pacman/util.h index 0dfdc85..0c58a47 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -1,7 +1,7 @@ /* * util.h * - * Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify -- 1.8.0.3

1 0

[pacman-dev] [PATCH] parseopts: remove superfluous continue statements
by Dave Reisner 02 Jan '13

02 Jan '13

Fun fact about bash: the below is valid and will only ever print 'a'! fn() { continue 2 } for x in {1..5}; do for y in {a..e}; do echo "$y" fn done done Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/library/parseopts.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/library/parseopts.sh b/scripts/library/parseopts.sh index 11589ce..4bd0812 100644 --- a/scripts/library/parseopts.sh +++ b/scripts/library/parseopts.sh @@ -93,7 +93,6 @@ parseopts() { else OPTRET+=("--$opt") shift - continue 2 fi ;; 1) @@ -111,7 +110,7 @@ parseopts() { OPTRET=(--) return 1 fi - continue 2 + continue ;; 254) # ambiguous option -- error was reported for us by longoptmatch() -- 1.8.0.3

1 1