- Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio][PATCH 1/4] move manpage to section 8
by Dave Reisner 16 Oct '11

16 Oct '11

This is an admin command, not a config file. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Makefile | 14 +++++++------- mkinitcpio.5.txt => mkinitcpio.8.txt | 0 2 files changed, 7 insertions(+), 7 deletions(-) rename mkinitcpio.5.txt => mkinitcpio.8.txt (100%) diff --git a/Makefile b/Makefile index 1a3a815..6ddf2cb 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,10 @@ DIRS = \ /lib/initcpio/hooks \ /lib/initcpio/install \ /lib/initcpio/udev \ - /usr/share/man/man5 + /usr/share/man/man8 DIST_EXTRA = \ - mkinitcpio.5 + mkinitcpio.8 all: doc @@ -43,20 +43,20 @@ install: all install -m644 -t ${DESTDIR}/lib/initcpio/install install/* install -m644 -t ${DESTDIR}/etc/mkinitcpio.d mkinitcpio.d/* - install -m644 mkinitcpio.5 ${DESTDIR}/usr/share/man/man5/mkinitcpio.5 + install -m644 mkinitcpio.8 ${DESTDIR}/usr/share/man/man8/mkinitcpio.8 install -m644 bash-completion ${DESTDIR}/etc/bash_completion.d/mkinitcpio -doc: mkinitcpio.5 -mkinitcpio.5: mkinitcpio.5.txt Makefile +doc: mkinitcpio.8 +mkinitcpio.8: mkinitcpio.8.txt Makefile a2x -d manpage \ -f manpage \ -a mansource=mkinitcpio \ -a manversion=${VERSION} \ - -a manmanual=mkinitcpio mkinitcpio.5.txt + -a manmanual=mkinitcpio mkinitcpio.8.txt clean: ${RM} -r build mkinitcpio-${VERSION} - ${RM} mkinitcpio-${VERSION}.tar.gz mkinitcpio.5 mkinitcpio.5.gz + ${RM} mkinitcpio-${VERSION}.tar.gz mkinitcpio.8 mkinitcpio.8.gz tarball: dist dist: clean doc diff --git a/mkinitcpio.5.txt b/mkinitcpio.8.txt similarity index 100% rename from mkinitcpio.5.txt rename to mkinitcpio.8.txt -- 1.7.7

1 3

[arch-projects] [PATCH] [pyalpm] Don't assume long == int type
by Dan McGee 15 Oct '11

15 Oct '11

We had some bad casting going on here on 64-bit platforms, where the long type and int type are not the same. Add a static helper method to successfully coerce a PyObject into the C int type, checking for overflow along the way. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/options.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/options.c b/src/options.c index 65488fd..208f8de 100644 --- a/src/options.c +++ b/src/options.c @@ -26,6 +26,15 @@ #include "options.h" #include "util.h" +static int PyLong_to_int(PyObject *value, int overflow_val) +{ + int overflow; + long lval = PyLong_AsLongAndOverflow(value, &overflow); + if (overflow != 0) return overflow_val; + if (lval > INT_MAX || lval < INT_MIN) return overflow_val; + return (int)lval; +} + /** Boolean options */ /* @@ -55,7 +64,7 @@ int option_set_usesyslog_alpm(PyObject *self, PyObject *value, void* closure) return -1; } - alpm_option_set_usesyslog(handle, PyLong_AsLong(value)); + alpm_option_set_usesyslog(handle, PyLong_to_int(value, -1)); return 0; } @@ -77,7 +86,7 @@ int option_set_usedelta_alpm(PyObject *self, PyObject *value, void* closure) return -1; } - alpm_option_set_usedelta(handle, PyLong_AsLong(value)); + alpm_option_set_usedelta(handle, PyLong_to_int(value, -1)); return 0; } @@ -98,7 +107,7 @@ int option_set_checkspace_alpm(PyObject *self, PyObject *value, void* closure) PyErr_SetString(PyExc_TypeError, "wrong arguments"); return -1; } - alpm_option_set_checkspace(handle, PyLong_AsLong(value)); + alpm_option_set_checkspace(handle, PyLong_to_int(value, -1)); return 0; } @@ -352,13 +361,9 @@ int pyalpm_fetchcb(const char *url, const char *localpath, int force) { if (!PyLong_Check(result)) { return -1; } else { - int overflow; - long ret = PyLong_AsLongAndOverflow(result, &overflow); + int ret = PyLong_to_int(result, -1); Py_DECREF(result); - if (overflow != 0) - return -1; - else - return ret; + return ret; } } -- 1.7.7

2 1

[arch-projects] [PATCH] [pyalpm] Remove one usage of alpm_list_getdata()
by Dan McGee 14 Oct '11

14 Oct '11

This goes away in 4.1, but it has never been necessary to use as the alpm_list_t struct is fully public and the data member directly accessible. This patch is forward and backward compatible and can safely be applied to the current version. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util.c b/src/util.c index 673cff6..77e3850 100644 --- a/src/util.c +++ b/src/util.c @@ -131,7 +131,7 @@ PyObject* alpmlist_to_pylist(alpm_list_t *prt, PyObject* pybuilder(void*)) } for(tmp = prt; tmp; tmp = alpm_list_next(tmp)) { - stritem = pybuilder(alpm_list_getdata(tmp)); + stritem = pybuilder(tmp->data); if (!stritem) { Py_CLEAR(stritem); return NULL; -- 1.7.7

1 0

[arch-projects] mkarchroot tries to run locale-gen w/o full path
by Peter Schuller 14 Oct '11

14 Oct '11

I'd like to propose this small patch: http://distfiles.scode.org/mlref/arch/mkarchroot-local_gen.diff I don't believe the original would ever be expected to work since chroot doesn't care about PATH. -- / Peter Schuller (@scode on twitter)

2 1

[arch-projects] Released pyalpm 0.5 and namcap 3.2
by Rémy Oudompheng 14 Oct '11

14 Oct '11

Hello, I have released and packaged pyalpm 0.5 and namcap 3.2. pyalpm will raise a warning about incorrect pacman.conf syntax because of a remaining syntax change I have forgotten to take into account. Both should be compatible with pacman 4 and are available in [testing], with some bonus bug fixes. Read NEWS files for more details. Regards, Rémy.

1 0

[arch-projects] [devtools] [PATCH] Honor TMPDIR environment variable
by Lukas Fleischer 13 Oct '11

13 Oct '11

Replace all mktemp(1) invocations that hardcode "/tmp" with `mktemp --tmpdir` and change templates accordingly. Note that "--tmpdir" is GNU-ish which is okay given that we currently support Arch Linux only anyway. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- checkpkg | 2 +- lddd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkpkg b/checkpkg index 94a7529..cde3dc2 100755 --- a/checkpkg +++ b/checkpkg @@ -24,7 +24,7 @@ if [[ $arch == 'any' ]]; then fi STARTDIR=$(pwd) -TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX) +TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX) cd "$TEMPDIR" for _pkgname in "${pkgname[@]}"; do diff --git a/lddd b/lddd index 9695c9b..c011674 100755 --- a/lddd +++ b/lddd @@ -9,7 +9,7 @@ IFS="${IFS}:" libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)" extras= -TEMPDIR=$(mktemp -d /tmp/lddd-script.XXXX) +TEMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX) echo 'Go out and drink some tea, this will take a while :) ...' # Check ELF binaries in the PATH and specified dir trees. -- 1.7.7

1 0

[arch-projects] [devtools] [PATCH 1/4] finddeps: Proper quoting, use double brackets
by Lukas Fleischer 13 Oct '11

13 Oct '11

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- finddeps | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/finddeps b/finddeps index ded7a93..0d59634 100755 --- a/finddeps +++ b/finddeps @@ -3,7 +3,10 @@ # finddeps - find packages that depend on a given depname # -if [ "$1" = '' ]; then +match=$1 +tld=$(pwd) + +if [[ -z $match ]]; then echo 'usage: finddeps <depname>' echo '' echo 'Find packages that depend on a given depname.' @@ -12,35 +15,26 @@ if [ "$1" = '' ]; then exit 0 fi -match=$1 -tld=$(pwd) - -for d in $(find . -type d); do - cd $d - if [ -f PKGBUILD ]; then +for d in "$(find . -type d)"; do + cd "$d" + if [[ -f PKGBUILD ]]; then unset pkgname depends makedepends . PKGBUILD for dep in "${depends[@]}"; do # lose the version comparator, if any depname=${dep%%[<>=]*} - if [ "$depname" = "$match" ]; then - echo "$d (depends)" - fi + [[ $depname = $match ]] && echo "$d (depends)" done for dep in "${makedepends[@]}"; do # lose the version comparator, if any depname=${dep%%[<>=]*} - if [ "$depname" = "$match" ]; then - echo "$d (makedepends)" - fi + [[ $depname = $match ]] && echo "$d (makedepends)" done for dep in "${optdepends[@]/:*}"; do # lose the version comaparator, if any depname=${dep%%[<>=]*} - if [ "$depname" = "$match" ]; then - echo "$d (optdepends)" - fi + [[ $depname = $match ]] && echo "$d (optdepends)" done fi - cd $tld + cd "$tld" done -- 1.7.7

1 3

[arch-projects] [devtools] [PATCH] archrelease: Fix SVN error when repository is empty
by Lukas Fleischer 12 Oct '11

12 Oct '11

If trash is empty, `svn rm -q "${trash[@]}"` fails with: svn: Try 'svn help' for more info and then svn: Not enough arguments provided This doesn't result in any further malfunction but is kind of confusing and unexpected. Skipping `svn rm` on an empty trash fixes this. Reported-by: Alexander Rødseth <rodseth(a)gmail.com> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Pierre: I also pushed a version that is based on the other pending patches to my "for-pierre" branch. archrelease | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/archrelease b/archrelease index 2f6a563..7073e84 100755 --- a/archrelease +++ b/archrelease @@ -46,7 +46,7 @@ for tag in "$@"; do while read -r file; do trash+=("repos/$tag/$file") done < <(svn ls "repos/$tag") - svn rm -q "${trash[@]}" + [[ $trash ]] && svn rm -q "${trash[@]}" else mkdir -p "repos/$tag" svn add --parents -q "repos/$tag" -- 1.7.7

1 0

[arch-projects] [HEADSUP] udevd moved out of PATH
by Tom Gundersen 11 Oct '11

11 Oct '11

Hi guys, This is mostly (only?) relevant for mkinitcpio and initscripts, so I did not cc arch-dev. /sbin/udevd will move to /lib/udev/udevd in udev-174. Since this is no longer in PATH we need to patch mkinitcpio and initscripts to take care of this and release them all together. I intended to do an initsrcritps release next week (when I get back home), but now I'll wait for udev-174 to be out. This should sort out mkinitcpio: <https://github.com/teg/mkinitcpio/commit/bbb3ae45931e8fb9a8a68f2dcc6c49cb3b…>. Cheers, Tom

4 14

[arch-projects] Faithful single searching
by arch-projects＠archlinux.org 10 Oct '11

10 Oct '11

ciao, dear! Love consists in this, that two solitudes protect and touch and greet each other. www.matchforyou.ru Hello sweetheart! I'm very fragile, delicate girl. Have hazelnut color eyes, thin lips and beautiful little nous, dark-cherry hair with shortcut like a boy. Have ear piercing. Actually I'm not very romantic person. Usually I have to be strict in the office cause I have a management position. But when I'm at home I like to relax a little, and to be subordinated to someone. It is so hard to be strong business woman all the time. I want to find a man who will be able to protect me and make my life easier! I would like to meet my beloved one, special one, best friend and loving person, who is merry, kind, tender, affectionate and liberal. hon, bye for now

1 0