- Pacman-dev - lists.archlinux.org

[pacman-dev] mailman test
by BA lanfest 22 Dec '12

22 Dec '12

testing

1 0

[pacman-dev] [PATCH 1/4] pacdiff: color filename and mention what we found
by Florian Pritz 19 Dec '12

19 Dec '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- contrib/pacdiff.sh.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index bfafda2..5797fef 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -62,7 +62,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 "\e[0;32m%s\e[0m" "$file_type";; + pacorig) printf "\e[0;33m%s\e[0m" "$file_type";; + pacsave) printf "\e[0;34m%s\e[0m" "$file_type";; + esac + + printf " found for \e[0;35m%s\e[0m\n" "$file" if [ ! -f "$file" ]; then echo " $file does not exist" rm -i "$pacfile" -- 1.8.0.2

2 4

[pacman-dev] [PATCH 1/4] Remove Cygwin support
by Allan McRae 16 Dec '12

16 Dec '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 5 ----- src/pacman/pacman.c | 5 ++--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index faa0792..122f387 100644 --- a/configure.ac +++ b/configure.ac @@ -309,10 +309,6 @@ case "${host_os}" in SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" ;; - cygwin*) - host_os_cygwin=yes - AC_DEFINE([CYGWIN], [1], [Define if host OS is cygwin]) - ;; darwin*) host_os_darwin=yes INODECMD="/usr/bin/stat -f '%i %n'" @@ -324,7 +320,6 @@ case "${host_os}" in ;; esac -AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(INODECMD) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 29a489b..e3293a0 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -758,8 +758,7 @@ int main(int argc, char *argv[]) size_t i; struct sigaction new_action, old_action; const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV }; -#if defined(HAVE_GETEUID) && !defined(CYGWIN) - /* geteuid undefined in CYGWIN */ +#if defined(HAVE_GETEUID) uid_t myuid = geteuid(); #endif @@ -881,7 +880,7 @@ int main(int argc, char *argv[]) config->logmask &= ~ALPM_LOG_WARNING; } -#if defined(HAVE_GETEUID) && !defined(CYGWIN) +#if defined(HAVE_GETEUID) /* check if we have sufficient permission for the requested operation */ if(myuid > 0 && needs_root()) { pm_printf(ALPM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n")); -- 1.8.0.2

2 3

[pacman-dev] [PATCH 1/2] Log if dbs are up to date, synced, or failed to sync
by Olivier Brunel 16 Dec '12

16 Dec '12

Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- This simply adds information about what was actually done, I left the "synchronizing" message in case it's used by external tools (e.g. pacmatic). src/pacman/sync.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 532a667..f8fce7f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -331,12 +331,18 @@ static int sync_synctree(int level, alpm_list_t *syncs) int ret = alpm_db_update((level < 2 ? 0 : 1), db); if(ret < 0) { + alpm_logaction(config->handle, "failed to update %s (%s)\n", + alpm_db_get_name(db), alpm_strerror(alpm_errno(config->handle))); pm_printf(ALPM_LOG_ERROR, _("failed to update %s (%s)\n"), alpm_db_get_name(db), alpm_strerror(alpm_errno(config->handle))); } else if(ret == 1) { + alpm_logaction(config->handle, "%s is up to date\n", + alpm_db_get_name(db)); printf(_(" %s is up to date\n"), alpm_db_get_name(db)); success++; } else { + alpm_logaction(config->handle, "synchronized %s\n", + alpm_db_get_name(db)); success++; } } -- 1.8.0.2

3 9

[pacman-dev] [PATCH] Added a -n option to repo-add to only add new packages (v2)
by dangets＠gmail.com 16 Dec '12

16 Dec '12

