- Arch-dev-public - lists.archlinux.org

[arch-dev-public] [PATCH] Use a wrapper script to support different compression types
by Dan McGee 24 Feb '10

24 Feb '10

From: Pierre Schmitz <pierre(a)archlinux.de> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- namcap | 27 +++++++++++++++++++++++++++ namcap.py | 2 +- pacman.py | 2 +- setup.py | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 namcap diff --git a/namcap b/namcap new file mode 100644 index 0000000..f262985 --- /dev/null +++ b/namcap @@ -0,0 +1,27 @@ +#!/bin/bash + +args='' +tmp=$(mktemp -d /tmp/namcap.XXXXXXXXXX) + +for arg in "${@}"; do + if echo "${arg}" | grep -q -E "^.+\.pkg\.tar\..+$" && [ -f "${arg}" ]; then + + case "${arg##*.}" in + gz|z|Z) cmd='gzip' ;; + bz2|bz) cmd='bzip2' ;; + xz) cmd='xz' ;; + *) echo 'Unsupported compression'; exit 1;; + esac + + tar="${tmp}/$(basename "${arg%.*}")" + $cmd -dcf "${arg}" > "${tar}" + + args="${args} ${tar}" + else + args="${args} ${arg}" + fi +done + +python -m namcap ${args} + +rm -rf "${tmp}" diff --git a/namcap.py b/namcap.py index 19c6ceb..18dfbc8 100755 --- a/namcap.py +++ b/namcap.py @@ -228,7 +228,7 @@ for package in packages: print "Error: Problem reading " + package usage() - if package[-7:] == '.tar.gz': + if package[-4:] == '.tar': process_realpackage(package, active_modules) elif package[-8:] == 'PKGBUILD': process_pkgbuild(package, active_modules) diff --git a/pacman.py b/pacman.py index e4b6cf3..c56d399 100644 --- a/pacman.py +++ b/pacman.py @@ -66,7 +66,7 @@ def load(package, root=None): if root == None: root = pacmandb # We know it's a local package - if package[-7:] == '.tar.gz': + if package[-4:] == '.tar': pkgtar = tarfile.open(package, "r") if not pkgtar: return None diff --git a/setup.py b/setup.py index 66ee2ba..754ee72 100755 --- a/setup.py +++ b/setup.py @@ -10,6 +10,6 @@ setup(name="namcap", description="Pacman package analyzer", author="Jason Chu", author_email="jason(a)archlinux.org", - py_modules=["pacman"], packages=["Namcap"], scripts=["namcap.py", 'parsepkgbuild'],data_files =DATAFILES) + py_modules=["pacman", "namcap"], packages=["Namcap"], scripts=['parsepkgbuild', 'namcap'],data_files =DATAFILES) # vim: set ts=4 sw=4 noet: -- 1.7.0

2 3

[arch-dev-public] New dbscripts are now in /arch
by Thomas Bächler 23 Feb '10

23 Feb '10

Pierre's dbscripts changes are now in /arch. If you want to create xz or bzip2 packages, just change PKGEXT in /etc/makepkg.conf accordingly (although bzip2 is slower and has worse compression than xz, so we probably don't want to use it). However, namcap has not been fixed to my knowledge. The workaround we agreed on was to unxz the tar file and let namcap open the uncompressed version. I think Hugo was the namcap maintainer now, but he is inactive. Who has enough python knowledge to fix this? On another note, last time I checked the dbscripts on sigurd were quite out of date, can anyone take care of that?

5 7

[arch-dev-public] [signoff] netcfg v2.5.4
by James Rayner 23 Feb '10

23 Feb '10

Mostly bugfixes and some minor features that are isolated or trivial netcfg v2.5.4 - Bridge connection example - Add simple bridging support - Add adjustable netmask to IP='static' netcfg v2.5.3 - Add missing include. FS#18411 - Fix FS#18391, FS#18385, broken rfkill, handle hard rfkill situations more appropriately - Modify examples to prevent quoting issues as illustrated by FS#18405 - Handle undefined wireless SECURITY, make example explicit

3 3

[arch-dev-public] [signoff] wpa_actiond 1.1-1
by Thomas Bächler 23 Feb '10

23 Feb '10

This version fixes a race condition when a disconnect event is followed directly by a connect event. In netcfg, it would cause that dhcpcd is not started for the new network, so you end up without connectivity. Please sign off.

3 3

[arch-dev-public] [signoff] heimdal 1.3.1-3
by Ronald van Haren 23 Feb '10

23 Feb '10

please signoff for both architectures. Ronald Changes: built against com_right_rI() function now provided with the latest e2fsprogs package

3 2

[arch-dev-public] [signoff] zlib 1.2.3.9-1
by Pierre Schmitz 23 Feb '10

23 Feb '10

