diff options
Diffstat (limited to 'package')
22 files changed, 943 insertions, 0 deletions
diff --git a/package/chillispot/patches/patch-Makefile b/package/chillispot/patches/patch-Makefile new file mode 100644 index 000000000..e951e5931 --- /dev/null +++ b/package/chillispot/patches/patch-Makefile @@ -0,0 +1,178 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- chillispot-1.1.0.orig/Makefile 2006-09-24 21:35:16.000000000 +0200 ++++ chillispot-1.1.0/Makefile 2009-05-21 20:42:08.000000000 +0200 +@@ -13,9 +13,9 @@ + # PARTICULAR PURPOSE. + + +-srcdir = . +-top_srcdir = . +- ++srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 ++top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 ++VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 + pkgdatadir = $(datadir)/chillispot + pkglibdir = $(libdir)/chillispot + pkgincludedir = $(includedir)/chillispot +@@ -33,8 +33,8 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = i686-pc-linux-gnu +-host_triplet = i686-pc-linux-gnu ++build_triplet = x86_64-pc-linux-gnu ++host_triplet = i586-pc-linux-gnu + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/chillispot.spec.in \ + $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ +@@ -72,24 +72,24 @@ DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print + distcleancheck_listfiles = find . -type f -print +-ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9 +-AMDEP_FALSE = # +-AMDEP_TRUE = +-AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar +-AR = ar +-AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf +-AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader +-AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9 ++ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9 ++AMDEP_FALSE = ++AMDEP_TRUE = # ++AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar ++AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar ++AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf ++AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader ++AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9 + AWK = gawk +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXCPP = g++ -E +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 ++CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc ++CCDEPMODE = depmode=none ++CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer ++CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E ++CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG ++CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ ++CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E ++CXXDEPMODE = depmode=none ++CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer + CYGPATH_W = echo + DEFS = -DHAVE_CONFIG_H + DEPDIR = .deps +@@ -99,19 +99,19 @@ ECHO_N = -n + ECHO_T = + EGREP = grep -E + EXEEXT = +-F77 = f95 +-FFLAGS = -g -O2 ++F77 = ++FFLAGS = + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_PROGRAM = ${INSTALL} + INSTALL_SCRIPT = ${INSTALL} + INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = ++LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib ++LIBOBJS = memcmp$U.o + LIBS = + LIBTOOL = $(SHELL) $(top_builddir)/libtool + LN_S = ln -s +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo ++LTLIBOBJS = memcmp$U.lo ++MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo + OBJEXT = o + PACKAGE = chillispot + PACKAGE_BUGREPORT = bugs@chillispot.org +@@ -120,54 +120,54 @@ PACKAGE_STRING = chillispot 1.1.0 + PACKAGE_TARNAME = chillispot + PACKAGE_VERSION = 1.1.0 + PATH_SEPARATOR = : +-RANLIB = ranlib ++RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib + SET_MAKE = +-SHELL = /bin/sh +-STRIP = strip ++SHELL = /bin/bash ++STRIP = i586-linux-strip + VERSION = 1.1.0 +-ac_ct_AR = ar +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = f95 +-ac_ct_RANLIB = ranlib +-ac_ct_STRIP = strip +-am__fastdepCC_FALSE = # +-am__fastdepCC_TRUE = +-am__fastdepCXX_FALSE = # +-am__fastdepCXX_TRUE = ++ac_ct_AR = ++ac_ct_CC = ++ac_ct_CXX = ++ac_ct_F77 = ++ac_ct_RANLIB = ++ac_ct_STRIP = ++am__fastdepCC_FALSE = ++am__fastdepCC_TRUE = # ++am__fastdepCXX_FALSE = ++am__fastdepCXX_TRUE = # + am__include = include + am__leading_dot = . + am__quote = + am__tar = ${AMTAR} chof - "$$tardir" + am__untar = ${AMTAR} xf - + bindir = ${exec_prefix}/bin +-build = i686-pc-linux-gnu +-build_alias = +-build_cpu = i686 ++build = x86_64-pc-linux-gnu ++build_alias = x86_64-linux-gnu ++build_cpu = x86_64 + build_os = linux-gnu + build_vendor = pc +-datadir = ${prefix}/share ++datadir = /usr/share + exec_prefix = ${prefix} +-host = i686-pc-linux-gnu +-host_alias = +-host_cpu = i686 ++host = i586-pc-linux-gnu ++host_alias = i586-linux ++host_cpu = i586 + host_os = linux-gnu + host_vendor = pc + includedir = ${prefix}/include + infodir = ${prefix}/info +-install_sh = /home/jj/chillispot/install-sh ++install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh + libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localstatedir = ${prefix}/var +-mandir = ${prefix}/man ++libexecdir = /usr/sbin ++localstatedir = /var ++mandir = /usr/share/man + mkdir_p = mkdir -p -- + oldincludedir = /usr/include +-prefix = /usr/local +-program_transform_name = s,x,x, ++prefix = /usr ++program_transform_name = s,$$,,;s,^,, + sbindir = ${exec_prefix}/sbin + sharedstatedir = ${prefix}/com +-sysconfdir = ${prefix}/etc +-target_alias = ++sysconfdir = /etc ++target_alias = i586-linux + SUBDIRS = src doc + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/package/chillispot/patches/patch-doc_Makefile b/package/chillispot/patches/patch-doc_Makefile new file mode 100644 index 000000000..a6290fc41 --- /dev/null +++ b/package/chillispot/patches/patch-doc_Makefile @@ -0,0 +1,178 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- chillispot-1.1.0.orig/doc/Makefile 2006-09-24 21:35:16.000000000 +0200 ++++ chillispot-1.1.0/doc/Makefile 2009-05-21 20:42:08.000000000 +0200 +@@ -13,9 +13,9 @@ + # PARTICULAR PURPOSE. + + +-srcdir = . +-top_srcdir = .. +- ++srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc ++top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 ++VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc + pkgdatadir = $(datadir)/chillispot + pkglibdir = $(libdir)/chillispot + pkgincludedir = $(includedir)/chillispot +@@ -33,8 +33,8 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = i686-pc-linux-gnu +-host_triplet = i686-pc-linux-gnu ++build_triplet = x86_64-pc-linux-gnu ++host_triplet = i586-pc-linux-gnu + subdir = doc + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -51,24 +51,24 @@ am__installdirs = "$(DESTDIR)$(man8dir)" + NROFF = nroff + MANS = $(man_MANS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9 +-AMDEP_FALSE = # +-AMDEP_TRUE = +-AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar +-AR = ar +-AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf +-AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader +-AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9 ++ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9 ++AMDEP_FALSE = ++AMDEP_TRUE = # ++AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar ++AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar ++AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf ++AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader ++AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9 + AWK = gawk +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXCPP = g++ -E +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 ++CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc ++CCDEPMODE = depmode=none ++CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer ++CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E ++CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG ++CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ ++CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E ++CXXDEPMODE = depmode=none ++CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer + CYGPATH_W = echo + DEFS = -DHAVE_CONFIG_H + DEPDIR = .deps +@@ -78,19 +78,19 @@ ECHO_N = -n + ECHO_T = + EGREP = grep -E + EXEEXT = +-F77 = f95 +-FFLAGS = -g -O2 ++F77 = ++FFLAGS = + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_PROGRAM = ${INSTALL} + INSTALL_SCRIPT = ${INSTALL} + INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = ++LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib ++LIBOBJS = memcmp$U.o + LIBS = + LIBTOOL = $(SHELL) $(top_builddir)/libtool + LN_S = ln -s +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo ++LTLIBOBJS = memcmp$U.lo ++MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo + OBJEXT = o + PACKAGE = chillispot + PACKAGE_BUGREPORT = bugs@chillispot.org +@@ -99,54 +99,54 @@ PACKAGE_STRING = chillispot 1.1.0 + PACKAGE_TARNAME = chillispot + PACKAGE_VERSION = 1.1.0 + PATH_SEPARATOR = : +-RANLIB = ranlib ++RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib + SET_MAKE = +-SHELL = /bin/sh +-STRIP = strip ++SHELL = /bin/bash ++STRIP = i586-linux-strip + VERSION = 1.1.0 +-ac_ct_AR = ar +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = f95 +-ac_ct_RANLIB = ranlib +-ac_ct_STRIP = strip +-am__fastdepCC_FALSE = # +-am__fastdepCC_TRUE = +-am__fastdepCXX_FALSE = # +-am__fastdepCXX_TRUE = ++ac_ct_AR = ++ac_ct_CC = ++ac_ct_CXX = ++ac_ct_F77 = ++ac_ct_RANLIB = ++ac_ct_STRIP = ++am__fastdepCC_FALSE = ++am__fastdepCC_TRUE = # ++am__fastdepCXX_FALSE = ++am__fastdepCXX_TRUE = # + am__include = include + am__leading_dot = . + am__quote = + am__tar = ${AMTAR} chof - "$$tardir" + am__untar = ${AMTAR} xf - + bindir = ${exec_prefix}/bin +-build = i686-pc-linux-gnu +-build_alias = +-build_cpu = i686 ++build = x86_64-pc-linux-gnu ++build_alias = x86_64-linux-gnu ++build_cpu = x86_64 + build_os = linux-gnu + build_vendor = pc +-datadir = ${prefix}/share ++datadir = /usr/share + exec_prefix = ${prefix} +-host = i686-pc-linux-gnu +-host_alias = +-host_cpu = i686 ++host = i586-pc-linux-gnu ++host_alias = i586-linux ++host_cpu = i586 + host_os = linux-gnu + host_vendor = pc + includedir = ${prefix}/include + infodir = ${prefix}/info +-install_sh = /home/jj/chillispot/install-sh ++install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh + libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localstatedir = ${prefix}/var +-mandir = ${prefix}/man ++libexecdir = /usr/sbin ++localstatedir = /var ++mandir = /usr/share/man + mkdir_p = mkdir -p -- + oldincludedir = /usr/include +-prefix = /usr/local +-program_transform_name = s,x,x, ++prefix = /usr ++program_transform_name = s,$$,,;s,^,, + sbindir = ${exec_prefix}/sbin + sharedstatedir = ${prefix}/com +-sysconfdir = ${prefix}/etc +-target_alias = ++sysconfdir = /etc ++target_alias = i586-linux + man_MANS = chilli.8 + man_aux = $(man_MANS:.1=.x) + EXTRA_DIST = $(man_MANS) diff --git a/package/chillispot/patches/patch-src_Makefile b/package/chillispot/patches/patch-src_Makefile new file mode 100644 index 000000000..975e6623e --- /dev/null +++ b/package/chillispot/patches/patch-src_Makefile @@ -0,0 +1,243 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- chillispot-1.1.0.orig/src/Makefile 2006-09-24 21:35:16.000000000 +0200 ++++ chillispot-1.1.0/src/Makefile 2009-05-21 20:42:08.000000000 +0200 +@@ -16,9 +16,9 @@ + + SOURCES = $(chilli_SOURCES) + +-srcdir = . +-top_srcdir = .. +- ++srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src ++top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 ++VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src + pkgdatadir = $(datadir)/chillispot + pkglibdir = $(libdir)/chillispot + pkgincludedir = $(includedir)/chillispot +@@ -36,8 +36,8 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = i686-pc-linux-gnu +-host_triplet = i686-pc-linux-gnu ++build_triplet = x86_64-pc-linux-gnu ++host_triplet = i586-pc-linux-gnu + sbin_PROGRAMS = chilli$(EXEEXT) + subdir = src + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -73,24 +73,24 @@ DIST_SOURCES = $(chilli_SOURCES) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9 +-AMDEP_FALSE = # +-AMDEP_TRUE = +-AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar +-AR = ar +-AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf +-AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader +-AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9 ++ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9 ++AMDEP_FALSE = ++AMDEP_TRUE = # ++AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar ++AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar ++AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf ++AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader ++AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9 + AWK = gawk +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXCPP = g++ -E +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 ++CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc ++CCDEPMODE = depmode=none ++CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer ++CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E ++CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG ++CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ ++CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E ++CXXDEPMODE = depmode=none ++CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer + CYGPATH_W = echo + DEFS = -DHAVE_CONFIG_H + DEPDIR = .deps +@@ -100,19 +100,19 @@ ECHO_N = -n + ECHO_T = + EGREP = grep -E + EXEEXT = +-F77 = f95 +-FFLAGS = -g -O2 ++F77 = ++FFLAGS = + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_PROGRAM = ${INSTALL} + INSTALL_SCRIPT = ${INSTALL} + INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = ++LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib ++LIBOBJS = memcmp$U.o + LIBS = + LIBTOOL = $(SHELL) $(top_builddir)/libtool + LN_S = ln -s +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo ++LTLIBOBJS = memcmp$U.lo ++MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo + OBJEXT = o + PACKAGE = chillispot + PACKAGE_BUGREPORT = bugs@chillispot.org +@@ -121,54 +121,54 @@ PACKAGE_STRING = chillispot 1.1.0 + PACKAGE_TARNAME = chillispot + PACKAGE_VERSION = 1.1.0 + PATH_SEPARATOR = : +-RANLIB = ranlib ++RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib + SET_MAKE = +-SHELL = /bin/sh +-STRIP = strip ++SHELL = /bin/bash ++STRIP = i586-linux-strip + VERSION = 1.1.0 +-ac_ct_AR = ar +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = f95 +-ac_ct_RANLIB = ranlib +-ac_ct_STRIP = strip +-am__fastdepCC_FALSE = # +-am__fastdepCC_TRUE = +-am__fastdepCXX_FALSE = # +-am__fastdepCXX_TRUE = ++ac_ct_AR = ++ac_ct_CC = ++ac_ct_CXX = ++ac_ct_F77 = ++ac_ct_RANLIB = ++ac_ct_STRIP = ++am__fastdepCC_FALSE = ++am__fastdepCC_TRUE = # ++am__fastdepCXX_FALSE = ++am__fastdepCXX_TRUE = # + am__include = include + am__leading_dot = . + am__quote = + am__tar = ${AMTAR} chof - "$$tardir" + am__untar = ${AMTAR} xf - + bindir = ${exec_prefix}/bin +-build = i686-pc-linux-gnu +-build_alias = +-build_cpu = i686 ++build = x86_64-pc-linux-gnu ++build_alias = x86_64-linux-gnu ++build_cpu = x86_64 + build_os = linux-gnu + build_vendor = pc +-datadir = ${prefix}/share ++datadir = /usr/share + exec_prefix = ${prefix} +-host = i686-pc-linux-gnu +-host_alias = +-host_cpu = i686 ++host = i586-pc-linux-gnu ++host_alias = i586-linux ++host_cpu = i586 + host_os = linux-gnu + host_vendor = pc + includedir = ${prefix}/include + infodir = ${prefix}/info +-install_sh = /home/jj/chillispot/install-sh ++install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh + libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localstatedir = ${prefix}/var +-mandir = ${prefix}/man ++libexecdir = /usr/sbin ++localstatedir = /var ++mandir = /usr/share/man + mkdir_p = mkdir -p -- + oldincludedir = /usr/include +-prefix = /usr/local +-program_transform_name = s,x,x, ++prefix = /usr ++program_transform_name = s,$$,,;s,^,, + sbindir = ${exec_prefix}/sbin + sharedstatedir = ${prefix}/com +-sysconfdir = ${prefix}/etc +-target_alias = ++sysconfdir = /etc ++target_alias = i586-linux + + # add -pg to enable gprof + AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' +@@ -244,38 +244,38 @@ mostlyclean-compile: + distclean-compile: + -rm -f *.tab.c + +-include ./$(DEPDIR)/chilli.Po +-include ./$(DEPDIR)/cmdline.Po +-include ./$(DEPDIR)/dhcp.Po +-include ./$(DEPDIR)/iphash.Po +-include ./$(DEPDIR)/ippool.Po +-include ./$(DEPDIR)/lookup.Po +-include ./$(DEPDIR)/md5.Po +-include ./$(DEPDIR)/radius.Po +-include ./$(DEPDIR)/redir.Po +-include ./$(DEPDIR)/syserr.Po +-include ./$(DEPDIR)/tun.Po ++#include ./$(DEPDIR)/chilli.Po ++#include ./$(DEPDIR)/cmdline.Po ++#include ./$(DEPDIR)/dhcp.Po ++#include ./$(DEPDIR)/iphash.Po ++#include ./$(DEPDIR)/ippool.Po ++#include ./$(DEPDIR)/lookup.Po ++#include ./$(DEPDIR)/md5.Po ++#include ./$(DEPDIR)/radius.Po ++#include ./$(DEPDIR)/redir.Po ++#include ./$(DEPDIR)/syserr.Po ++#include ./$(DEPDIR)/tun.Po + + .c.o: +- if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-# source='$<' object='$@' libtool=no \ +-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +-# $(COMPILE) -c $< ++# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++# source='$<' object='$@' libtool=no ++# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) ++ $(COMPILE) -c $< + + .c.obj: +- if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-# source='$<' object='$@' libtool=no \ +-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +-# $(COMPILE) -c `$(CYGPATH_W) '$<'` ++# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ++# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++# source='$<' object='$@' libtool=no ++# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) ++ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +- if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-# source='$<' object='$@' libtool=yes \ +-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +-# $(LTCOMPILE) -c -o $@ $< ++# if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++# source='$<' object='$@' libtool=yes ++# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) ++ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo diff --git a/package/chillispot/patches/patch-src_tun_c b/package/chillispot/patches/patch-src_tun_c new file mode 100644 index 000000000..8e1d21519 --- /dev/null +++ b/package/chillispot/patches/patch-src_tun_c @@ -0,0 +1,57 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- chillispot-1.1.0.orig/src/tun.c 2006-09-24 19:48:25.000000000 +0200 ++++ chillispot-1.1.0/src/tun.c 2009-05-21 20:51:19.000000000 +0200 +@@ -366,7 +366,7 @@ int tun_addaddr(struct tun_t *this, + this->addrs++; + return 0; + +-#elif defined (__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) + + int fd; + struct ifaliasreq areq; +@@ -445,7 +445,7 @@ int tun_setaddr(struct tun_t *this, + #if defined(__linux__) + ifr.ifr_netmask.sa_family = AF_INET; + +-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) + ((struct sockaddr_in *) &ifr.ifr_addr)->sin_len = + sizeof (struct sockaddr_in); + ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_len = +@@ -497,7 +497,7 @@ int tun_setaddr(struct tun_t *this, + ((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = + netmask->s_addr; + +-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) + ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = + netmask->s_addr; + +@@ -585,7 +585,7 @@ int tun_route(struct tun_t *this, + close(fd); + return 0; + +-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) + + struct { + struct rt_msghdr rt; +@@ -674,7 +674,7 @@ int tun_new(struct tun_t **tun) + #if defined(__linux__) + struct ifreq ifr; + +-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) + char devname[IFNAMSIZ+5]; /* "/dev/" + ifname */ + int devnum; + struct ifaliasreq areq; +@@ -722,7 +722,7 @@ int tun_new(struct tun_t **tun) + ioctl((*tun)->fd, TUNSETNOCSUM, 1); /* Disable checksums */ + return 0; + +-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) + + /* Find suitable device */ + for (devnum = 0; devnum < 255; devnum++) { /* TODO 255 */ diff --git a/package/iptraf/patches/patch-src_bar_c b/package/iptraf/patches/patch-src_bar_c new file mode 100644 index 000000000..09ca6aef0 --- /dev/null +++ b/package/iptraf/patches/patch-src_bar_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/bar.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/bar.c 2009-05-21 23:04:49.000000000 +0200 +@@ -26,7 +26,7 @@ void set_barptr(char **barptr, char *ent + { + *barptr = entry; + *starttime = time(NULL); +- bzero(spanbr, size); ++ memset(spanbr, 0, size); + + if (!(*cleared)) { + wattrset(win, IPSTATATTR); diff --git a/package/iptraf/patches/patch-src_ifstats_c b/package/iptraf/patches/patch-src_ifstats_c new file mode 100644 index 000000000..555c93075 --- /dev/null +++ b/package/iptraf/patches/patch-src_ifstats_c @@ -0,0 +1,30 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/ifstats.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/ifstats.c 2009-05-21 23:05:17.000000000 +0200 +@@ -167,7 +167,7 @@ void initiflist(struct iflist **list) + */ + + itmp = malloc(sizeof(struct iflist)); +- bzero(itmp, sizeof(struct iflist)); ++ memset(itmp, 0, sizeof(struct iflist)); + strcpy(itmp->ifname, ifname); + index++; + itmp->index = index; +@@ -208,7 +208,7 @@ void positionptr(struct iftab *table, st + + if (*ptmp == NULL) { + *ptmp = malloc(sizeof(struct iflist)); +- bzero(*ptmp, sizeof(struct iflist)); ++ memset(*ptmp, 0, sizeof(struct iflist)); + (*ptmp)->index = plast->index + 1; + plast->next_entry = *ptmp; + (*ptmp)->prev_entry = plast; +@@ -879,7 +879,7 @@ void detstats(char *iface, const struct + update_panels(); + doupdate(); + +- bzero(&totals, sizeof(struct iftotals)); ++ memset(&totals, 0, sizeof(struct iftotals)); + + if (logging) { + if (strcmp(current_logfile, "") == 0) { diff --git a/package/iptraf/patches/patch-src_ipfrag_c b/package/iptraf/patches/patch-src_ipfrag_c new file mode 100644 index 000000000..2482cfaa6 --- /dev/null +++ b/package/iptraf/patches/patch-src_ipfrag_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/ipfrag.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/ipfrag.c 2009-05-21 23:04:36.000000000 +0200 +@@ -51,7 +51,7 @@ struct fragent *addnewdgram(struct iphdr + fragtail->next_entry = ptmp; + ptmp->prev_entry = fragtail; + } +- bzero(ptmp, sizeof(struct fragent)); ++ memset(ptmp, 0, sizeof(struct fragent)); + ptmp->fragdesclist = malloc(sizeof(struct fragdescent)); + ptmp->fragdesclist->min = 0; + ptmp->fragdesclist->max = 65535; diff --git a/package/iptraf/patches/patch-src_iptraf_c b/package/iptraf/patches/patch-src_iptraf_c new file mode 100644 index 000000000..a9d751c46 --- /dev/null +++ b/package/iptraf/patches/patch-src_iptraf_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/iptraf.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/iptraf.c 2009-05-21 23:02:08.000000000 +0200 +@@ -559,7 +559,7 @@ int main(int argc, char **argv) + exit(1); + } else if (opt != -1) { + if (optarg != 0) { +- bzero(keyparm, 12); ++ memset(keyparm, 0, 12); + strncpy(keyparm, optarg, 11); + } else + strcpy(keyparm, ""); diff --git a/package/iptraf/patches/patch-src_revname_c b/package/iptraf/patches/patch-src_revname_c new file mode 100644 index 000000000..97aae6f8c --- /dev/null +++ b/package/iptraf/patches/patch-src_revname_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/revname.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/revname.c 2009-05-21 23:03:07.000000000 +0200 +@@ -164,7 +164,7 @@ int revname(int *lookup, struct in_addr + struct timeval tv; + int sstat = 0; + +- bzero(target, 45); ++ memset(target, 0, 45); + if (*lookup) { + if (rvnfd > 0) { + su.sun_family = AF_UNIX; diff --git a/package/iptraf/patches/patch-src_rvnamed_c b/package/iptraf/patches/patch-src_rvnamed_c new file mode 100644 index 000000000..0b146369c --- /dev/null +++ b/package/iptraf/patches/patch-src_rvnamed_c @@ -0,0 +1,39 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/rvnamed.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/rvnamed.c 2009-05-21 23:03:43.000000000 +0200 +@@ -99,7 +99,7 @@ void process_rvn_packet(struct rvn *rvnp + if (he == NULL) + strcpy(rvnpacket->fqdn, inet_ntoa(rvnpacket->saddr)); + else { +- bzero(rvnpacket->fqdn, 45); ++ memset(rvnpacket->fqdn, 0, 45); + strncpy(rvnpacket->fqdn, he->h_name, 44); + } + +@@ -306,7 +306,7 @@ int main(void) + } + + if (hi == lastfree) { /* Address not in cache */ +- bzero(&(hostlist[hi]), sizeof(struct hosts)); ++ memset(&(hostlist[hi]), 0, sizeof(struct hosts)); + hi = hostindex; + hostindex++; + if (hostindex == NUM_CACHE_ENTRIES) +@@ -359,7 +359,7 @@ int main(void) + name_resolved(&rvnpacket, hostlist, lastfree); + if (readyidx >= 0) { + rvnpacket.type = RVN_REPLY; +- bzero(rvnpacket.fqdn, 45); ++ memset(rvnpacket.fqdn, 0, 45); + strncpy(rvnpacket.fqdn, hostlist[readyidx].fqdn, + 44); + rvnpacket.ready = RESOLVED; +@@ -454,7 +454,7 @@ int main(void) + } + } + rvnpacket.type = RVN_REPLY; +- bzero(rvnpacket.fqdn, 45); ++ memset(rvnpacket.fqdn, 0, 45); + strcpy(rvnpacket.fqdn, inet_ntoa(rvnpacket.saddr)); + rvnpacket.ready = RESOLVING; + diff --git a/package/iptraf/patches/patch-src_serv_c b/package/iptraf/patches/patch-src_serv_c new file mode 100644 index 000000000..7d1911924 --- /dev/null +++ b/package/iptraf/patches/patch-src_serv_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/serv.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/serv.c 2009-05-21 23:04:11.000000000 +0200 +@@ -713,7 +713,7 @@ void update_serv_rates(struct portlist * + mvwprintw(win, 0, 46, "%10.2f", outrate); + mvwprintw(win, 0, 61, "%10.2f", totalrate); + +- bzero(&(list->barptr->spans), sizeof(struct serv_spans)); ++ memset(&(list->barptr->spans), 0, sizeof(struct serv_spans)); + list->barptr->starttime = time(NULL); + *cleared = 0; + } diff --git a/package/iptraf/patches/patch-src_servname_c b/package/iptraf/patches/patch-src_servname_c new file mode 100644 index 000000000..d0e37bb80 --- /dev/null +++ b/package/iptraf/patches/patch-src_servname_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/servname.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/servname.c 2009-05-21 23:04:24.000000000 +0200 +@@ -27,7 +27,7 @@ void servlook(int servnames, unsigned in + { + static struct servent *sve; + +- bzero(target, maxlen + 1); ++ memset(target, 0, maxlen + 1); + + if (servnames) { + if (protocol == IPPROTO_TCP) diff --git a/package/iptraf/patches/patch-src_tr_c b/package/iptraf/patches/patch-src_tr_c new file mode 100644 index 000000000..391c26e6c --- /dev/null +++ b/package/iptraf/patches/patch-src_tr_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/tr.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/tr.c 2009-05-21 22:59:57.000000000 +0200 +@@ -6,7 +6,7 @@ + * Copyright (c) Gerard Paul Java 2002 + */ + +-#include <asm/types.h> ++#include <sys/types.h> + #include <linux/if_tr.h> + #include <netinet/in.h> + diff --git a/package/iptraf/patches/patch-support_input_c b/package/iptraf/patches/patch-support_input_c new file mode 100644 index 000000000..733b564db --- /dev/null +++ b/package/iptraf/patches/patch-support_input_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/support/input.c 2002-12-26 03:11:22.000000000 +0100 ++++ iptraf-3.0.0/support/input.c 2009-05-21 23:05:37.000000000 +0200 +@@ -55,7 +55,7 @@ void tx_addfield(struct FIELDLIST *list, + newfield->len = len; + newfield->tlen = strlen(initstr); + newfield->buf = malloc(len + 1); +- bzero(newfield->buf, len + 1); ++ memset(newfield->buf, 0, len + 1); + strncpy(newfield->buf, initstr, len); + + if (newfield->tlen > (len)) diff --git a/package/iptraf/patches/patch-support_listbox_c b/package/iptraf/patches/patch-support_listbox_c new file mode 100644 index 000000000..df5521b7f --- /dev/null +++ b/package/iptraf/patches/patch-support_listbox_c @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/support/listbox.c 2002-07-19 18:48:11.000000000 +0200 ++++ iptraf-3.0.0/support/listbox.c 2009-05-21 23:06:00.000000000 +0200 +@@ -19,7 +19,7 @@ void tx_init_listbox(struct scroll_list + int mainattr, int borderattr, int selectattr, + int keyattr) + { +- bzero(list, sizeof(struct scroll_list)); ++ memset(list, 0, sizeof(struct scroll_list)); + list->borderwin = newwin(height, width, starty, startx); + list->borderpanel = new_panel(list->borderwin); + wattrset(list->borderwin, borderattr); +@@ -50,7 +50,7 @@ void tx_add_list_entry(struct scroll_lis + struct textlisttype *ptmp; + + ptmp = malloc(sizeof(struct textlisttype)); +- bzero(ptmp, sizeof(struct textlisttype)); ++ memset(ptmp, 0, sizeof(struct textlisttype)); + + strncpy(ptmp->text, text, MAX_TEXT_LENGTH); + ptmp->nodeptr = node; diff --git a/package/iw/patches/patch-version_sh b/package/iw/patches/patch-version_sh new file mode 100644 index 000000000..b4f0fc044 --- /dev/null +++ b/package/iw/patches/patch-version_sh @@ -0,0 +1,29 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iw-0.9.14.orig/version.sh 2009-05-13 00:10:08.000000000 +0200 ++++ iw-0.9.14/version.sh 2009-05-21 23:14:24.000000000 +0200 +@@ -1,23 +1,7 @@ +-#!/bin/sh ++#!/usr/bin/env bash + + VERSION="0.9.14" + OUT="$1" +- +-if head=`git rev-parse --verify HEAD 2>/dev/null`; then +- git update-index --refresh --unmerged > /dev/null +- descr=$(git describe) +- +- # on git builds check that the version number above +- # is correct... +- [ "${descr%%-*}" = "v$VERSION" ] || exit 2 +- +- echo -n 'const char iw_version[] = "' > "$OUT" +- v="${descr#v}" +- if git diff-index --name-only HEAD | read dummy ; then +- v="$v"-dirty +- fi +-else +- v="$VERSION" +-fi ++v="$VERSION" + + echo "const char iw_version[] = \"$v\";" > "$OUT" diff --git a/package/libnids/patches/patch-src_killtcp_c b/package/libnids/patches/patch-src_killtcp_c new file mode 100644 index 000000000..ddf0beb5a --- /dev/null +++ b/package/libnids/patches/patch-src_killtcp_c @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libnids-1.18.orig/src/killtcp.c 2002-08-21 18:19:40.000000000 +0200 ++++ libnids-1.18/src/killtcp.c 2009-05-21 21:18:44.000000000 +0200 +@@ -100,6 +100,6 @@ void nids_killtcp(struct tcp_stream *a_t + if (initialized) + abort(); + } +-#elif ++#else + #error Something wrong with LIBNET_VER + #endif diff --git a/package/libtorrent/patches/patch-src_protocol_extensions_cc b/package/libtorrent/patches/patch-src_protocol_extensions_cc new file mode 100644 index 000000000..9647dcfb0 --- /dev/null +++ b/package/libtorrent/patches/patch-src_protocol_extensions_cc @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libtorrent-0.12.2.orig/src/protocol/extensions.cc 2008-05-07 14:19:12.000000000 +0200 ++++ libtorrent-0.12.2/src/protocol/extensions.cc 2009-05-21 23:39:00.000000000 +0200 +@@ -36,6 +36,7 @@ + + #include "config.h" + ++#include <cstdio> + #include <limits> + #include <sstream> + diff --git a/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc b/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc new file mode 100644 index 000000000..841918c26 --- /dev/null +++ b/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libtorrent-0.12.2.orig/src/tracker/tracker_dht.cc 2008-05-07 14:19:13.000000000 +0200 ++++ libtorrent-0.12.2/src/tracker/tracker_dht.cc 2009-05-21 23:43:05.000000000 +0200 +@@ -36,6 +36,7 @@ + + #include "config.h" + ++#include <cstdio> + #include <sstream> + + #include "dht/dht_router.h" diff --git a/package/libtorrent/patches/patch-src_tracker_tracker_udp_cc b/package/libtorrent/patches/patch-src_tracker_tracker_udp_cc new file mode 100644 index 000000000..5b3567f09 --- /dev/null +++ b/package/libtorrent/patches/patch-src_tracker_tracker_udp_cc @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libtorrent-0.12.2.orig/src/tracker/tracker_udp.cc 2008-05-07 14:19:13.000000000 +0200 ++++ libtorrent-0.12.2/src/tracker/tracker_udp.cc 2009-05-21 23:39:25.000000000 +0200 +@@ -36,6 +36,7 @@ + + #include "config.h" + ++#include <cstdio> + #include <sigc++/adaptors/bind.h> + #include <torrent/connection_manager.h> + diff --git a/package/openswan/patches/patch-lib_liblwres_Makefile b/package/openswan/patches/patch-lib_liblwres_Makefile new file mode 100644 index 000000000..30b4b3d8b --- /dev/null +++ b/package/openswan/patches/patch-lib_liblwres_Makefile @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- openswan-2.6.21.orig/lib/liblwres/Makefile 2009-03-30 15:11:28.000000000 +0200 ++++ openswan-2.6.21/lib/liblwres/Makefile 2009-05-22 01:07:19.000000000 +0200 +@@ -23,7 +23,7 @@ CINCLUDES = -I${srcdir}${ISCARCH}/includ + -I${srcdir}../libisc/include \ + -I. -I./include -I${srcdir}include + CDEFINES = -g +-CWARNINGS = -Werror ++CWARNINGS = + + CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} + diff --git a/package/openswan/patches/patch-programs_Makefile_program b/package/openswan/patches/patch-programs_Makefile_program new file mode 100644 index 000000000..2fc6e60ce --- /dev/null +++ b/package/openswan/patches/patch-programs_Makefile_program @@ -0,0 +1,16 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- openswan-2.6.21.orig/programs/Makefile.program 2009-03-30 15:11:28.000000000 +0200 ++++ openswan-2.6.21/programs/Makefile.program 2009-05-22 01:09:17.000000000 +0200 +@@ -49,9 +49,9 @@ CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFIL + CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\" + + # die if there are any warnings +-ifndef WERROR +-WERROR:= -Werror +-endif ++#ifndef WERROR ++#WERROR:= -Werror ++#endif + + CFLAGS+= ${WERROR} + |