From: Danny George <dangets(a)gmail.com> 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. Updated man page and slight tweak per suggestion Allan McRae Signed-off-by: Danny George <dangets(a)gmail.com> --- doc/repo-add.8.txt | 4 ++++ scripts/repo-add.sh.in | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 79b5a7e..91f3ac6 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -68,6 +68,10 @@ repo-add Options specified packages. This is useful for creating databases listing all files in a given sync repository for tools that may use this information. +*-n, \--new*:: + Only add packages that are not already in the database. Warnings will be + printed upon detection of existing packages, but they will not be re-added. + See Also -------- linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8] diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 5a3bf23..3e18a1a 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -30,6 +30,7 @@ declare -r confdir='@sysconfdir@' QUIET=0 DELTA=0 +ONLYADDNEW=0 WITHFILES=0 SIGN=0 VERIFY=0 @@ -55,6 +56,7 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "\n" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -d, --delta generate and add delta for package update\n")" + printf -- "$(gettext " -n, --new only add packages that are not already in the database\n")" printf -- "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n")" @@ -290,6 +292,9 @@ db_write_entry() { if [[ -d $tmpdir/tree/$pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" + if (( ONLYADDNEW )); then + return 0; + fi else if (( DELTA )); then pkgentry=$(find_pkgentry "$pkgname") @@ -603,6 +608,7 @@ while (( $# )); do case $1 in -q|--quiet) QUIET=1;; -d|--delta) DELTA=1;; + -n|--new) ONLYADDNEW=1;; -f|--files) WITHFILES=1;; -s|--sign) check_gpg -- 1.8.0.1

3 2

[pacman-dev] [PATCH] [makepkg] Print out new version on change
by William Giokas 16 Dec '12

16 Dec '12

When building sources that have a pkgver() function, makepkg prints: ==> Making package: $pkgname $pkgver-$pkgrel $(date) which, normally, works out fine. Only problem is using vcs sources with a pkgver() function, it will print out the old version. So, if there is an update, the user won't know what version the package changed to till after the build. This patch adds in a line that prints out ==> Updated version from $oldversion to $newversion if the version has changed. Signed-off-by: William Giokas <1007380(a)gmail.com> --- scripts/makepkg.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2fe6605..ff7296f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -699,6 +699,7 @@ update_pkgver() { if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" + msg "$(gettext "Updated version from %s to %s")" $pkgver $newpkgver source "$BUILDFILE" else warning "$(gettext "%s is not writeable -- pkgver will not be updated")" \ -- 1.8.0.1.350.gee26a6e

2 9

[pacman-dev] [PATCH] Update Doxyfile
by Allan McRae 16 Dec '12

16 Dec '12

A few parameters were outdated and this produced warnings from Doxygen Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/Doxyfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/Doxyfile b/doc/Doxyfile index 6423a35..4e64534 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -1,4 +1,4 @@ -# Doxyfile 1.7.5.1 +# Doxyfile 1.8.2 #--------------------------------------------------------------------------- # Project related configuration options @@ -37,11 +37,14 @@ INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 4 ALIASES = +TCL_SUBST = OPTIMIZE_OUTPUT_FOR_C = YES OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO EXTENSION_MAPPING = +MARKDOWN_SUPPORT = YES +AUTOLINK_SUPPORT = YES BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO @@ -52,11 +55,13 @@ INLINE_GROUPED_CLASSES = NO INLINE_SIMPLE_STRUCTS = NO TYPEDEF_HIDES_STRUCT = NO SYMBOL_CACHE_SIZE = 0 +LOOKUP_CACHE_SIZE = 0 #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- EXTRACT_ALL = NO EXTRACT_PRIVATE = NO +EXTRACT_PACKAGE = NO EXTRACT_STATIC = NO EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = NO @@ -84,7 +89,6 @@ GENERATE_DEPRECATEDLIST= YES ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO SHOW_FILES = YES SHOW_NAMESPACES = YES FILE_VERSION_FILTER = @@ -145,13 +149,14 @@ HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = +HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = HTML_COLORSTYLE_HUE = 220 HTML_COLORSTYLE_SAT = 100 HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = YES -HTML_ALIGN_MEMBERS = YES HTML_DYNAMIC_SECTIONS = NO +HTML_INDEX_NUM_ENTRIES = 100 GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project @@ -175,9 +180,8 @@ QHG_LOCATION = GENERATE_ECLIPSEHELP = NO ECLIPSE_DOC_ID = org.doxygen.Project DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = NO -USE_INLINE_TREES = NO +ENUM_VALUES_PER_LINE = 4 TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 @@ -280,6 +284,7 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES GROUP_GRAPHS = YES UML_LOOK = NO +UML_LIMIT_NUM_FIELDS = 10 TEMPLATE_RELATIONS = NO INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES -- 1.8.0.2

1 0

[pacman-dev] [PATCH] Fixed missing asciidoc id
by dangets＠gmail.com 16 Dec '12

16 Dec '12

From: Danny George <dangets(a)gmail.com> Generated webpage contained dead links to section 'Package and Database Signature Checking' --- doc/pacman.conf.5.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index a9c5db3..b7049e1 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -226,6 +226,7 @@ even be used for different architectures. Set the signature verification level for this repository. For more information, see <<SC,Package and Database Signature Checking>> below. +[[SC]] Package and Database Signature Checking --------------------------------------- The 'SigLevel' directive is valid in both the `[options]` and repository -- 1.8.0.1

2 1

[pacman-dev] [PATCH 2/2] doc: Fix section link in pacman-key man page
by Allan McRae 16 Dec '12

16 Dec '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman-key.8.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index f235dcd..8ef749b 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -86,7 +86,7 @@ Operations *\--populate*:: Reload the default keys from the (optionally provided) keyrings in +{pkgdatadir}/keyrings+. For more information, see - <<SC,Providing a Keyring for Import>> below. + <<PK,Providing a Keyring for Import>> below. *-u, \--updatedb*:: Equivalent to '\--check-trustdb' in GnuPG. This operation can be specified with @@ -115,7 +115,7 @@ Options keyserver if one was not already configured. -Providing a Keyring for Import +Providing a Keyring for Import[[PK]] ------------------------------ A distribution or other repository provided may want to provide a set of PGP keys used in the signing of its packages and repository databases that can -- 1.8.0.2

1 0

[pacman-dev] [PATCH 1/3] Fix pacman's log messages not being translated
by Olivier Brunel 15 Dec '12

15 Dec '12

Log messages should be translated as well. (Those from ALPM already are.) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/callback.c | 6 +++--- src/pacman/pacman.c | 2 +- src/pacman/sync.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 01c6b61..c56c96a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -176,7 +176,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) } break; case ALPM_EVENT_ADD_DONE: - alpm_logaction(config->handle, "installed %s (%s)\n", + alpm_logaction(config->handle, _("installed %s (%s)\n"), alpm_pkg_get_name(data1), alpm_pkg_get_version(data1)); display_optdepends(data1); @@ -187,7 +187,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) } break; case ALPM_EVENT_REMOVE_DONE: - alpm_logaction(config->handle, "removed %s (%s)\n", + alpm_logaction(config->handle, _("removed %s (%s)\n"), alpm_pkg_get_name(data1), alpm_pkg_get_version(data1)); break; @@ -197,7 +197,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) } break; case ALPM_EVENT_UPGRADE_DONE: - alpm_logaction(config->handle, "upgraded %s (%s -> %s)\n", + alpm_logaction(config->handle, _("upgraded %s (%s -> %s)\n"), alpm_pkg_get_name(data1), alpm_pkg_get_version(data2), alpm_pkg_get_version(data1)); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 1ca746d..7db46d7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -743,7 +743,7 @@ static void cl_to_log(int argc, char *argv[]) *p++ = ' '; } strcpy(p, argv[i]); - alpm_logaction(config->handle, "Running '%s'\n", cl_text); + alpm_logaction(config->handle, _("Running '%s'\n"), cl_text); free(cl_text); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 532a667..938f9d6 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -787,7 +787,7 @@ static int sync_trans(alpm_list_t *targets) if(config->op_s_upgrade) { printf(_(":: Starting full system upgrade...\n")); - alpm_logaction(config->handle, "starting full system upgrade\n"); + alpm_logaction(config->handle, _("starting full system upgrade\n")); if(alpm_sync_sysupgrade(config->handle, config->op_s_upgrade >= 2) == -1) { pm_printf(ALPM_LOG_ERROR, "%s\n", alpm_strerror(alpm_errno(config->handle))); trans_release(); @@ -954,7 +954,7 @@ int pacman_sync(alpm_list_t *targets) if(config->op_s_sync) { /* grab a fresh package list */ printf(_(":: Synchronizing package databases...\n")); - alpm_logaction(config->handle, "synchronizing package lists\n"); + alpm_logaction(config->handle, _("synchronizing package lists\n")); if(!sync_synctree(config->op_s_sync, sync_dbs)) { return 1; } -- 1.8.0.2

6 12