- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Treat info pages like man pages
by Allan McRae 12 Aug '08

12 Aug '08

As far a package building is concerned, info pages need to be treated in the same fashion as man pages in that they both can be compressed. This separates them from other forms of documentation and so it makes sense to make that distinction within makepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 6 +++--- doc/makepkg.conf.5.txt | 6 +++--- etc/makepkg.conf.in | 2 +- scripts/makepkg.sh.in | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 0b1ce64..cf6eb23 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -181,8 +181,8 @@ similar to `$_basekernver`. disable this option. *docs*;; - Save doc and info directories. If you wish to delete doc and - info directories, specify `!docs` in the array. + Save doc directories. If you wish to delete doc directories, + specify `!docs` in the array. *libtool*;; Leave libtool (.la) files in packages. Specify `!libtool` to @@ -192,7 +192,7 @@ similar to `$_basekernver`. Leave empty directories in packages. *zipman*;; - Compress man pages with gzip. + Compress man and info pages with gzip. *ccache*;; Allow the use of ccache during build. More useful in its negative diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 8b39c46..57b229f 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -110,8 +110,8 @@ Options option. *docs*;; - Save doc and info directories. If you wish to delete doc and info - directories, specify `!docs' in the array. + Save doc directories. If you wish to delete doc directories, specify + `!docs' in the array. *libtool*;; Leave libtool (.la) files in packages. Specify `!libtool' to remove @@ -121,7 +121,7 @@ Options Leave empty directories in packages. *zipman*;; - Compress man pages with gzip. + Compress man and info pages with gzip. **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 0241a8e..057f563 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -72,7 +72,7 @@ OPTIONS=(strip docs libtool emptydirs zipman) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) #-- Info and doc directories to remove (if option set correctly above) -DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc}) +DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) #-- Directories to be searched for the strip option (if option set correctly above) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c5dbed9..a665ba7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -679,16 +679,16 @@ tidy_install() { msg "$(gettext "Tidying install...")" if [ "$(check_option docs)" = "n" ]; then - msg2 "$(gettext "Removing info/doc files...")" + msg2 "$(gettext "Removing doc files...")" #fix flyspray bug #5021 rm -rf ${DOC_DIRS[@]} fi if [ "$(check_option zipman)" = "y" ]; then - msg2 "$(gettext "Compressing man pages...")" + msg2 "$(gettext "Compressing man and info pages...")" local manpage mandirs ext file link hardlinks hl - mandirs="usr/man usr/share/man usr/local/man usr/local/share/man opt/*/man" - find ${mandirs} -type f 2>/dev/null | + mandirs=({usr{,/local}{,/share},opt/*}/{man,info}) + find ${mandirs[@]} -type f 2>/dev/null | while read manpage ; do # check file still exists (potentially compressed with hard link) if [ -f ${manpage} ]; then @@ -696,7 +696,7 @@ tidy_install() { file="${manpage##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then # update symlinks to this manpage - find ${mandirs} -lname "$file" 2>/dev/null | + find ${mandirs[@]} -lname "$file" 2>/dev/null | while read link ; do rm -f "$link" ln -sf "${file}.gz" "${link}.gz" @@ -704,7 +704,7 @@ tidy_install() { # find hard links and remove them # the '|| true' part keeps the script from bailing if find returned an # error, such as when one of the man directories doesn't exist - hardlinks="$(find ${mandirs} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true + hardlinks="$(find ${mandirs[@]} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true for hl in ${hardlinks}; do rm -f "${hl}"; done -- 1.5.6.5

1 0

[pacman-dev] sourcing /etc/profile and set -e bug in makepkg
by Allan McRae 11 Aug '08

11 Aug '08

