Tags 381624 + patch pending Tags 207196 + patch pending Thanks I've fixed this problem in vflib3 by modifying the configure file, that is doing the symlinking, to not do this for the parent directory (it only needs to be done for the "utils" directory).
I've added a dpatch, and this bug was fixed.
While preparing the package, I took the time to fix 207196, too, by
modifying the debian/rules to build the binary-indep package at the
binary-indep rule.
I also modified debian/rules to comply with policy that states that
packages should be always built with -g, and that the noopt option should
be honored by not optimizing if the option is there, and optimizing if it's
not.
I'm attaching the full interdiff output of the NMU I'm about to do. It
includes a small diff of config.sub and config.guess, due to the way the
package is made.
--
Love,
Marga
diff -u vflib3-3.6.13/config.sub vflib3-3.6.13/config.sub
--- vflib3-3.6.13/config.sub
+++ vflib3-3.6.13/config.sub
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -240,7 +241,7 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr |
avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -248,7 +249,8 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore
\
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -274,11 +276,11 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle |
sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle |
sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet |
sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
@@ -286,9 +288,6 @@
| z8k)
basic_machine=$basic_machine-unknown
;;
- m32c)
- basic_machine=$basic_machine-unknown
- ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -318,7 +317,7 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
+ | avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
@@ -329,7 +328,7 @@
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* | m32rle-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,11 +357,11 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* |
shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* |
sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-*
| sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
@@ -374,6 +373,4 @@
| z8k-*)
;;
- m32c-*)
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -1128,7 +1125,7 @@
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1217,7 +1214,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1369,6 +1366,9 @@
# system, and we'll never get to this point.
case $basic_machine in
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1378,9 +1378,9 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
diff -u vflib3-3.6.13/config.guess vflib3-3.6.13/config.guess
--- vflib3-3.6.13/config.guess
+++ vflib3-3.6.13/config.guess
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -210,7 +211,7 @@
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -770,6 +771,8 @@
case ${UNAME_MACHINE} in
pc98)
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed
-e 's/[-(].*//'` ;;
esac
@@ -780,9 +783,6 @@
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS_NT-*:*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -790,10 +790,10 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[345]*)
+ x86:Interix*:[3456]*)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T:Interix*:[345]*)
+ EM64T:Interix*:[3456]*)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -831,6 +831,9 @@
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit ;;
@@ -989,7 +992,7 @@
LIBC=gnulibc1
# endif
#else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C)
|| defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
diff -u vflib3-3.6.13/debian/changelog vflib3-3.6.13/debian/changelog
--- vflib3-3.6.13/debian/changelog
+++ vflib3-3.6.13/debian/changelog
@@ -1,3 +1,17 @@
+vflib3 (3.6.13-3.6) unstable; urgency=low
+
+ * Non-maintainer upload to fix writing outside the build directory.
+ * Added debian/patches/04_fix_configure_not_ln_pwd.dpatch, that fixes the
+ linking loop in configure so that the parent directory is not linked.
+ (Closes: #381624)
+ * Fixed debian/rules to comply with policy:
+ - CFLAGS = -g -Wall always used
+ - noopt is honored.
+ * Fixed debian/rules so that the binary-indep package is generated in the
+ binary-indep rule. (Closes: #207196)
+
+ -- Margarita Manterola <[EMAIL PROTECTED]> Sun, 13 Aug 2006 13:13:52 -0300
+
vflib3 (3.6.13-3.5) unstable; urgency=medium
* Non-maintainer upload.
diff -u vflib3-3.6.13/debian/patches/00list vflib3-3.6.13/debian/patches/00list
--- vflib3-3.6.13/debian/patches/00list
+++ vflib3-3.6.13/debian/patches/00list
@@ -3,0 +4 @@
+04_fix_configure_not_ln_pwd
diff -u vflib3-3.6.13/debian/rules vflib3-3.6.13/debian/rules
--- vflib3-3.6.13/debian/rules
+++ vflib3-3.6.13/debian/rules
@@ -22,13 +22,12 @@
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-# For debugging
-#DEB_BUILD_OPTIONS = debug nostrip
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+# For debugging: debian policy states that you should build with -g -Wall
+CFLAGS += -g -Wall
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
endif
# shared library versions, option 1
@@ -89,37 +88,40 @@
# Build architecture-independent files here.
binary-indep: build install
-# We have nothing to do by default.
+ dh_testdir -i
+ dh_testroot -i
+ #dh_clean -i -k
+
+ dh_installdocs -i
+ dh_installinfo -i -n
+ dh_installchangelogs -i CHANGES
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
# Build architecture-dependent files here.
binary-arch: build install
- dh_testdir
- dh_testroot
-
+ dh_testdir -a
+ dh_testroot -a
+ #dh_clean -a -k
+
dh_movefiles -pvflib3 -pvflib3-dev -pvflib3-bin
-
+
# Install Debian specific files
install -m 755 $(CURDIR)/debian/update-vflibcap
$(CURDIR)/debian/vflib3/usr/sbin/
install -m 644 $(CURDIR)/debian/vflibcaps/vflibcap
$(CURDIR)/debian/vflib3/etc/vflib3/vflibcaps-common/vflibcap.in
install -m 644 $(CURDIR)/debian/vflibcaps/vflibcap-tex
$(CURDIR)/debian/vflib3/etc/vflib3/vflibcaps-common/vflibcap-tex.in
-
+
# Shut lintian up
chmod +x $(CURDIR)/debian/vflib3/usr/share/VFlib/3.6.13/t1lib/mkt1enc.sh
-
-# dh_installdebconf
- dh_installdefoma
- dh_installdocs
-# dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
- dh_installman
- dh_installinfo -n
-
+
+ dh_installdefoma -a
+ dh_installdocs -a
+ dh_installman -a
+
dh_undocumented -pvflib3 update-vflibcap.1
dh_undocumented -pvflib3-dev VFlib3-config.1
dh_undocumented -pvflib3-bin ctext2pgm.1 hyakubm.1 hyakux11.1 \
@@ -127,19 +129,18 @@
vflserver.1 vfltest.1 vflx11.1 vflmkajt.1 vflmkcaptex.1 \
vflmkekan.1 vflmkgf.1 vflmkpcf.1 vflmkpk.1 vflmktex.1 \
vflmktfm.1 vflmkttf.1 vflmkvf.1 vflmkvfl.1
-
- dh_installchangelogs CHANGES
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+
+ dh_installchangelogs -a CHANGES
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
only in patch2:
unchanged:
--- vflib3-3.6.13.orig/debian/patches/04_fix_configure_not_ln_pwd.dpatch
+++ vflib3-3.6.13/debian/patches/04_fix_configure_not_ln_pwd.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fix_configure_not_ln_pwd.dpatch by Margarita Manterola
+## <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix the ln loop, so that it does not try to link the parent dir.
+
[EMAIL PROTECTED]@
+--- vflib3-3.6.13/configure 2006-08-13 12:21:31.000000000 -0300
++++ vflib3-marga/configure 2006-08-13 12:18:50.444197987 -0300
+@@ -935,6 +935,9 @@
+
+ working_dir=`pwd`
+ for curr_dir in `find $working_dir -type d -print`; do
++ if test $curr_dir = $working_dir; then
++ continue
++ fi
+ new_dir=`echo $curr_dir | sed -e 's|^\(.*\)-[0-9.][0-9.]*$|\1|'`
+ if test $curr_dir != $new_dir; then
+ r_curr_dir=`echo $curr_dir | sed -e "s|$working_dir/||"`
signature.asc
Description: Digital signature