Hi all, this should be the rc for 1.2.4. Changelog follows: - Expunge gzio.c - Move as400 build information to old - Fix updates in contrib/minizip and contrib/vstudio - Add const to vsnprintf test in configure to avoid warnings [Weigelt] - Delete zconf.h (made by configure) [Weigelt] - Change zconf.in.h to zconf.h.in per convention [Weigelt] - Check for NULL buf in gzgets() - Return empty string for gzgets() with len == 1 (like fgets()) - Fix description of gzgets() in zlib.h for end-of-file, NULL return - Update minizip to 1.1 [Vollant] - Avoid MSVC loss of data warnings in gzread.c, gzwrite.c - Note in zlib.h that gzerror() should be used to distinguish from EOF - Remove use of snprintf() from gzlib.c - Fix bug in gzseek() - Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant] - Fix zconf.h generation in CMakeLists.txt [Lowman] - Improve comments in zconf.h where modified by configure -- Pierre Schmitz, https://users.archlinux.de/~pierre

3 2

[arch-dev-public] [signoff] ndiswrapper/ndiswrapper-utils-1.56-1
by Tobias Powalowski 23 Feb '10

23 Feb '10

Hi bump to latest version. Please signoff both arches. greetings tpowa -- Tobias Powalowski Archlinux Developer & Package Maintainer (tpowa) http://www.archlinux.org tpowa(a)archlinux.org

1 1

[arch-dev-public] [PATCH 2/2] Accept any *.pkg.tar.* package file name
by Pierre Schmitz 23 Feb '10

23 Feb '10

With this patch packages with different compressions are accepted. It is ensured that one cannot have the same package with different compression extensions. The new functions getpkgfile{,s} are used to sanitize globed filenames. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- config | 2 +- db-functions | 28 ++++++++++++++++++++++++++++ db-move | 8 +++----- db-update | 10 +++++----- 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/config b/config index 92def37..6343bc0 100644 --- a/config +++ b/config @@ -12,7 +12,7 @@ TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) BUILDSCRIPT="PKGBUILD" DBEXT=".db.tar.gz" -PKGEXT=".pkg.tar.gz" +PKGEXT=".pkg.tar.*" SRCEXT=".src.tar.gz" # Allowed licenses: get sourceballs only for licenses in this array diff --git a/db-functions b/db-functions index a4cffd7..915d011 100644 --- a/db-functions +++ b/db-functions @@ -87,6 +87,34 @@ getpkgver() { echo "$_ver" } +getpkgfile() { + if [[ ${#} -ne 1 ]]; then + echo 'ERROR: No canonical package found!' + exit 1 + elif [ ! -f "${1}" ]; then + echo "ERROR: Package ${1} not found!" + exit 1 + fi + + return ${1} +} + +getpkgfiles() { + if [ ! -z "$(echo ${@%\.*} | sed "s/ /\n/g" | sort | uniq -D)" ]; then + echo 'ERROR: Duplicate packages found!' + exit 1 + fi + + for f in ${@}; do + if [ ! -f "${f}" ]; then + echo "ERROR: Package ${f} not found!" + exit 1 + fi + done + + return ${@} +} + check_pkg_arch () { #check_pkg_arch pkgfile arch local _arch _arch="$(_grep_pkginfo "$1" "^arch")" diff --git a/db-move b/db-move index efd54e0..d405ef3 100755 --- a/db-move +++ b/db-move @@ -59,9 +59,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then for i in ${pkgname[@]}; do _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" - if [ ! -f "$ftppath_from/${_arch}/$_pkgfile" ]; then - die "error: package file '$_pkgfile' not found in repo '$repofrom'" - fi + getpkgfile "$ftppath_from/${_arch}/"$_pkgfile done if [ -d "$packagebase/repos/$svnrepo_to" ]; then @@ -101,13 +99,13 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then for i in ${pkgname[@]}; do _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" - /bin/cp "$ftppath_from/$architecture/$_pkgfile" . + /bin/cp $(getpkgfile "$ftppath_from/$architecture/"$_pkgfile) . /usr/bin/repo-add -q "$repoto$DBEXT" $_pkgfile || die "Error in repo-add $_pkgfile" done #use '*' to move the old DB too mv $repoto$DBEXT* $ftppath_to/$architecture for i in ${pkgname[@]}; do - _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" + _pkgfile=$(getpkgfile "$i-$pkgver-$pkgrel-$_arch"$PKGEXT) if [ "${_arch}" == "any" ]; then mv ${_pkgfile} $ftppath_to/any ln -s ../any/${_pkgfile} $ftppath_to/$architecture/ diff --git a/db-update b/db-update index 17d3b71..fc2bac6 100755 --- a/db-update +++ b/db-update @@ -89,7 +89,7 @@ done # Process architecture-independent packages first. if [ -d "$stagedir" ]; then - ANYPKGS="$(/bin/ls $stagedir/*-any$PKGEXT 2>/dev/null)" + ANYPKGS="$(getpkgfiles $stagedir/*-any$PKGEXT)" fi mkdir -p $WORKDIR @@ -155,7 +155,7 @@ for current_arch in ${ARCHES[@]}; do to_add="" if [ -d "$stagedir" ]; then - ADDPKGS="$(/bin/ls $stagedir/*-${current_arch}$PKGEXT 2>/dev/null)" + ADDPKGS="$(getpkgfiles $stagedir/*-${current_arch}$PKGEXT)" fi if [ -n "$ADDPKGS" -o -n "$ANYPKGS" ]; then @@ -186,7 +186,7 @@ for current_arch in ${ARCHES[@]}; do /usr/bin/svn up -q $_pkgbase if [ -d "$_pkgbase/repos/$svnrepo" ]; then . "$_pkgbase/repos/$svnrepo/$BUILDSCRIPT" - if [ "$_pkgfile" = "$_pkgname-$pkgver-$pkgrel-$current_arch$PKGEXT" ]; then + if echo "$_pkgfile" | grep -q "$_pkgname-$pkgver-$pkgrel-$current_arch"; then to_add="$to_add $pkg" else echo " WARNING: $_pkgfile does not match $BUILDSCRIPT in $svnrepo" @@ -216,7 +216,7 @@ for current_arch in ${ARCHES[@]}; do # if non empty, move all build dirs if [ $(/bin/ls "$WORKDIR/build/" 2>/dev/null | wc -l) != 0 ]; then - if [ $(/bin/ls "$WORKDIR/build/"*-$current_arch$PKGEXT 2>/dev/null | wc -l) != 0 ]; then + if [ $(getpkgfiles "$WORKDIR/build/"*-$current_arch$PKGEXT | wc -l) != 0 ]; then echo "Copying new files to '$ftppath'" for f in "$WORKDIR/build/"*-$current_arch$PKGEXT; do if ! /bin/cp "$f" "$ftppath/"; then @@ -224,7 +224,7 @@ for current_arch in ${ARCHES[@]}; do fi done fi - if [ $(/bin/ls "$WORKDIR/build/"*-any$PKGEXT 2>/dev/null | wc -l) != 0 ]; then + if [ $(getpkgfiles "$WORKDIR/build/"*-any$PKGEXT | wc -l) != 0 ]; then echo "Copying new files to '$ftppath_any' and symlinking" for f in "$WORKDIR/build/"*-any$PKGEXT; do if ! /bin/cp "$f" "$ftppath_any"; then -- 1.6.6.1 -- Pierre Schmitz, https://users.archlinux.de/~pierre