So, despite me assuring Dan that nothing could possibly go wrong, the commit to source /etc/profile rather than individual files in /etc/profile.d (http://projects.archlinux.org/?p=pacman.git;a=commitdiff;h=0e0a8461) has caused a problem. See FS#11179 (http://bugs.archlinux.org/task/11179) for more details. Xavier and I are stuck as to what is actually causing this problem. The guilty script being sourced is /etc/bash_completion.d/modules and specifically the "type modules" statement at the top. What we don't understand is that this file is being sourced under both methods and why it is causing problems only with one. Even more confusing, the way it gets sourced in /etc/profile is essentially the way makepkg used to do it (loop over /etc/profile.d/* files). A work-around is to add "set +e" and "set -e" on either side of the "source /etc/profile" call. That is probably a good idea anyway as that sourcing should probably not inherit the "-e" property. But can anyone explain why we now need this? Very confused, Allan

2 3

[pacman-dev] Pacman only tries to resolve with the primary nameserver
by Teran McKinney 10 Aug '08

10 Aug '08

Hey, While revamping eleutherNet's ( http://eleuther.net ) DNS setup and giving it external IPv6 connectability, I found Pacman's sync server resolving method to be problematic during testing. Pacman 3.2.0 seems to only try the primary nameserver when resolving a server to sync to. The common (though not completely ideal) practice for using internal domains in VPNs is making the internal DNS server your primary and keeping your normal nameserver as secondary for resolving "real" domains after the VPN's DNS server fails to resolve the domain. Almost all applications will try to resolve through the whole nameserver list if there are no matches initially, but Pacman does not seem to.do this. Pacman is an awesome package manager, but having either optional or standard functionality for this would be nice. Thanks, Teran (sega01)

2 1

[pacman-dev] [PATCH] Fix segfault on x86_64 when using UseSyslog
by Dan McGee 10 Aug '08

10 Aug '08

Due to differences in handling va_list between i686 and x86_64, this bug can only be seen on x86_64. va_list usage is not allowed but we had been getting away with it. See http://lists.opensuse.org/opensuse-programming/2008-02/msg00005.html for details and explanation. This fixes FS#11096. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index c38dfb5..2847db7 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -25,6 +25,7 @@ #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include <string.h> #include <fcntl.h> #include <unistd.h> @@ -401,12 +402,18 @@ int _alpm_rmrf(const char *path) return(0); } -int _alpm_logaction(unsigned short usesyslog, FILE *f, const char *fmt, va_list args) +int _alpm_logaction(unsigned short usesyslog, FILE *f, + const char *fmt, va_list args) { int ret = 0; if(usesyslog) { - vsyslog(LOG_WARNING, fmt, args); + /* we can't use a va_list more than once, so we need to copy it + * so we can use the original when calling vfprintf below. */ + va_list args_syslog; + va_copy(args_syslog, args); + vsyslog(LOG_WARNING, fmt, args_syslog); + va_end(args_syslog); } if(f) { -- 1.5.6.5

4 4

Re: [pacman-dev] [arch-dev-public] [signoff] pacman 3.2.0
by Dan McGee 10 Aug '08

10 Aug '08

On Thu, Jul 31, 2008 at 2:01 AM, Eric Belanger <belanger(a)astro.umontreal.ca> wrote: > On Wed, 30 Jul 2008, Dan McGee wrote: > >> Pacman 3.2.0 is in testing for i686. Please signoff. Changes outlined >> here: http://projects.archlinux.org/?p=pacman.git;a=blob;f=NEWS >> > > When building mythbrowser, I noticed that makepkg now fails when there is an > '?' in the sources, e.g. > source=("http://www.mythtv.org/modules.php?name=Downloads&d_op=getit&lid=136&foo=/my…") > > Removing the double quotes and escaping the characters doesn't work. > > The error message: > > ==> ERROR: There is no agent set up to handle URLs. Check > /etc/makepkg.conf. > Aborting... > > Not a showstopper as the source can be downloaded maunally in the build dir. > I'll try to look into it further tomorrow. We have a regression here, and it is actually bigger than it looks at first sight. Can you file a bug report for this? Tracing the code shows that %o and %u are never even used right now, as they don't make it all the way through to the download stage. -Dan

9 20

Re: [pacman-dev] Bugs in pacman and yaourt bash completion
by Dan McGee 09 Aug '08

09 Aug '08

On Sat, Aug 9, 2008 at 4:38 PM, Jim Pryor <jim(a)jimpryor.net> wrote: > Hi, I've found a bug in the /etc/bash_completion.d/{pacman,yaourt} > files. > > The bug is in the function _available_groups, which is included in both > files. The second-to-last line of the function (line 70 in pacman, line > 71 in yaourt) looks like this: > > available_groups=$(...do sed '/%GROUPS%/...) > > That sed should have a '-n' flag. CCing to pacman-dev. Can you open a bug for this instead of a private email, or at least email the mailing list next time? Thanks.

1 0

Re: [pacman-dev] [arch-dev-public] info pages
by Allan McRae 09 Aug '08

09 Aug '08

Eric Belanger wrote: > On Wed, 6 Aug 2008, Allan McRae wrote: > >> Allan McRae wrote: >>> Hi all, >>> >>> Just a heads up with something I have remembered while packaging >>> with the new pacman release. Including docs is the default in >>> makepkg.conf now so if there is a large amount of documentation you >>> will want to add a !docs to the PKGBUILD options. Also, every >>> package that needs the --mandir configure flag will probably need >>> and --infodir one too. An annoying number of packages with info >>> pages install a /usr/share/info/dir file so that will need removed >>> at the end of the PKGBUILD. >>> >> >> I have discovered that at least one package has to have a >> /usr/share/info/dir file or the info command complains that it is >> missing. It seems that ideally all packages with info directories >> should add/remove entries in this file when installing/removing the >> package, although calling "info <something not in dir file>" seems to >> work, but I might be missing something.... The point is that adding >> info files properly involves an install file with "install-info" >> commands for each info page in the package. Isn't including docs fun! >> >> Allan >> > > The emacs package already does this. The emacs.install file could be > used as a template for this info stuff. > A template based in that is making its way into the prototypes found in the ABS packages which I am going to make a release of soon. CC: pacman-dev - We should also automatically compress the info files like we do the man pages. Allan

