--- sigit-0.3.2.orig/configure +++ sigit-0.3.2/configure @@ -580,6 +580,8 @@ if [ -x $LOCATE_BOXES/boxes ]; then LOCATE_BOXES=$LOCATE_BOXES/boxes fi + else + LOCATE_BOXES=/usr/bin/boxes fi echo ":WARNING:" 1>&6 echo "" 1>&6 @@ -818,6 +820,44 @@ echo "no" 1>&5 fi fi +else + echo $echo_front "Checking if -march flag is in \$CFLAGS... $echo_end" 1>&6 + if [ "$LOG" = "yes" ]; then + echo $echo_front "Checking if -march flag is in \$CFLAGS... $echo_end" 1>&5 + fi + IBBI=`echo "$CFLAGS" | grep -- -march` + RETVAL="$?" + if [ "$RETVAL" -eq 1 ]; then + # it isn't found, then add it from the parsed --host and --target + # specifications + echo "no" 1>&6 + if [ "$LOG" = "yes" ]; then + echo "no" 1>&5 + fi + echo $echo_front "Checking if $CC accepts -march=$target_cpu... $echo_end" 1>&6 + if [ "$LOG" = "yes" ]; then + echo $echo_front "Checking if $CC accepts -march=$target_cpu... $echo_end" 1>&5 + fi + if ( + $CC -march=$target_cpu __conftest.c -o __conftest || exit 1 + ) >/dev/null 2>&1; then + echo "yes" 1>&6 + if [ "$LOG" = "yes" ]; then + echo "yes" 1>&5 + fi + CFLAGS="$CFLAGS -march=$target_cpu" + else + echo "no" 1>&6 + if [ "$LOG" = "yes" ]; then + echo "no" 1>&5 + fi + fi + else + echo "yes" 1>&6 + if [ "$LOG" = "yes" ]; then + echo "yes" 1>&5 + fi + fi fi rm -f __conftest* @@ -1097,7 +1137,7 @@ if [ x"$PRELINK" = x ]; then if ( - $CC -lpthread __conftest.c -o __conftest || exit 1 + $CC __conftest.c -lpthread -o __conftest || exit 1 ./__conftest || exit 1 ) >/dev/null 2>&1; then LINKFLAGS="$LINKFLAGS -lpthread" @@ -1218,7 +1258,7 @@ fi else if ( - $CC -lpthread -L$PRELINK __conftest.c -o __conftest || exit 1 + $CC -L$PRELINK __conftest.c -lpthread -o __conftest || exit 1 ./__conftest || exit 1 ) >/dev/null 2>&1; then LINKFLAGS="$LINKFLAGS -lpthread -L$PRELINK" @@ -1323,7 +1363,7 @@ EOF if ( - $CC -lz __conftest.c -o __conftest || exit 1 + $CC __conftest.c -lz -o __conftest || exit 1 ) >/dev/null 2>&1; then echo "yes" 1>&6 if [ "$LOG" = "yes" ]; then --- sigit-0.3.2.orig/src/config.h +++ sigit-0.3.2/src/config.h @@ -74,7 +74,7 @@ #include /* getenv(), alloca() */ #include /* strcmp(), strncpy(), strcpy() */ #include /* localtime(), ctime(), */ -#include /* access(), getpid(), getppid(), fork() */ +#include /* access(), getpid(), getppid(), fork(), gethostname() */ #include /* pthread_create(), pthread_join(), pthread_exit(), */ /* pthread_mutex_lock(), pthread_mutex_unlock() */ @@ -131,6 +131,24 @@ # define WCOREDUMP(status) ((status) & __WCOREFLAG) #endif +/* some function definitions we need */ +int gethostname(char *name, size_t len); +#ifdef I__HAVE__SNPRINTF +/* to accomodate the OSF1/HP_UX systems hack later on */ +#ifdef DECLARE_SNPRINTF +#undef DECLARE_SNPRINTF +#endif + int snprintf(char *str, size_t size, const char *format, ...); +#endif +int kill(pid_t pid, int sig); +int sigemptyset(sigset_t *set); +int sigfillset(sigset_t *set); +int sigaddset(sigset_t *set, int signum); +long int random(void); +void srandom(unsigned int seed); +char *strtok_r(char *s, const char *delim, char **ptrptr); +int strcasecmp(const char *s1, const char *s2); + #endif /* __ANSI__COMPILED */ @@ -246,7 +264,7 @@ /* a hack for OSF1/HP_UX systems (and probably BSD systems too) */ #ifdef MANUAL__DEFINE__SNPRINTF #ifdef DECLARE_SNPRINTF - int snprintf(char *, int, const char *, ...); + int snprintf(char *, int, const char *, ...); #endif #endif /* well we're gonna need a mutex, in order to keep control of our threads. */ --- sigit-0.3.2.orig/src/files.c +++ sigit-0.3.2/src/files.c @@ -833,9 +833,9 @@ #endif #else #ifdef I__HAVE__UNAME - snprintf(uname_buffer, "%s", unamebuf.sysname); + sprintf(uname_buffer, "%s", unamebuf.sysname); #else - snprintf(uname_buffer, "%s", "Undefined sysname"); + sprintf(uname_buffer, "%s", "Undefined sysname"); #endif #endif #ifdef I__HAVE__UNAME --- sigit-0.3.2.orig/debian/compat +++ sigit-0.3.2/debian/compat @@ -0,0 +1 @@ +5 --- sigit-0.3.2.orig/debian/dirs +++ sigit-0.3.2/debian/dirs @@ -0,0 +1,5 @@ +usr/bin +etc +usr/share/sigit +usr/share/man/man1 +usr/share/man/man5 --- sigit-0.3.2.orig/debian/README.Debian +++ sigit-0.3.2/debian/README.Debian @@ -0,0 +1,12 @@ +README.Debian for sigit; Debian specific notes for sigit. + +sigit ships from upstream (http://www.redhead.dk/) with support +for the program 'boxes'. In this Debian package boxes support +is enabled but you will need the boxes package installed to +make use of boxes. + _____________________________ + /\ \ + \_| -- Rasmus Bøg Hansen | + | moffe@zz9.dk | + | ________________________|_ + \_/__________________________/ --- sigit-0.3.2.orig/debian/rules +++ sigit-0.3.2/debian/rules @@ -0,0 +1,66 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CFLAGS += -g -Wall + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +CONFFLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) + +stamp-configure: + dh_testdir + CFLAGS="$(CFLAGS)" ./configure --install-root=$(CURDIR)/debian/sigit --with-boxes $(CONFFLAGS) + touch stamp-configure + +build: stamp-build + +stamp-build: stamp-configure + dh_testdir + $(MAKE) + touch stamp-build + +clean: + dh_testdir + dh_testroot + -$(MAKE) distclean + dh_clean + rm -f scripts/install + rm -f stamp-configure stamp-build + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installman + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- sigit-0.3.2.orig/debian/source.lintian-overrides +++ sigit-0.3.2/debian/source.lintian-overrides @@ -0,0 +1,2 @@ +sigit source: outdated-autotools-helper-file scripts/config.sub 2001-04-20 +sigit source: outdated-autotools-helper-file scripts/config.guess 2001-04-20 --- sigit-0.3.2.orig/debian/control +++ sigit-0.3.2/debian/control @@ -0,0 +1,22 @@ +Source: sigit +Section: mail +Priority: optional +Maintainer: Rasmus Bøg Hansen +Build-Depends: debhelper (>= 5.0.0), zlib1g-dev, boxes +Standards-Version: 3.7.2 + +Package: sigit +Architecture: any +Recommends: boxes +Depends: ${shlibs:Depends} +Description: A small utility to change signatures randomly + This small utility changes signatures in random order. + It is compatible with all email and news + clients that use $HOME/.signature although the + signature file can be called anything. It works over + NFS and can even handle multiple signature files. + . + The utility to manipulate signature databases, + sigitdb, is also included. + . + Homepage: http://www.redhead.dk/ --- sigit-0.3.2.orig/debian/copyright +++ sigit-0.3.2/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Rasmus Bøg Hansen +on Tue, 31 Aug 1999 21:57:17 +0200. + +It was downloaded from http://www.redhead.dk/ + +Upstream Author: + + Kenneth "Redhead" Nielsen + +Copyright: + + Copyright (C) 2000-2005 Kenneth "Redhead" Nielsen + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 1999-2007, Rasmus Bøg Hansen and +is licensed under the GPL, see above. --- sigit-0.3.2.orig/debian/docs +++ sigit-0.3.2/debian/docs @@ -0,0 +1,4 @@ +README +TODO +AUTHORS +debian/README.Debian --- sigit-0.3.2.orig/debian/changelog +++ sigit-0.3.2/debian/changelog @@ -0,0 +1,25 @@ +sigit (0.3.2-2ubuntu1) oneiric; urgency=low + + * Fix FTBFS with zlib and glibc in multiarch libdir. LP: #832872. + + -- Matthias Klose Tue, 13 Sep 2011 19:31:52 +0200 + +sigit (0.3.2-2) unstable; urgency=low + + * Enable --build and --host configure flags. Upstream patch applied. + * Fix some -ansi warnings fixed upstream. Upstream patch applied. + * Fix boxes support (Closes bug #414543). Upstream patch applied. + * Clean up the three mentioned patches for changelog changes etc. + * Add lintian override for old autotools helper files + * Don't update autotools helper files + * Remove DH_COMPAT from debian/rules and add debian/compat + * debian/watch: Added. Thanks to Bart Martens. + * Add README.Debian and mention boxes support in it. + + -- Rasmus Bøg Hansen Tue, 13 Mar 2007 22:04:26 +0100 + +sigit (0.3.2-1) unstable; urgency=low + + * Initial release (Closes: #409187) + + -- Rasmus Bøg Hansen Wed, 25 Oct 2006 00:23:25 +0200 --- sigit-0.3.2.orig/debian/watch +++ sigit-0.3.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.redhead.dk/download/pub/Sigit/develop/Sigit-(.*)\.tar\.gz