Changes - j0ke.net Open Build Service

Changes of Revision 27

[-] [+]	Changed	proftpd.spec
@@ -40,6 +40,7 @@ Source: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2 Source1: %{name}.init Patch0: %{name}-gcc43.patch +Patch1: mod_cap.dpatch Summary: Highly configurable GPL-licensed FTP server software %description @@ -74,6 +75,7 @@ %prep %setup %patch0 +%patch1 -p1 %build %configure \
[-] [+]	Added	mod_cap.dpatch ^
@@ -0,0 +1,35 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## mod_cap.dpatch by Francesco Paolo Lovergine <frankie@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/lib/libcap/Makefile trunk/lib/libcap/Makefile +--- trunk~/lib/libcap/Makefile 2008-05-07 11:36:04.000000000 +0200 ++++ trunk/lib/libcap/Makefile 2008-05-07 11:38:20.000000000 +0200 +@@ -23,7 +23,7 @@ + INCLS=libcap.h cap_names.h $(INCS) + OBJS=$(addsuffix .o, $(FILES)) + +-all: $(LIBNAME) ++all: + + _makenames: _makenames.c cap_names.sed + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ +diff -urNad trunk~/modules/mod_cap.c trunk/modules/mod_cap.c +--- trunk~/modules/mod_cap.c 2008-05-07 11:36:24.000000000 +0200 ++++ trunk/modules/mod_cap.c 2008-05-07 11:38:05.000000000 +0200 +@@ -42,10 +42,8 @@ + # define _LINUX_BYTEORDER_GENERIC_H + # endif + +-# ifdef HAVE_LINUX_CAPABILITY_H +-# include <linux/capability.h> +-# endif /* HAVE_LINUX_CAPABILITY_H / +-# include "../lib/libcap/include/sys/capability.h" ++#include <linux/capability.h> ++#include <sys/capability.h> + + / What are these for? */ + # undef WNOHANG
[-] [+]	Added	proftpd-dfsg_1.3.1-11.diff ^
@@ -0,0 +1,9631 @@ +--- proftpd-dfsg-1.3.1.orig/config.guess ++++ proftpd-dfsg-1.3.1/config.guess +@@ -1,10 +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, 2006 Free Software Foundation, +-# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. + +-timestamp='2006-11-15' ++timestamp='2008-01-23' + + # 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 +@@ -56,8 +56,8 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -330,7 +330,7 @@ + sun4:SunOS:5.:* \| tadpole:SunOS:5.:) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]//'` + exit ;; +- i86pc:SunOS:5.:) ++ i86pc:SunOS:5.: \| i86xen:SunOS:5.:) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]//'` + exit ;; + sun4:SunOS:6:) +@@ -532,7 +532,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- :AIX::[45]) ++ :AIX::[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available \| sed 1q \| awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} \| grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -781,7 +781,7 @@ + i:CYGWIN:) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; +- i:MINGW:) ++ :MINGW:) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i:windows32:) +@@ -791,12 +791,18 @@ + i:PW:) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- x86:Interix:[3456]) +- echo i586-pc-interix${UNAME_RELEASE} +- exit ;; +- EM64T:Interix:[3456]* \| authenticamd:Interix:[3456]) +- echo x86_64-unknown-interix${UNAME_RELEASE} +- exit ;; ++ :Interix:[3456]) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ EM64T \| authenticamd) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95: \| [345]86:Windows_98:* \| [345]86:Windows_NT:) + echo i${UNAME_MACHINE}-pc-mks + exit ;; +@@ -830,7 +836,14 @@ + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm:Linux::) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ \| $CC_FOR_BUILD -E - 2>/dev/null \ ++ \| grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi + exit ;; + avr32:Linux::) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -951,6 +964,9 @@ + x86_64:Linux::) + echo x86_64-unknown-linux-gnu + exit ;; ++ xtensa:Linux::) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + i86:Linux::) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent +@@ -1209,9 +1225,15 @@ + SX-6:SUPER-UX::) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-7:SUPER-UX::) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; + SX-8:SUPER-UX::) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-8R:SUPER-UX::) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power:Rhapsody::) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; +@@ -1462,9 +1484,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- http://savannah.gnu.org/cgi-bin/viewcvs/checkout/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + and +- http://savannah.gnu.org/cgi-bin/viewcvs/checkout/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +--- proftpd-dfsg-1.3.1.orig/config.sub ++++ proftpd-dfsg-1.3.1/config.sub +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +-# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. + +-timestamp='2006-11-07' ++timestamp='2008-01-16' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -72,8 +72,8 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -245,12 +245,12 @@ + \| bfin \ + \| c4x \| clipper \ + \| d10v \| d30v \| dlx \| dsp16xx \ +- \| fr30 \| frv \ ++ \| fido \| fr30 \| frv \ + \| h8300 \| h8500 \| hppa \| hppa1.[01] \| hppa2.0 \| hppa2.0[nw] \| hppa64 \ + \| i370 \| i860 \| i960 \| ia64 \ + \| ip2k \| iq2000 \ + \| m32c \| m32r \| m32rle \| m68000 \| m68k \| m88k \ +- \| maxq \| mb \| microblaze \| mcore \ ++ \| maxq \| mb \| microblaze \| mcore \| mep \ + \| mips \| mipsbe \| mipseb \| mipsel \| mipsle \ + \| mips16 \ + \| mips64 \| mips64el \ +@@ -324,7 +324,7 @@ + \| clipper-* \| craynv-* \| cydra-* \ + \| d10v-* \| d30v-* \| dlx-* \ + \| elxsi-* \ +- \| f30[01]-* \| f700-* \| fr30-* \| frv-* \| fx80-* \ ++ \| f30[01]-* \| f700-* \| fido-* \| fr30-* \| frv-* \| fx80-* \ + \| h8300-* \| h8500-* \ + \| hppa-* \| hppa1.[01]-* \| hppa2.0-* \| hppa2.0[nw]-* \| hppa64-* \ + \| i86- \| i860-* \| i960-* \| ia64-* \ +@@ -369,10 +369,14 @@ + \| v850-* \| v850e-* \| vax-* \ + \| we32k-* \ + \| x86-* \| x86_64-* \| xc16x-* \| xps100-* \| xscale-* \| xscalee[bl]-* \ +- \| xstormy16-* \| xtensa-* \ ++ \| xstormy16-* \| xtensa- \ + \| ymp-* \ + \| z8k-) + ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa) ++ basic_machine=$basic_machine-unknown ++ ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS.
[-] [+]	Changed	proftpd-gcc43.patch ^
@@ -9,17 +9,3 @@ if (fifo_lockfd < 0) { rewrite_log("rewrite_subst_maps_fifo(): error creating '%s': %s", fifo_lockname, strerror(errno)); ---- modules/mod_cap.c.orig 2008-06-29 19:17:01.000000000 +0200 -+++ modules/mod_cap.c 2008-06-29 20:32:50.000000000 +0200 -@@ -42,10 +42,7 @@ - # define _LINUX_BYTEORDER_GENERIC_H - # endif - --# ifdef HAVE_LINUX_CAPABILITY_H --# include <linux/capability.h> --# endif /* HAVE_LINUX_CAPABILITY_H / --# include "../lib/libcap/include/sys/capability.h" -+#include <linux/capability.h> - - / What are these for? */ - # undef WNOHANG