2 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.0-8-g57bd897
by dan＠archlinux.org 09 Aug '08

09 Aug '08

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 57bd8974c73571d827617f4df0a6917f13696493 (commit) via d8f8a126658a25fdad5e9fb00b1b0838a7e93c68 (commit) via 57393eb730641ca912a421b70897fcd289c44b21 (commit) via f201f107dbee25294aa7c7f1139bf521e6afa267 (commit) from 72c5a298a3ee0f18019010ef2eb43da654ec25f8 (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 57bd8974c73571d827617f4df0a6917f13696493 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 9 15:54:29 2008 +1000 Fix creation of source package with local source files Fixes FS#11149. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8f8a126658a25fdad5e9fb00b1b0838a7e93c68 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 8 22:18:00 2008 -0500 Fix segfault on x86_64 when using UseSyslog Due to differences in handling va_list between i686 and x86_64, this bug can only be seen on x86_64. va_list usage is not allowed but we had been getting away with it. See http://lists.opensuse.org/opensuse-programming/2008-02/msg00005.html for details and explanation. This fixes FS#11096. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 57393eb730641ca912a421b70897fcd289c44b21 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 8 13:45:46 2008 -0500 Fix variable naming issues in _alpm_db_cmp When this function got a rewrite in commit f43805d875, argument and variable names got a bit mixed up when separating the casts from the strcmp operation. Fix the mixup which also fixes a possible segfault when this function is called. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f201f107dbee25294aa7c7f1139bf521e6afa267 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 7 13:11:20 2008 -0500 doc: allow asciidoc to format the note By doing the bolding manually, it doesn't look as cool in the HTML generated manpages. Let asciidoc do the work. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.txt | 5 +++-- lib/libalpm/db.c | 4 ++-- lib/libalpm/db.h | 2 +- lib/libalpm/util.c | 11 +++++++++-- scripts/makepkg.sh.in | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.0-8-g57bd897
by dan＠archlinux.org 09 Aug '08

09 Aug '08

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 57bd8974c73571d827617f4df0a6917f13696493 (commit) via d8f8a126658a25fdad5e9fb00b1b0838a7e93c68 (commit) via 57393eb730641ca912a421b70897fcd289c44b21 (commit) via f201f107dbee25294aa7c7f1139bf521e6afa267 (commit) from 72c5a298a3ee0f18019010ef2eb43da654ec25f8 (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 57bd8974c73571d827617f4df0a6917f13696493 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 9 15:54:29 2008 +1000 Fix creation of source package with local source files Fixes FS#11149. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8f8a126658a25fdad5e9fb00b1b0838a7e93c68 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 8 22:18:00 2008 -0500 Fix segfault on x86_64 when using UseSyslog Due to differences in handling va_list between i686 and x86_64, this bug can only be seen on x86_64. va_list usage is not allowed but we had been getting away with it. See http://lists.opensuse.org/opensuse-programming/2008-02/msg00005.html for details and explanation. This fixes FS#11096. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 57393eb730641ca912a421b70897fcd289c44b21 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 8 13:45:46 2008 -0500 Fix variable naming issues in _alpm_db_cmp When this function got a rewrite in commit f43805d875, argument and variable names got a bit mixed up when separating the casts from the strcmp operation. Fix the mixup which also fixes a possible segfault when this function is called. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f201f107dbee25294aa7c7f1139bf521e6afa267 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 7 13:11:20 2008 -0500 doc: allow asciidoc to format the note By doing the bolding manually, it doesn't look as cool in the HTML generated manpages. Let asciidoc do the work. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.txt | 5 +++-- lib/libalpm/db.c | 4 ++-- lib/libalpm/db.h | 2 +- lib/libalpm/util.c | 11 +++++++++-- scripts/makepkg.sh.in | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix creation of source package with local source files
by Allan McRae 09 Aug '08

09 Aug '08

Fixes FS#11149. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3604d10..c5dbed9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -957,7 +957,7 @@ create_srcpackage() { local file=$(strip_url "$netfile") if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" - ln -s $netfile "${srclinks}/${pkgname}" + ln -s "${startdir}/$netfile" "${srclinks}/${pkgname}" elif [ "$SOURCEONLY" = "2" -a -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" ln -s "$SRCDEST/$file" "${srclinks}/${pkgname}/" -- 1.5.6.5

1 0