8 22

[arch-dev-public] [signoff] mkinitcpio 0.6.3-1
by Thomas Bächler 22 Feb '10

22 Feb '10

New release, please sign off. It has some bugfixes and a few nice changes under the hood. Shortlog: Benjamin Richter (2): Use only a single loop for searching /sys/block Use $(( )) instead of printf "%d" Thomas Bächler (18): Fix copyright in the README file If we could not mount the real root device, or the init program did not exist on it, bail out instead of panicing Add the "nfs" kernel module with in net hook Do not kill -9 udevd, instead kill -15 and wait for all processes to terminate before continuing Introduce mount handlers Remove the special handling for the default mount procedure, move it into a mount handler (default_mount_handler) Make indentation in two code blocks consistent When use stat -c %D instead of stat -f -c %i for testing if /new_root is a mount point launch_interactive_shell: add "export" for PS1 Improve sanity check: ${init} must be executable Fix NFS backward-compatibility with kinit Fix typo in 01cfe5572f6cfc172dddc013494511a59a7ed85f Cosmetic change: 'msg' function does not support '\n' load-modules.sh: Always use --use-blacklist default_mount_hook: Use major and minor variables instead of a single rootdev variable Allow the second parameter of poll_device to be 0 - this fixes rootdelay=0 poll_device: do not wait for a device to appear if udevd is not running Release 0.6.3

4 3

[arch-dev-public] [signoff] syslog-ng 3.0.4-2
by Paul Mattal 22 Feb '10

22 Feb '10

Please signoff, 1 for each arch. The only difference is that I've added /var/log/crond.log to the logrotate script so that its rotation is now handled when syslog-ng rotates all its logs. The benefit of this is that it's coordinated properly with the HUPping of syslog-ng, which is the actual creator of this log now that dcron logs to syslog. There is an intended overlap here. In order to ensure smooth migration of log rotation, the log will be "double covered" for a while (but logrotate detects this and ignores one of them) until I (shortly) push the dcron 4.4-2 which removes its own logrotate script for /var/log/crond.log. - P

2 2