diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:49:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:49:34 +0200 |
| commit | 8a2754e0fbdea7497281327f2896be2a1253a107 (patch) | |
| tree | bc7c400745fde54e6fb7a010fcb026258564d3bc | |
| parent | 9bd4456c5a83c3474fdf9fe5cf14004a0874e2c8 (diff) | |
| parent | 2d3aaf1664850031f5497e121dc82ab65f63641a (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
583 files changed, 3128 insertions, 2610 deletions
diff --git a/BSDmakefile b/BSDmakefile index 7e64bb03b..64050b550 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -1,7 +1,5 @@ -- lvm package and device-mapper combine and shared - use kmod-template for external kernel modules - optimize iptables package (libdirs depending on choosen kernel features) - checksum for toolchain packages - network scripts for wireless client / ap -- x11 support completion - disable platforms zaurus / qemu etrax @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/GNUmakefile b/GNUmakefile index 182ac083e..45bcb8e52 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,5 +1,3 @@ -# $Id: GNUmakefile 255 2008-12-11 16:20:28Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -1,5 +1,3 @@ -# $Id: Makefile 420 2009-05-08 19:31:15Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -1,16 +1,15 @@ -- rename radiusclient-ng -> freeradius-client +- rescue initramfs image (more archs, generic kernel config ) + - usb boot via stick +- combine lvm2 + devicemapper package - squid package update +- bind isc 9.6.1 +- eglibc support - check mips -mno-abicalls - check ac_cv_func_setpgrp_void=no -- remove glib1 -- rename glib2, gdbm, lib? -- update mt-daapd / rename -- remove $Id$ lines -- CONFIGURE_FILTER for unusual configure scripts, mplayer f.e. -- eglibc support -- rescue initramfs image (more archs, generic kernel config ) - - replace ibm x40 - - usb boot via stick - kernel 2.6.30 -- bind isc 9.6.1 -- asterisk 1.6 +- freebsd build +- win cygwin build +- netbsd build +- macos x build +- openbsd build +- publish via trac+git diff --git a/config/Makefile b/config/Makefile index 278f98849..1f6debc8f 100644 --- a/config/Makefile +++ b/config/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 185 2008-10-28 12:24:05Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/mk/build.mk b/mk/build.mk index ef40ec962..4cdc7b6c7 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 386fbbec4..afad521e2 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. # diff --git a/mk/fetch.mk b/mk/fetch.mk index dc593be0b..5a1ba5d43 100644 --- a/mk/fetch.mk +++ b/mk/fetch.mk @@ -1,8 +1,5 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -#- ifneq ($(strip ${DIST_SUBDIR}),) FULLDISTDIR?= ${DISTDIR}/${DIST_SUBDIR} diff --git a/mk/image.mk b/mk/image.mk index 4388dcaad..5b0408aa3 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index f1ed65f57..69e271d55 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/mk/kernel.mk b/mk/kernel.mk index 5dc271863..f5b85832e 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/mk/linux.mk b/mk/linux.mk index c2b226bc7..c880d8c2a 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/mk/mirrors.mk b/mk/mirrors.mk index bbf41417a..341ed486a 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/mk/modules.mk b/mk/modules.mk index 5283d1ed7..4d27c154a 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/mk/package.mk b/mk/package.mk index 27181e276..1bfa33e12 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 5eac3e0c0..1e3514c52 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -1,8 +1,5 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -#- # Comments: # * pre/do/post-foo are always defined here, but empty. This is so # that we can call it (BSD make has .if target(foo) but GNU not) @@ -14,7 +11,6 @@ # * we want to use styles (configure:gnu, build/install:auto), for # making the Makefiles of the packages more clear -#--- configure pre-configure: do-configure: post-configure: @@ -74,7 +70,6 @@ endif @${MAKE} post-configure $(MAKE_TRACE) touch $@ -#--- build pre-build: do-build: post-build: @@ -95,7 +90,6 @@ endif @env ${MAKE_ENV} ${MAKE} post-build $(MAKE_TRACE) touch $@ -#--- fake pre-install: do-install: post-install: @@ -152,7 +146,6 @@ endif done touch $@ -#--- package ${_IPKGS_COOKIE}: @clean=0; \ for f in ${ALL_IPKGS}; do \ @@ -199,7 +192,6 @@ package: ${ALL_IPKGS} done touch ${_IPKGS_COOKIE} -#--- clean clean-targets: clean-dev-generic clean-dev-generic: diff --git a/mk/rootfs.mk b/mk/rootfs.mk index e23769979..455b6a979 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/mk/split-cfg.mk b/mk/split-cfg.mk index 0aa5acba1..6b1091e89 100644 --- a/mk/split-cfg.mk +++ b/mk/split-cfg.mk @@ -1,8 +1,5 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -#- # must work with both BSD and GNU make ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG: ${TOPDIR}/.config \ diff --git a/mk/vars.mk b/mk/vars.mk index 5532cb07f..0bc1b8253 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile index 993b9b164..b67753a9a 100644 --- a/package/6tunnel/Makefile +++ b/package/6tunnel/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/Config.in b/package/Config.in index 84b8e4e68..d080a2d3c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -47,7 +45,6 @@ source "package/vim/Config.in" endmenu menu "Filesystem utilities" -source "package/device-mapper/Config.in" source "package/dosfstools/Config.in" source "package/e2fsprogs/Config.in" source "package/fuse/Config.in" @@ -205,8 +202,6 @@ menu "IPv6" depends ADK_IPV6 source "package/6tunnel/Config.in" source "package/aiccu/Config.in" -# timeb.h / dn_comp issues -#source "package/dhcpv6/Config.in" source "package/miredo/Config.in" source "package/mrd6/Config.in" source "package/ndisc/Config.in" @@ -291,7 +286,8 @@ source "package/rtorrent/Config.in" endmenu menu "PPP / PPTP / RADIUS" -source "package/freeradius/Config.in" +source "package/freeradius-client/Config.in" +source "package/freeradius-server/Config.in" source "package/ppp/Config.in" source "package/pptp/Config.in" source "package/pptpd/Config.in" @@ -425,7 +421,6 @@ source "package/popt/Config.in" # libpopt source "package/postgresql/Config.in" # libpq source "package/libpthread/Config.in" source "package/libthread_db/Config.in" -source "package/radiusclient-ng/Config.in" #libradiusclient-ng source "package/readline/Config.in" # libreadline source "package/cyrus-sasl/Config.in" # libsasl2 source "package/speex/Config.in" # libspeex @@ -452,7 +447,7 @@ source "package/zlib/Config.in" endmenu menu "X" -depends ADK_XORG +depends ADK_X11 source "package/xorg-server/Config.in" source "package/xf86-video-geode/Config.in" @@ -460,6 +455,7 @@ menu "X Libraries" source "package/libICE/Config.in" source "package/libSM/Config.in" source "package/libX11/Config.in" +source "package/libXv/Config.in" source "package/libXdmcp/Config.in" source "package/libXext/Config.in" source "package/libXfont/Config.in" @@ -471,8 +467,11 @@ source "package/libXaw/Config.in" source "package/libXmu/Config.in" source "package/libXpm/Config.in" source "package/libXt/Config.in" +source "package/libXxf86dga/Config.in" source "package/pixman/Config.in" source "package/xf86dga/Config.in" +source "package/xkbcomp/Config.in" +source "package/xkeyboard-config/Config.in" endmenu endmenu diff --git a/package/Depends.mk b/package/Depends.mk index 81a31af4d..3947db184 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -18,7 +16,7 @@ cbtt-compile: uclibc++-compile endif cbtt-compile: mysql-compile zlib-compile collectd-compile: libpthread-compile -cryptsetup-compile: libgcrypt-compile popt-compile e2fsprogs-compile device-mapper-compile +cryptsetup-compile: libgcrypt-compile popt-compile e2fsprogs-compile lvm-compile ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y) ctorrent-compile: uclibc++-compile endif @@ -37,7 +35,7 @@ davfs2-compile: libiconv-compile neon-compile dbus-compile: expat-compile deco-compile: ncurses-compile dhcpv6-compile: libnl-compile ncurses-compile -digitemp-compile: libusb-compile +digitemp-compile: libusb-compile libusb-compat-compile dsniff-compile: libnids-compile openssl-compile gdbm-compile elinks-compile: openssl-compile esound-compile: libaudiofile-compile @@ -96,13 +94,14 @@ libnids-compile: libnet-compile libpcap-compile libp11-compile: openssl-compile libtool-compile libpng-compile: zlib-compile libshout-compile: libvorbis-compile -libusb-compile: libusb-compat-compile +libusb-compat-compile: libusb-compile libtorrent-compile: openssl-compile libsigc++-compile libvorbis-compile: libogg-compile libfontenc-compile: xproto-compile zlib-compile libICE-compile: xtrans-compile libSM-compile: libICE-compile libXt-compile: libSM-compile +libXv-compile: libX11-compile videoproto-compile libXmu-compile: libXt-compile libXext-compile: libX11-compile libXaw-compile: libXext-compile libXmu-compile libXpm-compile @@ -229,6 +228,8 @@ endif wx200d-compile: postgresql-compile xfsprogs-compile: e2fsprogs-compile libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile +xkeyboard-config-compile: xkbcomp-compile +xf86-video-geode-compile: xorg-server-compile xf86dga-compile: libXxf86dga-compile xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \ damageproto-compile scrnsaverproto-compile resourceproto-compile \ @@ -258,15 +259,16 @@ asterisk-compile: sqlite-compile endif -freeradius-compile: libtool-compile openssl-compile +freeradius-client-compile: openssl-compile +freeradius-server-compile: libtool-compile openssl-compile ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),) -freeradius-compile: openldap-compile +freeradius-server-compile: openldap-compile endif ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),) -freeradius-compile: mysql-compile +freeradius-server-compile: mysql-compile endif ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),) -freeradius-compile: postgresql-compile +freeradius-server-compile: postgresql-compile endif hostapd-compile: libnl-compile openssl-compile diff --git a/package/Makefile b/package/Makefile index 2b107a79a..9ec5a3f18 100644 --- a/package/Makefile +++ b/package/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -63,10 +61,8 @@ package-$(ADK_PACKAGE_DAMAGEPROTO) += damageproto package-$(ADK_PACKAGE_DAVFS2) += davfs2 package-$(ADK_PACKAGE_DBUS) += dbus package-$(ADK_PACKAGE_DECO) += deco -package-$(ADK_PACKAGE_DEVICE_MAPPER) += device-mapper package-$(ADK_COMPILE_DHCP) += dhcp package-$(ADK_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder -package-$(ADK_COMPILE_DHCPV6) += dhcpv6 package-$(ADK_PACKAGE_DIGITEMP) += digitemp package-$(ADK_PACKAGE_DNSMASQ) += dnsmasq package-$(ADK_PACKAGE_DOSFSTOOLS) += dosfstools @@ -96,7 +92,8 @@ package-$(ADK_PACKAGE_FONTCACHEPROTO) += fontcacheproto package-$(ADK_PACKAGE_FPING) += fping package-$(ADK_PACKAGE_FPROBE) += fprobe package-$(ADK_PACKAGE_FPROBE_ULOG) += fprobe-ulog -package-$(ADK_PACKAGE_FREERADIUS) += freeradius +package-$(ADK_COMPILE_FREERADIUS_CLIENT) += freeradius-client +package-$(ADK_PACKAGE_FREERADIUS_SERVER) += freeradius-server package-$(ADK_COMPILE_FREETYPE) += freetype package-$(ADK_PACKAGE_FRICKIN) += frickin package-$(ADK_COMPILE_FUSE) += fuse @@ -206,10 +203,12 @@ package-$(ADK_PACKAGE_LIBX11) += libX11 package-$(ADK_PACKAGE_LIBXAU) += libXau package-$(ADK_PACKAGE_LIBXAW) += libXaw package-$(ADK_PACKAGE_LIBXPM) += libXpm +package-$(ADK_PACKAGE_LIBXV) += libXv package-$(ADK_PACKAGE_LIBXDMCP) += libXdmcp package-$(ADK_PACKAGE_LIBXEXT) += libXext package-$(ADK_PACKAGE_LIBXFONT) += libXfont package-$(ADK_PACKAGE_LIBXKBFILE) += libxkbfile +package-$(ADK_PACKAGE_LIBXXF86DGA) += libXxf86dga package-$(ADK_PACKAGE_LIBXML2) += libxml2 package-$(ADK_PACKAGE_LIBXMU) += libXmu package-$(ADK_PACKAGE_LIBXSLT) += libxslt @@ -298,7 +297,6 @@ package-$(ADK_PACKAGE_PROCMAIL) += procmail package-$(ADK_PACKAGE_PROCPS) += procps package-$(ADK_PACKAGE_PTUNNEL) += ptunnel package-$(ADK_PACKAGE_QUAGGA) += quagga -package-$(ADK_COMPILE_RADIUSCLIENT_NG) += radiusclient-ng package-$(ADK_PACKAGE_RADDUMP) += raddump package-$(ADK_PACKAGE_RADVD) += radvd package-$(ADK_PACKAGE_RANDRPROTO) += randrproto @@ -397,6 +395,8 @@ package-$(ADK_PACKAGE_XFSPROGS) += xfsprogs package-$(ADK_PACKAGE_XINETD) += xinetd package-$(ADK_PACKAGE_XCMISCPROTO) += xcmiscproto package-$(ADK_PACKAGE_XEXTPROTO) += xextproto +package-$(ADK_PACKAGE_XKBCOMP) += xkbcomp +package-$(ADK_PACKAGE_XKEYBOARD_CONFIG) += xkeyboard-config package-$(ADK_PACKAGE_XF86_VIDEO_GEODE) += xf86-video-geode package-$(ADK_PACKAGE_XF86DGA) += xf86dga package-$(ADK_PACKAGE_XF86DGAPROTO) += xf86dgaproto diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 36a3900d3..0aba387be 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index 3d53df6a4..ef075eedd 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index 4c82c6419..c4ce43379 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 5434bc399..08fc5f949 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 2404632e8..ecc96942f 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/apr/Makefile b/package/apr/Makefile index 6917bb2bd..ea20ddfed 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 50c924341..065d46951 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index 2c2c51cb0..1b3c0d7aa 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index f4b0b9f23..2a9dd70b5 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/atftp/Makefile b/package/atftp/Makefile index ec903cdf7..086e741ce 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/atftp/files/atftp.postinst b/package/atftp/files/atftp.postinst new file mode 100644 index 000000000..dddd0b0d1 --- /dev/null +++ b/package/atftp/files/atftp.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +grep -q '^tftp[[:space:]]*69/tcp' ${IPKG_INSTROOT}/etc/services 2>/dev/null +if [ $? -ne 0 ]; then + echo "tftp 69/tcp" >>${IPKG_INSTROOT}/etc/services + echo "tftp 69/udp" >>${IPKG_INSTROOT}/etc/services +fi diff --git a/package/atftp/ipkg/files/postinst b/package/atftp/ipkg/files/postinst deleted file mode 100755 index 35a2c3b36..000000000 --- a/package/atftp/ipkg/files/postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env mksh -grep -q '^tftp[[:space:]]*69/tcp' ${IPKG_INSTROOT}/etc/services 2>/dev/null -if [ $? -ne 0 ]; then - echo "tftp 69/tcp" >>${IPKG_INSTROOT}/etc/services - echo "tftp 69/udp" >>${IPKG_INSTROOT}/etc/services - echo "tftp-mcast 1758/tcp" >>${IPKG_INSTROOT}/etc/services - echo "tftp-mcast 1758/udp" >>${IPKG_INSTROOT}/etc/services -fi diff --git a/package/autossh/Makefile b/package/autossh/Makefile index f39bec8c5..414bf99e6 100644 --- a/package/autossh/Makefile +++ b/package/autossh/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 513b52963..7ba87d368 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 7f4f76097..df231bc19 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 52b82b79e..213895e96 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -26,7 +24,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-install: - $(CP) ./files/* $(IDIR_BASE_FILES) + $(CP) ./extra/* $(IDIR_BASE_FILES) $(CP) $(TOPDIR)/target/$(DEVICE)/files/* $(IDIR_BASE_FILES) $(SED) 's,@TARGET@,$(DEVICE),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf @@ -52,6 +50,7 @@ endif mkdir -p $(IDIR_BASE_FILES)/usr/lib mkdir -p $(IDIR_BASE_FILES)/usr/bin chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init + chmod 600 $(IDIR_BASE_FILES)/etc/shadow ln -sf ../tmp/resolv.conf $(IDIR_BASE_FILES)/etc/resolv.conf ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab rm -rf $(IDIR_BASE_FILES)/var diff --git a/package/base-files/extra/etc/banner b/package/base-files/extra/etc/banner new file mode 100644 index 000000000..49dbb9685 --- /dev/null +++ b/package/base-files/extra/etc/banner @@ -0,0 +1 @@ + Linux created with OpenADK diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/extra/etc/functions.sh index 4d225b882..4d225b882 100644 --- a/package/base-files/files/etc/functions.sh +++ b/package/base-files/extra/etc/functions.sh diff --git a/package/base-files/files/etc/group b/package/base-files/extra/etc/group index 1f444a8bf..1f444a8bf 100644 --- a/package/base-files/files/etc/group +++ b/package/base-files/extra/etc/group diff --git a/package/base-files/files/etc/hosts b/package/base-files/extra/etc/hosts index 87d837fc7..87d837fc7 100644 --- a/package/base-files/files/etc/hosts +++ b/package/base-files/extra/etc/hosts diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/extra/etc/init.d/boot index f71e46240..f71e46240 100644 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/extra/etc/init.d/boot diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/extra/etc/init.d/done index e5b655bb6..e5b655bb6 100644 --- a/package/base-files/files/etc/init.d/done +++ b/package/base-files/extra/etc/init.d/done diff --git a/package/base-files/files/etc/init.d/rcK b/package/base-files/extra/etc/init.d/rcK index e94d1a296..e94d1a296 100755 --- a/package/base-files/files/etc/init.d/rcK +++ b/package/base-files/extra/etc/init.d/rcK diff --git a/package/base-files/files/etc/init.d/rcS b/package/base-files/extra/etc/init.d/rcS index fd56feebf..fd56feebf 100755 --- a/package/base-files/files/etc/init.d/rcS +++ b/package/base-files/extra/etc/init.d/rcS diff --git a/package/base-files/files/etc/inittab b/package/base-files/extra/etc/inittab index 960ea77d8..960ea77d8 100644 --- a/package/base-files/files/etc/inittab +++ b/package/base-files/extra/etc/inittab diff --git a/package/base-files/extra/etc/ipkg.conf b/package/base-files/extra/etc/ipkg.conf new file mode 100644 index 000000000..6c9242620 --- /dev/null +++ b/package/base-files/extra/etc/ipkg.conf @@ -0,0 +1,3 @@ +src openadk http://www.openadk.org/packages/@TARGET@ +dest root / +dest ram /tmp diff --git a/package/base-files/files/etc/mdev.conf b/package/base-files/extra/etc/mdev.conf index 61b818523..61b818523 100644 --- a/package/base-files/files/etc/mdev.conf +++ b/package/base-files/extra/etc/mdev.conf diff --git a/package/base-files/files/etc/modules b/package/base-files/extra/etc/modules index 014f40f2b..014f40f2b 100644 --- a/package/base-files/files/etc/modules +++ b/package/base-files/extra/etc/modules diff --git a/package/base-files/files/etc/network/interfaces b/package/base-files/extra/etc/network/interfaces index f1bd92ed2..f1bd92ed2 100644 --- a/package/base-files/files/etc/network/interfaces +++ b/package/base-files/extra/etc/network/interfaces diff --git a/package/base-files/files/etc/passwd b/package/base-files/extra/etc/passwd index 87eee84af..87eee84af 100644 --- a/package/base-files/files/etc/passwd +++ b/package/base-files/extra/etc/passwd diff --git a/package/base-files/files/etc/profile b/package/base-files/extra/etc/profile index 55002b01f..55002b01f 100644 --- a/package/base-files/files/etc/profile +++ b/package/base-files/extra/etc/profile diff --git a/package/base-files/files/etc/protocols b/package/base-files/extra/etc/protocols index dfe58ed22..dfe58ed22 100644 --- a/package/base-files/files/etc/protocols +++ b/package/base-files/extra/etc/protocols diff --git a/package/base-files/files/etc/rc.conf b/package/base-files/extra/etc/rc.conf index 024007589..024007589 100644 --- a/package/base-files/files/etc/rc.conf +++ b/package/base-files/extra/etc/rc.conf diff --git a/package/base-files/files/etc/shadow b/package/base-files/extra/etc/shadow index 3683d71ea..3683d71ea 100644 --- a/package/base-files/files/etc/shadow +++ b/package/base-files/extra/etc/shadow diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/extra/etc/sysctl.conf index e69de29bb..e69de29bb 100644 --- a/package/base-files/files/etc/sysctl.conf +++ b/package/base-files/extra/etc/sysctl.conf diff --git a/package/base-files/files/init b/package/base-files/extra/init index 567993cbb..567993cbb 100755 --- a/package/base-files/files/init +++ b/package/base-files/extra/init diff --git a/package/base-files/files/lib/mdev/init b/package/base-files/extra/lib/mdev/init index d2ae13e9c..d2ae13e9c 100644 --- a/package/base-files/files/lib/mdev/init +++ b/package/base-files/extra/lib/mdev/init diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/extra/usr/share/udhcpc/default.script index 02e4a7a3c..02e4a7a3c 100755 --- a/package/base-files/files/usr/share/udhcpc/default.script +++ b/package/base-files/extra/usr/share/udhcpc/default.script diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner deleted file mode 100644 index bdee76e22..000000000 --- a/package/base-files/files/etc/banner +++ /dev/null @@ -1,3 +0,0 @@ - - Linux created with OpenADK - --- build from revision $R --- diff --git a/package/base-files/files/etc/ipkg.conf b/package/base-files/files/etc/ipkg.conf deleted file mode 100644 index 6f3a8be2d..000000000 --- a/package/base-files/files/etc/ipkg.conf +++ /dev/null @@ -1,3 +0,0 @@ -src openadk http://waldemar-brodkorb.de/openadk/downloads/@TARGET@/packages -dest root / -dest ram /tmp diff --git a/package/bash/Makefile b/package/bash/Makefile index 28f4c134d..838bb92e4 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/bc/Makefile b/package/bc/Makefile index f70adad9f..3a231028a 100644 --- a/package/bc/Makefile +++ b/package/bc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile index 56700a4c6..d6add2e20 100644 --- a/package/bigreqsproto/Makefile +++ b/package/bigreqsproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/bind/Makefile b/package/bind/Makefile index 748328cf4..15b978615 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -80,11 +78,11 @@ post-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_DIG}/usr/bin/ # bind lib ${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib - ${INSTALL_BIN} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 57b564df0..65b5d872e 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 02bde57af..a86cbb921 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index 67c7723dc..2652c0a94 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 4dd1467a5..4c39c00b2 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index 1390a7a34..dc7bb574c 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile index 6fbda287c..aa352ad69 100644 --- a/package/bridge-utils/Makefile +++ b/package/bridge-utils/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 94f756c8b..80e090e17 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 1d10696c6..ca7059acc 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,7 +1,18 @@ -diff -Nur busybox-1.12.1.orig/archival/Config.in busybox-1.12.1/archival/Config.in ---- busybox-1.12.1.orig/archival/Config.in 2008-09-28 20:04:15.000000000 +0200 -+++ busybox-1.12.1/archival/Config.in 2008-10-23 11:41:37.000000000 +0200 -@@ -157,6 +157,14 @@ +diff -Nur busybox-1.13.4.orig/Makefile busybox-1.13.4/Makefile +--- busybox-1.13.4.orig/Makefile 2009-04-15 02:11:01.000000000 +0200 ++++ busybox-1.13.4/Makefile 2009-05-31 15:40:37.158023800 +0200 +@@ -444,6 +444,7 @@ + + libs-y := \ + archival/ \ ++ archival/libipkg/ \ + archival/libunarchive/ \ + console-tools/ \ + coreutils/ \ +diff -Nur busybox-1.13.4.orig/archival/Config.in busybox-1.13.4/archival/Config.in +--- busybox-1.13.4.orig/archival/Config.in 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.4/archival/Config.in 2009-05-31 15:40:36.993689729 +0200 +@@ -158,6 +158,14 @@ gzip is used to compress files. It's probably the most widely used UNIX compression program. @@ -16,10 +27,21 @@ diff -Nur busybox-1.12.1.orig/archival/Config.in busybox-1.12.1/archival/Config. config RPM2CPIO bool "rpm2cpio" default n -diff -Nur busybox-1.12.1.orig/archival/dpkg.c busybox-1.12.1/archival/dpkg.c ---- busybox-1.12.1.orig/archival/dpkg.c 2008-09-28 20:04:15.000000000 +0200 -+++ busybox-1.12.1/archival/dpkg.c 2008-10-23 11:53:33.000000000 +0200 -@@ -1481,16 +1481,7 @@ +diff -Nur busybox-1.13.4.orig/archival/Kbuild busybox-1.13.4/archival/Kbuild +--- busybox-1.13.4.orig/archival/Kbuild 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.4/archival/Kbuild 2009-05-31 15:40:36.997989438 +0200 +@@ -16,6 +16,7 @@ + lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o + lib-$(CONFIG_GUNZIP) += bbunzip.o + lib-$(CONFIG_GZIP) += gzip.o bbunzip.o ++lib-$(CONFIG_IPKG) += ipkg.o + lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o + lib-$(CONFIG_RPM) += rpm.o + lib-$(CONFIG_TAR) += tar.o +diff -Nur busybox-1.13.4.orig/archival/dpkg.c busybox-1.13.4/archival/dpkg.c +--- busybox-1.13.4.orig/archival/dpkg.c 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.4/archival/dpkg.c 2009-05-31 15:40:36.993689729 +0200 +@@ -1485,16 +1485,7 @@ return ar_handle->sub_archive->buffer; } @@ -37,9 +59,9 @@ diff -Nur busybox-1.12.1.orig/archival/dpkg.c busybox-1.12.1/archival/dpkg.c static void unpack_package(deb_file_t *deb_file) { -diff -Nur busybox-1.12.1.orig/archival/ipkg.c busybox-1.12.1/archival/ipkg.c ---- busybox-1.12.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/ipkg.c 2008-10-23 12:14:28.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/ipkg.c busybox-1.13.4/archival/ipkg.c +--- busybox-1.13.4.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/ipkg.c 2009-05-31 15:40:36.993689729 +0200 @@ -0,0 +1,28 @@ +/* ipkg.c - the itsy package management system + @@ -69,20 +91,73 @@ diff -Nur busybox-1.12.1.orig/archival/ipkg.c busybox-1.12.1/archival/ipkg.c +{ + return ipkg_op(argc, argv); +} -diff -Nur busybox-1.12.1.orig/archival/Kbuild busybox-1.12.1/archival/Kbuild ---- busybox-1.12.1.orig/archival/Kbuild 2008-09-28 20:04:15.000000000 +0200 -+++ busybox-1.12.1/archival/Kbuild 2008-10-23 11:41:37.000000000 +0200 -@@ -16,6 +16,7 @@ - lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o - lib-$(CONFIG_GUNZIP) += bbunzip.o - lib-$(CONFIG_GZIP) += gzip.o bbunzip.o -+lib-$(CONFIG_IPKG) += ipkg.o - lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o - lib-$(CONFIG_RPM) += rpm.o - lib-$(CONFIG_TAR) += tar.o -diff -Nur busybox-1.12.1.orig/archival/libipkg/args.c busybox-1.12.1/archival/libipkg/args.c ---- busybox-1.12.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/args.c 2008-10-23 15:00:11.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/Kbuild busybox-1.13.4/archival/libipkg/Kbuild +--- busybox-1.13.4.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/Kbuild 2009-05-31 15:40:37.069994700 +0200 +@@ -0,0 +1,60 @@ ++# Makefile for busybox ++# ++# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> ++# Copyright (C) 2006 OpenWrt.org ++# ++# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. ++ ++LIBIPKG_CORE_OBJS:= \ ++ args.o \ ++ libipkg.o \ ++ user.o \ ++ ++LIBIPKG_CMD_OBJS:= \ ++ ipkg_cmd.o \ ++ ipkg_configure.o \ ++ ipkg_download.o \ ++ ipkg_install.o \ ++ ipkg_remove.o \ ++ ipkg_upgrade.o \ ++ ++LIBIPKG_DB_OBJS:= \ ++ hash_table.o \ ++ ipkg_conf.o \ ++ ipkg_utils.o \ ++ pkg.o \ ++ pkg_depends.o \ ++ pkg_extract.o \ ++ pkg_hash.o \ ++ pkg_parse.o \ ++ pkg_vec.o \ ++ ++LIBIPKG_LIST_OBJS:= \ ++ conffile.o \ ++ conffile_list.o \ ++ nv_pair.o \ ++ nv_pair_list.o \ ++ pkg_dest.o \ ++ pkg_dest_list.o \ ++ pkg_src.o \ ++ pkg_src_list.o \ ++ str_list.o \ ++ void_list.o \ ++ ++LIBIPKG_UTIL_OBJS:= \ ++ file_util.o \ ++ ipkg_message.o \ ++ str_util.o \ ++ xsystem.o \ ++ ++lib-y := ++lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS) ++lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS) ++lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS) ++lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS) ++lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS) ++ ++ifeq ($(strip $(IPKG_ARCH)),) ++IPKG_ARCH:=$(TARGET_ARCH) ++endif ++CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" +diff -Nur busybox-1.13.4.orig/archival/libipkg/args.c busybox-1.13.4/archival/libipkg/args.c +--- busybox-1.13.4.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/args.c 2009-05-31 15:40:36.997989438 +0200 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -326,9 +401,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/args.c busybox-1.12.1/archival/li +{ + bb_error_msg("version %s\n", IPKG_VERSION); +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/args.h busybox-1.12.1/archival/libipkg/args.h ---- busybox-1.12.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/args.h 2008-10-23 14:59:44.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/args.h busybox-1.13.4/archival/libipkg/args.h +--- busybox-1.13.4.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/args.h 2009-05-31 15:40:36.997989438 +0200 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -402,9 +477,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/args.h busybox-1.12.1/archival/li +void args_usage(const char *complaint); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.c busybox-1.12.1/archival/libipkg/conffile.c ---- busybox-1.12.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/conffile.c 2008-10-23 12:48:24.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile.c busybox-1.13.4/archival/libipkg/conffile.c +--- busybox-1.13.4.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/conffile.c 2009-05-31 15:40:36.997989438 +0200 @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -471,9 +546,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.c busybox-1.12.1/archiva + + return ret; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.h busybox-1.12.1/archival/libipkg/conffile.h ---- busybox-1.12.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/conffile.h 2008-10-23 12:40:12.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile.h busybox-1.13.4/archival/libipkg/conffile.h +--- busybox-1.13.4.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/conffile.h 2009-05-31 15:40:36.997989438 +0200 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -505,9 +580,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.h busybox-1.12.1/archiva + +#endif + -diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.c busybox-1.12.1/archival/libipkg/conffile_list.c ---- busybox-1.12.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/conffile_list.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile_list.c busybox-1.13.4/archival/libipkg/conffile_list.c +--- busybox-1.13.4.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/conffile_list.c 2009-05-31 15:40:37.001989668 +0200 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -556,9 +631,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.c busybox-1.12.1/ar + return nv_pair_list_pop(list); +} + -diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.h busybox-1.12.1/archival/libipkg/conffile_list.h ---- busybox-1.12.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/conffile_list.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile_list.h busybox-1.13.4/archival/libipkg/conffile_list.h +--- busybox-1.13.4.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/conffile_list.h 2009-05-31 15:40:37.005990736 +0200 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -596,9 +671,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.h busybox-1.12.1/ar + +#endif + -diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.c busybox-1.12.1/archival/libipkg/file_util.c ---- busybox-1.12.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/file_util.c 2008-10-23 12:34:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/file_util.c busybox-1.13.4/archival/libipkg/file_util.c +--- busybox-1.13.4.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/file_util.c 2009-05-31 15:40:37.005990736 +0200 @@ -0,0 +1,132 @@ +/* file_util.c - convenience routines for common stat operations + @@ -732,9 +807,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.c busybox-1.12.1/archiv + return hash_file(file_name, HASH_MD5); +} + -diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.h busybox-1.12.1/archival/libipkg/file_util.h ---- busybox-1.12.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/file_util.h 2008-10-23 12:30:58.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/file_util.h busybox-1.13.4/archival/libipkg/file_util.h +--- busybox-1.13.4.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/file_util.h 2009-05-31 15:40:37.005990736 +0200 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -765,9 +840,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.h busybox-1.12.1/archiv +uint8_t *file_md5sum_alloc(const char *file_name); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/hash_table.c busybox-1.12.1/archival/libipkg/hash_table.c ---- busybox-1.12.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/hash_table.c 2008-10-23 16:12:57.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/hash_table.c busybox-1.13.4/archival/libipkg/hash_table.c +--- busybox-1.13.4.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/hash_table.c 2009-05-31 15:40:37.005990736 +0200 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -924,9 +999,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/hash_table.c busybox-1.12.1/archi + } +} + -diff -Nur busybox-1.12.1.orig/archival/libipkg/hash_table.h busybox-1.12.1/archival/libipkg/hash_table.h ---- busybox-1.12.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/hash_table.h 2008-10-23 16:13:18.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/hash_table.h busybox-1.13.4/archival/libipkg/hash_table.h +--- busybox-1.13.4.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/hash_table.h 2009-05-31 15:40:37.005990736 +0200 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -972,9 +1047,79 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/hash_table.h busybox-1.12.1/archi +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data); + +#endif /* _HASH_TABLE_H_ */ -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.12.1/archival/libipkg/ipkg_cmd.c ---- busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_cmd.c 2008-10-23 15:06:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg.h busybox-1.13.4/archival/libipkg/ipkg.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg.h 2009-05-31 15:40:37.037992297 +0200 +@@ -0,0 +1,66 @@ ++/* ipkg.h - the itsy package management system ++ ++ Carl D. Worth ++ ++ Copyright (C) 2001 University of Southern California ++ ++ This program 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, or (at ++ your option) any later version. ++ ++ This program 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. ++*/ ++ ++#ifndef IPKG_H ++#define IPKG_H ++ ++#include "libbb.h" ++ ++#include "ipkg_includes.h" ++#include "ipkg_conf.h" ++#include "ipkg_message.h" ++ ++#define IPKG_PKG_EXTENSION ".ipk" ++#define DPKG_PKG_EXTENSION ".deb" ++ ++#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-" ++#define IPKG_PKG_VERSION_SEP_CHAR '_' ++ ++#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg" ++#define IPKG_LISTS_DIR_SUFFIX "lists" ++#define IPKG_INFO_DIR_SUFFIX "info" ++#define IPKG_STATUS_FILE_SUFFIX "status" ++ ++#define IPKG_BACKUP_SUFFIX "-ipkg.backup" ++ ++#define IPKG_LIST_DESCRIPTION_LENGTH 128 ++ ++#define IPKG_VERSION "1.00" ++ ++ ++enum ipkg_error { ++ IPKG_SUCCESS = 0, ++ IPKG_PKG_DEPS_UNSATISFIED, ++ IPKG_PKG_IS_ESSENTIAL, ++ IPKG_PKG_HAS_DEPENDENTS, ++ IPKG_PKG_HAS_NO_CANDIDATE ++}; ++typedef enum ipkg_error ipkg_error_t; ++ ++extern int ipkg_state_changed; ++ ++ ++struct errlist { ++ char * errmsg; ++ struct errlist * next; ++} ; ++ ++extern struct errlist* error_list; ++ ++extern ipkg_conf_t *global_conf; ++ ++#endif +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_cmd.c busybox-1.13.4/archival/libipkg/ipkg_cmd.c +--- busybox-1.13.4.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_cmd.c 2009-05-31 15:40:37.013991196 +0200 @@ -0,0 +1,1433 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -2409,9 +2554,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.12.1/archiva +} + + -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.12.1/archival/libipkg/ipkg_cmd.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_cmd.h 2008-10-23 13:46:55.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_cmd.h busybox-1.13.4/archival/libipkg/ipkg_cmd.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_cmd.h 2009-05-31 15:40:37.021990539 +0200 @@ -0,0 +1,46 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2459,9 +2604,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.12.1/archiva +int pkg_mark_provides(pkg_t *pkg); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_conf.c busybox-1.12.1/archival/libipkg/ipkg_conf.c ---- busybox-1.12.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_conf.c 2008-10-23 13:45:16.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_conf.c busybox-1.13.4/archival/libipkg/ipkg_conf.c +--- busybox-1.13.4.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_conf.c 2009-05-31 15:40:37.021990539 +0200 @@ -0,0 +1,711 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3174,9 +3319,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_conf.c busybox-1.12.1/archiv + sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename); + return root_filename; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_conf.h busybox-1.12.1/archival/libipkg/ipkg_conf.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_conf.h 2008-10-23 13:41:34.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_conf.h busybox-1.13.4/archival/libipkg/ipkg_conf.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_conf.h 2009-05-31 15:40:37.025991328 +0200 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3285,9 +3430,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_conf.h busybox-1.12.1/archiv +char *root_filename_alloc(ipkg_conf_t *conf, char *filename); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_configure.c busybox-1.12.1/archival/libipkg/ipkg_configure.c ---- busybox-1.12.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_configure.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_configure.c busybox-1.13.4/archival/libipkg/ipkg_configure.c +--- busybox-1.13.4.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_configure.c 2009-05-31 15:40:37.025991328 +0200 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3329,9 +3474,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_configure.c busybox-1.12.1/a + return 0; +} + -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_configure.h busybox-1.12.1/archival/libipkg/ipkg_configure.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_configure.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_configure.h busybox-1.13.4/archival/libipkg/ipkg_configure.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_configure.h 2009-05-31 15:40:37.025991328 +0200 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3358,9 +3503,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_configure.h busybox-1.12.1/a +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_download.c busybox-1.12.1/archival/libipkg/ipkg_download.c ---- busybox-1.12.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_download.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_download.c busybox-1.13.4/archival/libipkg/ipkg_download.c +--- busybox-1.13.4.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_download.c 2009-05-31 15:42:41.497770134 +0200 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3433,8 +3578,8 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_download.c busybox-1.12.1/ar + } + + /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey 7/23/2002 */ -+ sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s -P %s %s", -+ (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "", ++ sprintf_alloc(&cmd, "wget %s %s%s %s%s %s -P %s %s", ++ (conf->http_proxy || conf->ftp_proxy) ? "-Y on" : "", + conf->proxy_user ? "--proxy-user=" : "", + conf->proxy_user ? conf->proxy_user : "", + conf->proxy_passwd ? "--proxy-passwd=" : "", @@ -3557,9 +3702,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_download.c busybox-1.12.1/ar + } + return 0; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_download.h busybox-1.12.1/archival/libipkg/ipkg_download.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_download.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_download.h busybox-1.13.4/archival/libipkg/ipkg_download.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_download.h 2009-05-31 15:40:37.033992625 +0200 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3591,79 +3736,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_download.h busybox-1.12.1/ar +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg.h busybox-1.12.1/archival/libipkg/ipkg.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg.h 2008-10-23 13:40:24.000000000 +0200 -@@ -0,0 +1,66 @@ -+/* ipkg.h - the itsy package management system -+ -+ Carl D. Worth -+ -+ Copyright (C) 2001 University of Southern California -+ -+ This program 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, or (at -+ your option) any later version. -+ -+ This program 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. -+*/ -+ -+#ifndef IPKG_H -+#define IPKG_H -+ -+#include "libbb.h" -+ -+#include "ipkg_includes.h" -+#include "ipkg_conf.h" -+#include "ipkg_message.h" -+ -+#define IPKG_PKG_EXTENSION ".ipk" -+#define DPKG_PKG_EXTENSION ".deb" -+ -+#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-" -+#define IPKG_PKG_VERSION_SEP_CHAR '_' -+ -+#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg" -+#define IPKG_LISTS_DIR_SUFFIX "lists" -+#define IPKG_INFO_DIR_SUFFIX "info" -+#define IPKG_STATUS_FILE_SUFFIX "status" -+ -+#define IPKG_BACKUP_SUFFIX "-ipkg.backup" -+ -+#define IPKG_LIST_DESCRIPTION_LENGTH 128 -+ -+#define IPKG_VERSION "1.00" -+ -+ -+enum ipkg_error { -+ IPKG_SUCCESS = 0, -+ IPKG_PKG_DEPS_UNSATISFIED, -+ IPKG_PKG_IS_ESSENTIAL, -+ IPKG_PKG_HAS_DEPENDENTS, -+ IPKG_PKG_HAS_NO_CANDIDATE -+}; -+typedef enum ipkg_error ipkg_error_t; -+ -+extern int ipkg_state_changed; -+ -+ -+struct errlist { -+ char * errmsg; -+ struct errlist * next; -+} ; -+ -+extern struct errlist* error_list; -+ -+extern ipkg_conf_t *global_conf; -+ -+#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_includes.h busybox-1.12.1/archival/libipkg/ipkg_includes.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_includes.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_includes.h busybox-1.13.4/archival/libipkg/ipkg_includes.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_includes.h 2009-05-31 15:40:37.041993644 +0200 @@ -0,0 +1,79 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3744,9 +3819,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_includes.h busybox-1.12.1/ar +#endif + +#endif /* IPKG_INCLUDES_H */ -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_install.c busybox-1.12.1/archival/libipkg/ipkg_install.c ---- busybox-1.12.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_install.c 2008-10-23 15:07:04.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_install.c busybox-1.13.4/archival/libipkg/ipkg_install.c +--- busybox-1.13.4.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_install.c 2009-05-31 15:40:37.045994712 +0200 @@ -0,0 +1,1982 @@ +/* ipkg_install.c - the itsy package management system + @@ -5730,9 +5805,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_install.c busybox-1.12.1/arc +} + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_install.h busybox-1.12.1/archival/libipkg/ipkg_install.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_install.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_install.h busybox-1.13.4/archival/libipkg/ipkg_install.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_install.h 2009-05-31 15:40:37.049992428 +0200 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5769,9 +5844,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_install.h busybox-1.12.1/arc +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_message.c busybox-1.12.1/archival/libipkg/ipkg_message.c ---- busybox-1.12.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_message.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_message.c busybox-1.13.4/archival/libipkg/ipkg_message.c +--- busybox-1.13.4.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_message.c 2009-05-31 15:40:37.053992938 +0200 @@ -0,0 +1,61 @@ +/* ipkg_message.c - the itsy package management system + @@ -5834,9 +5909,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_message.c busybox-1.12.1/arc + } +} +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_message.h busybox-1.12.1/archival/libipkg/ipkg_message.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_message.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_message.h busybox-1.13.4/archival/libipkg/ipkg_message.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_message.h 2009-05-31 15:40:37.057994007 +0200 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5870,9 +5945,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_message.h busybox-1.12.1/arc +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...); + +#endif /* _IPKG_MESSAGE_H_ */ -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_remove.c busybox-1.12.1/archival/libipkg/ipkg_remove.c ---- busybox-1.12.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_remove.c 2008-10-23 14:42:08.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_remove.c busybox-1.13.4/archival/libipkg/ipkg_remove.c +--- busybox-1.13.4.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_remove.c 2009-05-31 15:40:37.061994238 +0200 @@ -0,0 +1,385 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6259,9 +6334,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_remove.c busybox-1.12.1/arch + + return 0; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_remove.h busybox-1.12.1/archival/libipkg/ipkg_remove.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_remove.h 2008-10-23 14:42:20.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_remove.h busybox-1.13.4/archival/libipkg/ipkg_remove.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_remove.h 2009-05-31 15:40:37.061994238 +0200 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6296,9 +6371,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_remove.h busybox-1.12.1/arch + + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.12.1/archival/libipkg/ipkg_upgrade.c ---- busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_upgrade.c 2008-10-23 14:43:14.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_upgrade.c busybox-1.13.4/archival/libipkg/ipkg_upgrade.c +--- busybox-1.13.4.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_upgrade.c 2009-05-31 15:40:37.061994238 +0200 @@ -0,0 +1,79 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6379,9 +6454,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.12.1/arc + new->state_flag |= SF_USER; + return ipkg_install_pkg(conf, new,1); +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.12.1/archival/libipkg/ipkg_upgrade.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_upgrade.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_upgrade.h busybox-1.13.4/archival/libipkg/ipkg_upgrade.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_upgrade.h 2009-05-31 15:40:37.061994238 +0200 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6401,9 +6476,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.12.1/arc +#include "ipkg.h" + +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_utils.c busybox-1.12.1/archival/libipkg/ipkg_utils.c ---- busybox-1.12.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_utils.c 2008-10-23 14:44:05.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_utils.c busybox-1.13.4/archival/libipkg/ipkg_utils.c +--- busybox-1.13.4.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_utils.c 2009-05-31 15:40:37.065994189 +0200 @@ -0,0 +1,185 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6590,9 +6665,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_utils.c busybox-1.12.1/archi +} + + -diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_utils.h busybox-1.12.1/archival/libipkg/ipkg_utils.h ---- busybox-1.12.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/ipkg_utils.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_utils.h busybox-1.13.4/archival/libipkg/ipkg_utils.h +--- busybox-1.13.4.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/ipkg_utils.h 2009-05-31 15:40:37.065994189 +0200 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6623,73 +6698,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_utils.h busybox-1.12.1/archi +int line_is_blank(const char *line); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/Kbuild busybox-1.12.1/archival/libipkg/Kbuild ---- busybox-1.12.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/Kbuild 2008-10-23 11:41:37.000000000 +0200 -@@ -0,0 +1,60 @@ -+# Makefile for busybox -+# -+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> -+# Copyright (C) 2006 OpenWrt.org -+# -+# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. -+ -+LIBIPKG_CORE_OBJS:= \ -+ args.o \ -+ libipkg.o \ -+ user.o \ -+ -+LIBIPKG_CMD_OBJS:= \ -+ ipkg_cmd.o \ -+ ipkg_configure.o \ -+ ipkg_download.o \ -+ ipkg_install.o \ -+ ipkg_remove.o \ -+ ipkg_upgrade.o \ -+ -+LIBIPKG_DB_OBJS:= \ -+ hash_table.o \ -+ ipkg_conf.o \ -+ ipkg_utils.o \ -+ pkg.o \ -+ pkg_depends.o \ -+ pkg_extract.o \ -+ pkg_hash.o \ -+ pkg_parse.o \ -+ pkg_vec.o \ -+ -+LIBIPKG_LIST_OBJS:= \ -+ conffile.o \ -+ conffile_list.o \ -+ nv_pair.o \ -+ nv_pair_list.o \ -+ pkg_dest.o \ -+ pkg_dest_list.o \ -+ pkg_src.o \ -+ pkg_src_list.o \ -+ str_list.o \ -+ void_list.o \ -+ -+LIBIPKG_UTIL_OBJS:= \ -+ file_util.o \ -+ ipkg_message.o \ -+ str_util.o \ -+ xsystem.o \ -+ -+lib-y := -+lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS) -+lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS) -+lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS) -+lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS) -+lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS) -+ -+ifeq ($(strip $(IPKG_ARCH)),) -+IPKG_ARCH:=$(TARGET_ARCH) -+endif -+CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" -diff -Nur busybox-1.12.1.orig/archival/libipkg/libipkg.c busybox-1.12.1/archival/libipkg/libipkg.c ---- busybox-1.12.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/libipkg.c 2008-10-23 14:59:01.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/libipkg.c busybox-1.13.4/archival/libipkg/libipkg.c +--- busybox-1.13.4.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/libipkg.c 2009-05-31 15:40:37.069994700 +0200 @@ -0,0 +1,532 @@ +/* ipkglib.c - the itsy package management system + @@ -7223,9 +7234,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/libipkg.c busybox-1.12.1/archival +} + +#endif /* IPKG_LIB */ -diff -Nur busybox-1.12.1.orig/archival/libipkg/libipkg.h busybox-1.12.1/archival/libipkg/libipkg.h ---- busybox-1.12.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/libipkg.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/libipkg.h busybox-1.13.4/archival/libipkg/libipkg.h +--- busybox-1.13.4.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/libipkg.h 2009-05-31 15:40:37.069994700 +0200 @@ -0,0 +1,87 @@ +/* ipkglib.h - the itsy package management system + @@ -7314,9 +7325,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/libipkg.h busybox-1.12.1/archival + + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair.c busybox-1.12.1/archival/libipkg/nv_pair.c ---- busybox-1.12.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/nv_pair.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/nv_pair.c busybox-1.13.4/archival/libipkg/nv_pair.c +--- busybox-1.13.4.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/nv_pair.c 2009-05-31 15:40:37.073994372 +0200 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7358,9 +7369,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair.c busybox-1.12.1/archival +} + + -diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair.h busybox-1.12.1/archival/libipkg/nv_pair.h ---- busybox-1.12.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/nv_pair.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/nv_pair.h busybox-1.13.4/archival/libipkg/nv_pair.h +--- busybox-1.13.4.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/nv_pair.h 2009-05-31 15:40:37.073994372 +0200 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7394,9 +7405,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair.h busybox-1.12.1/archival + +#endif + -diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair_list.c busybox-1.12.1/archival/libipkg/nv_pair_list.c ---- busybox-1.12.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/nv_pair_list.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/nv_pair_list.c busybox-1.13.4/archival/libipkg/nv_pair_list.c +--- busybox-1.13.4.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/nv_pair_list.c 2009-05-31 15:40:37.073994372 +0200 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7496,9 +7507,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair_list.c busybox-1.12.1/arc + } + return NULL; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair_list.h busybox-1.12.1/archival/libipkg/nv_pair_list.h ---- busybox-1.12.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/nv_pair_list.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/nv_pair_list.h busybox-1.13.4/archival/libipkg/nv_pair_list.h +--- busybox-1.13.4.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/nv_pair_list.h 2009-05-31 15:40:37.085996181 +0200 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7560,9 +7571,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair_list.h busybox-1.12.1/arc + +#endif + -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg.c busybox-1.12.1/archival/libipkg/pkg.c ---- busybox-1.12.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg.c 2008-10-23 15:02:19.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg.c busybox-1.13.4/archival/libipkg/pkg.c +--- busybox-1.13.4.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg.c 2009-05-31 15:40:37.089995574 +0200 @@ -0,0 +1,1757 @@ +/* pkg.c - the itsy package management system + @@ -9321,9 +9332,242 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg.c busybox-1.12.1/archival/lib + } + return 0; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_depends.c busybox-1.12.1/archival/libipkg/pkg_depends.c ---- busybox-1.12.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_depends.c 2008-10-23 15:05:10.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg.h busybox-1.13.4/archival/libipkg/pkg.h +--- busybox-1.13.4.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg.h 2009-05-31 15:40:37.109997565 +0200 +@@ -0,0 +1,229 @@ ++/* pkg.h - the itsy package management system ++ ++ Carl D. Worth ++ ++ Copyright (C) 2001 University of Southern California ++ ++ This program 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, or (at ++ your option) any later version. ++ ++ This program 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. ++*/ ++ ++#ifndef PKG_H ++#define PKG_H ++ ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <unistd.h> ++ ++#include "pkg_vec.h" ++#include "str_list.h" ++#include "pkg_src.h" ++#include "pkg_dest.h" ++#include "ipkg_conf.h" ++#include "conffile_list.h" ++ ++struct ipkg_conf; ++ ++/* I think "Size" is currently the shortest field name */ ++#define PKG_MINIMUM_FIELD_NAME_LEN 4 ++ ++enum pkg_state_want ++{ ++ SW_UNKNOWN = 1, ++ SW_INSTALL, ++ SW_DEINSTALL, ++ SW_PURGE, ++ SW_LAST_STATE_WANT ++}; ++typedef enum pkg_state_want pkg_state_want_t; ++ ++enum pkg_state_flag ++{ ++ SF_OK = 0, ++ SF_REINSTREQ = 1, ++ SF_HOLD = 2, /* do not upgrade version */ ++ SF_REPLACE = 4, /* replace this package */ ++ SF_NOPRUNE = 8, /* do not remove obsolete files */ ++ SF_PREFER = 16, /* prefer this version */ ++ SF_OBSOLETE = 32, /* old package in upgrade pair */ ++ SF_MARKED = 64, /* temporary mark */ ++ SF_FILELIST_CHANGED = 128, /* needs filelist written */ ++ SF_USER = 256, ++ SF_LAST_STATE_FLAG ++}; ++typedef enum pkg_state_flag pkg_state_flag_t; ++#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER) ++ ++enum pkg_state_status ++{ ++ SS_NOT_INSTALLED = 1, ++ SS_UNPACKED, ++ SS_HALF_CONFIGURED, ++ SS_INSTALLED, ++ SS_HALF_INSTALLED, ++ SS_CONFIG_FILES, ++ SS_POST_INST_FAILED, ++ SS_REMOVAL_FAILED, ++ SS_LAST_STATE_STATUS ++}; ++typedef enum pkg_state_status pkg_state_status_t; ++ ++struct abstract_pkg{ ++ char * name; ++ int dependencies_checked; ++ pkg_vec_t * pkgs; ++ pkg_state_status_t state_status; ++ pkg_state_flag_t state_flag; ++ struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */ ++ abstract_pkg_vec_t * provided_by; ++ abstract_pkg_vec_t * replaced_by; ++}; ++ ++#include "pkg_depends.h" ++ ++/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways: ++ ++ The 3 version fields should go into a single version struct. (This ++ is especially important since, currently, pkg->version can easily ++ be mistaken for pkg_verson_str_alloc(pkg) although they are very ++ distinct. This has been the source of multiple bugs. ++ ++ The 3 state fields could possibly also go into their own struct. ++ ++ All fields which deal with lists of packages, (Depends, ++ Pre-Depends, Provides, Suggests, Recommends, Enhances), should each ++ be handled by a single struct in pkg_t ++ ++ All string fields for which there is a small set of possible ++ values, (section, maintainer, architecture, maybe version?), that ++ are reused among different packages -- for all such packages we ++ should move from "char *"s to some atom datatype to share data ++ storage and use less memory. We might even do reference counting, ++ but probably not since most often we only create new pkg_t structs, ++ we don't often free them. */ ++struct pkg ++{ ++ char *name; ++ unsigned long epoch; ++ char *version; ++ char *revision; ++ char *familiar_revision; ++ pkg_src_t *src; ++ pkg_dest_t *dest; ++ char *architecture; ++ char *section; ++ char *maintainer; ++ char *description; ++ pkg_state_want_t state_want; ++ pkg_state_flag_t state_flag; ++ pkg_state_status_t state_status; ++ char **depends_str; ++ int depends_count; ++ char **pre_depends_str; ++ int pre_depends_count; ++ char **recommends_str; ++ int recommends_count; ++ char **suggests_str; ++ int suggests_count; ++ compound_depend_t * depends; ++ ++ /* Abhaya: new conflicts */ ++ char **conflicts_str; ++ compound_depend_t * conflicts; ++ int conflicts_count; ++ ++ char **replaces_str; ++ int replaces_count; ++ abstract_pkg_t ** replaces; ++ ++ char **provides_str; ++ int provides_count; ++ abstract_pkg_t ** provides; ++ ++ abstract_pkg_t *parent; ++ ++ pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */ ++ ++ char *filename; ++ char *local_filename; ++ char *url; ++ char *tmp_unpack_dir; ++ char *md5sum; ++ char *size; ++ char *installed_size; ++ char *priority; ++ char *source; ++ conffile_list_t conffiles; ++ time_t installed_time; ++ /* As pointer for lazy evaluation */ ++ str_list_t *installed_files; ++ /* XXX: CLEANUP: I'd like to perhaps come up with a better ++ mechanism to avoid the problem here, (which is that the ++ installed_files list was being freed from an inner loop while ++ still being used within an outer loop. */ ++ int installed_files_ref_cnt; ++ int essential; ++ int arch_priority; ++/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */ ++ int provided_by_hand; ++}; ++ ++pkg_t *pkg_new(void); ++int pkg_init(pkg_t *pkg); ++void pkg_deinit(pkg_t *pkg); ++int pkg_init_from_file(pkg_t *pkg, const char *filename); ++abstract_pkg_t *abstract_pkg_new(void); ++int abstract_pkg_init(abstract_pkg_t *ab_pkg); ++ ++/* ++ * merges fields from newpkg into oldpkg. ++ * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero ++ */ ++int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status); ++ ++char *pkg_version_str_alloc(pkg_t *pkg); ++ ++int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg); ++int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b); ++int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b); ++ ++char * pkg_formatted_info(pkg_t *pkg ); ++char * pkg_formatted_field(pkg_t *pkg, const char *field ); ++ ++void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg); ++ ++void pkg_print_info(pkg_t *pkg, FILE *file); ++void pkg_print_status(pkg_t * pkg, FILE * file); ++void pkg_print_field(pkg_t *pkg, FILE *file, const char *field); ++str_list_t *pkg_get_installed_files(pkg_t *pkg); ++int pkg_free_installed_files(pkg_t *pkg); ++int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg); ++conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name); ++int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg, ++ const char *script, const char *args); ++ ++/* enum mappings */ ++char *pkg_state_want_to_str(pkg_state_want_t sw); ++pkg_state_want_t pkg_state_want_from_str(char *str); ++char *pkg_state_flag_to_str(pkg_state_flag_t sf); ++pkg_state_flag_t pkg_state_flag_from_str(char *str); ++char *pkg_state_status_to_str(pkg_state_status_t ss); ++pkg_state_status_t pkg_state_status_from_str(char *str); ++ ++int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op); ++ ++int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg); ++int pkg_info_preinstall_check(ipkg_conf_t *conf); ++int pkg_free_installed_files(pkg_t *pkg); ++ ++int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg); ++int pkg_write_changed_filelists(ipkg_conf_t *conf); ++ ++#endif +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_depends.c busybox-1.13.4/archival/libipkg/pkg_depends.c +--- busybox-1.13.4.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_depends.c 2009-05-31 15:40:37.093995246 +0200 @@ -0,0 +1,1032 @@ +/* pkg_depends.c - the itsy package management system + @@ -10357,9 +10601,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_depends.c busybox-1.12.1/arch + + return 0; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_depends.h busybox-1.12.1/archival/libipkg/pkg_depends.h ---- busybox-1.12.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_depends.h 2008-10-23 15:05:54.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_depends.h busybox-1.13.4/archival/libipkg/pkg_depends.h +--- busybox-1.13.4.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_depends.h 2009-05-31 15:40:37.093995246 +0200 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10466,9 +10710,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_depends.h busybox-1.12.1/arch +int pkg_dependence_satisfied(depend_t *depend); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_dest.c busybox-1.12.1/archival/libipkg/pkg_dest.c ---- busybox-1.12.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_dest.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_dest.c busybox-1.13.4/archival/libipkg/pkg_dest.c +--- busybox-1.13.4.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_dest.c 2009-05-31 15:40:37.093995246 +0200 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10562,9 +10806,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_dest.c busybox-1.12.1/archiva + + dest->root_dir = NULL; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_dest.h busybox-1.12.1/archival/libipkg/pkg_dest.h ---- busybox-1.12.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_dest.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_dest.h busybox-1.13.4/archival/libipkg/pkg_dest.h +--- busybox-1.13.4.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_dest.h 2009-05-31 15:40:37.097996035 +0200 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10604,9 +10848,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_dest.h busybox-1.12.1/archiva + +#endif + -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.12.1/archival/libipkg/pkg_dest_list.c ---- busybox-1.12.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_dest_list.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_dest_list.c busybox-1.13.4/archival/libipkg/pkg_dest_list.c +--- busybox-1.13.4.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_dest_list.c 2009-05-31 15:40:37.097996035 +0200 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10693,9 +10937,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.12.1/ar +{ + return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.12.1/archival/libipkg/pkg_dest_list.h ---- busybox-1.12.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_dest_list.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_dest_list.h busybox-1.13.4/archival/libipkg/pkg_dest_list.h +--- busybox-1.13.4.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_dest_list.h 2009-05-31 15:40:37.097996035 +0200 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10747,9 +10991,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.12.1/ar + +#endif + -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_extract.c busybox-1.12.1/archival/libipkg/pkg_extract.c ---- busybox-1.12.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_extract.c 2008-10-23 15:21:22.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_extract.c busybox-1.13.4/archival/libipkg/pkg_extract.c +--- busybox-1.13.4.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_extract.c 2009-05-31 15:40:37.097996035 +0200 @@ -0,0 +1,225 @@ +/* pkg_extract.c - the itsy package management system + @@ -10976,9 +11220,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_extract.c busybox-1.12.1/arch + + return 0; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_extract.h busybox-1.12.1/archival/libipkg/pkg_extract.h ---- busybox-1.12.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_extract.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_extract.h busybox-1.13.4/archival/libipkg/pkg_extract.h +--- busybox-1.13.4.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_extract.h 2009-05-31 15:40:37.105997055 +0200 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -11012,242 +11256,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_extract.h busybox-1.12.1/arch +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg.h busybox-1.12.1/archival/libipkg/pkg.h ---- busybox-1.12.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg.h 2008-10-23 15:27:11.000000000 +0200 -@@ -0,0 +1,229 @@ -+/* pkg.h - the itsy package management system -+ -+ Carl D. Worth -+ -+ Copyright (C) 2001 University of Southern California -+ -+ This program 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, or (at -+ your option) any later version. -+ -+ This program 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. -+*/ -+ -+#ifndef PKG_H -+#define PKG_H -+ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> -+ -+#include "pkg_vec.h" -+#include "str_list.h" -+#include "pkg_src.h" -+#include "pkg_dest.h" -+#include "ipkg_conf.h" -+#include "conffile_list.h" -+ -+struct ipkg_conf; -+ -+/* I think "Size" is currently the shortest field name */ -+#define PKG_MINIMUM_FIELD_NAME_LEN 4 -+ -+enum pkg_state_want -+{ -+ SW_UNKNOWN = 1, -+ SW_INSTALL, -+ SW_DEINSTALL, -+ SW_PURGE, -+ SW_LAST_STATE_WANT -+}; -+typedef enum pkg_state_want pkg_state_want_t; -+ -+enum pkg_state_flag -+{ -+ SF_OK = 0, -+ SF_REINSTREQ = 1, -+ SF_HOLD = 2, /* do not upgrade version */ -+ SF_REPLACE = 4, /* replace this package */ -+ SF_NOPRUNE = 8, /* do not remove obsolete files */ -+ SF_PREFER = 16, /* prefer this version */ -+ SF_OBSOLETE = 32, /* old package in upgrade pair */ -+ SF_MARKED = 64, /* temporary mark */ -+ SF_FILELIST_CHANGED = 128, /* needs filelist written */ -+ SF_USER = 256, -+ SF_LAST_STATE_FLAG -+}; -+typedef enum pkg_state_flag pkg_state_flag_t; -+#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER) -+ -+enum pkg_state_status -+{ -+ SS_NOT_INSTALLED = 1, -+ SS_UNPACKED, -+ SS_HALF_CONFIGURED, -+ SS_INSTALLED, -+ SS_HALF_INSTALLED, -+ SS_CONFIG_FILES, -+ SS_POST_INST_FAILED, -+ SS_REMOVAL_FAILED, -+ SS_LAST_STATE_STATUS -+}; -+typedef enum pkg_state_status pkg_state_status_t; -+ -+struct abstract_pkg{ -+ char * name; -+ int dependencies_checked; -+ pkg_vec_t * pkgs; -+ pkg_state_status_t state_status; -+ pkg_state_flag_t state_flag; -+ struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */ -+ abstract_pkg_vec_t * provided_by; -+ abstract_pkg_vec_t * replaced_by; -+}; -+ -+#include "pkg_depends.h" -+ -+/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways: -+ -+ The 3 version fields should go into a single version struct. (This -+ is especially important since, currently, pkg->version can easily -+ be mistaken for pkg_verson_str_alloc(pkg) although they are very -+ distinct. This has been the source of multiple bugs. -+ -+ The 3 state fields could possibly also go into their own struct. -+ -+ All fields which deal with lists of packages, (Depends, -+ Pre-Depends, Provides, Suggests, Recommends, Enhances), should each -+ be handled by a single struct in pkg_t -+ -+ All string fields for which there is a small set of possible -+ values, (section, maintainer, architecture, maybe version?), that -+ are reused among different packages -- for all such packages we -+ should move from "char *"s to some atom datatype to share data -+ storage and use less memory. We might even do reference counting, -+ but probably not since most often we only create new pkg_t structs, -+ we don't often free them. */ -+struct pkg -+{ -+ char *name; -+ unsigned long epoch; -+ char *version; -+ char *revision; -+ char *familiar_revision; -+ pkg_src_t *src; -+ pkg_dest_t *dest; -+ char *architecture; -+ char *section; -+ char *maintainer; -+ char *description; -+ pkg_state_want_t state_want; -+ pkg_state_flag_t state_flag; -+ pkg_state_status_t state_status; -+ char **depends_str; -+ int depends_count; -+ char **pre_depends_str; -+ int pre_depends_count; -+ char **recommends_str; -+ int recommends_count; -+ char **suggests_str; -+ int suggests_count; -+ compound_depend_t * depends; -+ -+ /* Abhaya: new conflicts */ -+ char **conflicts_str; -+ compound_depend_t * conflicts; -+ int conflicts_count; -+ -+ char **replaces_str; -+ int replaces_count; -+ abstract_pkg_t ** replaces; -+ -+ char **provides_str; -+ int provides_count; -+ abstract_pkg_t ** provides; -+ -+ abstract_pkg_t *parent; -+ -+ pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */ -+ -+ char *filename; -+ char *local_filename; -+ char *url; -+ char *tmp_unpack_dir; -+ char *md5sum; -+ char *size; -+ char *installed_size; -+ char *priority; -+ char *source; -+ conffile_list_t conffiles; -+ time_t installed_time; -+ /* As pointer for lazy evaluation */ -+ str_list_t *installed_files; -+ /* XXX: CLEANUP: I'd like to perhaps come up with a better -+ mechanism to avoid the problem here, (which is that the -+ installed_files list was being freed from an inner loop while -+ still being used within an outer loop. */ -+ int installed_files_ref_cnt; -+ int essential; -+ int arch_priority; -+/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */ -+ int provided_by_hand; -+}; -+ -+pkg_t *pkg_new(void); -+int pkg_init(pkg_t *pkg); -+void pkg_deinit(pkg_t *pkg); -+int pkg_init_from_file(pkg_t *pkg, const char *filename); -+abstract_pkg_t *abstract_pkg_new(void); -+int abstract_pkg_init(abstract_pkg_t *ab_pkg); -+ -+/* -+ * merges fields from newpkg into oldpkg. -+ * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero -+ */ -+int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status); -+ -+char *pkg_version_str_alloc(pkg_t *pkg); -+ -+int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg); -+int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b); -+int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b); -+ -+char * pkg_formatted_info(pkg_t *pkg ); -+char * pkg_formatted_field(pkg_t *pkg, const char *field ); -+ -+void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg); -+ -+void pkg_print_info(pkg_t *pkg, FILE *file); -+void pkg_print_status(pkg_t * pkg, FILE * file); -+void pkg_print_field(pkg_t *pkg, FILE *file, const char *field); -+str_list_t *pkg_get_installed_files(pkg_t *pkg); -+int pkg_free_installed_files(pkg_t *pkg); -+int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg); -+conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name); -+int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg, -+ const char *script, const char *args); -+ -+/* enum mappings */ -+char *pkg_state_want_to_str(pkg_state_want_t sw); -+pkg_state_want_t pkg_state_want_from_str(char *str); -+char *pkg_state_flag_to_str(pkg_state_flag_t sf); -+pkg_state_flag_t pkg_state_flag_from_str(char *str); -+char *pkg_state_status_to_str(pkg_state_status_t ss); -+pkg_state_status_t pkg_state_status_from_str(char *str); -+ -+int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op); -+ -+int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg); -+int pkg_info_preinstall_check(ipkg_conf_t *conf); -+int pkg_free_installed_files(pkg_t *pkg); -+ -+int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg); -+int pkg_write_changed_filelists(ipkg_conf_t *conf); -+ -+#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_hash.c busybox-1.12.1/archival/libipkg/pkg_hash.c ---- busybox-1.12.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_hash.c 2008-10-23 16:21:09.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_hash.c busybox-1.13.4/archival/libipkg/pkg_hash.c +--- busybox-1.13.4.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_hash.c 2009-05-31 15:40:37.109997565 +0200 @@ -0,0 +1,623 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11872,9 +11883,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_hash.c busybox-1.12.1/archiva +} + + -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_hash.h busybox-1.12.1/archival/libipkg/pkg_hash.h ---- busybox-1.12.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_hash.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_hash.h busybox-1.13.4/archival/libipkg/pkg_hash.h +--- busybox-1.13.4.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_hash.h 2009-05-31 15:40:37.113996958 +0200 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11937,9 +11948,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_hash.h busybox-1.12.1/archiva + +#endif + -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_parse.c busybox-1.12.1/archival/libipkg/pkg_parse.c ---- busybox-1.12.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_parse.c 2008-10-23 15:49:10.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_parse.c busybox-1.13.4/archival/libipkg/pkg_parse.c +--- busybox-1.13.4.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_parse.c 2009-05-31 15:40:37.113996958 +0200 @@ -0,0 +1,368 @@ +/* pkg_parse.c - the itsy package management system + @@ -12309,9 +12320,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_parse.c busybox-1.12.1/archiv + + return 0; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_parse.h busybox-1.12.1/archival/libipkg/pkg_parse.h ---- busybox-1.12.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_parse.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_parse.h busybox-1.13.4/archival/libipkg/pkg_parse.h +--- busybox-1.13.4.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_parse.h 2009-05-31 15:40:37.113996958 +0200 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12344,9 +12355,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_parse.h busybox-1.12.1/archiv +int pkg_valorize_other_field(pkg_t *pkg, char ***raw); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_src.c busybox-1.12.1/archival/libipkg/pkg_src.c ---- busybox-1.12.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_src.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_src.c busybox-1.13.4/archival/libipkg/pkg_src.c +--- busybox-1.13.4.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_src.c 2009-05-31 15:40:37.113996958 +0200 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12391,9 +12402,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_src.c busybox-1.12.1/archival +} + + -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_src.h busybox-1.12.1/archival/libipkg/pkg_src.h ---- busybox-1.12.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_src.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_src.h busybox-1.13.4/archival/libipkg/pkg_src.h +--- busybox-1.13.4.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_src.h 2009-05-31 15:40:37.117996909 +0200 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12429,9 +12440,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_src.h busybox-1.12.1/archival +void pkg_src_deinit(pkg_src_t *src); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_src_list.c busybox-1.12.1/archival/libipkg/pkg_src_list.c ---- busybox-1.12.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_src_list.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_src_list.c busybox-1.13.4/archival/libipkg/pkg_src_list.c +--- busybox-1.13.4.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_src_list.c 2009-05-31 15:40:37.117996909 +0200 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12508,9 +12519,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_src_list.c busybox-1.12.1/arc +{ + return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_src_list.h busybox-1.12.1/archival/libipkg/pkg_src_list.h ---- busybox-1.12.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_src_list.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_src_list.h busybox-1.13.4/archival/libipkg/pkg_src_list.h +--- busybox-1.13.4.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_src_list.h 2009-05-31 15:40:37.117996909 +0200 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12569,9 +12580,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_src_list.h busybox-1.12.1/arc + +#endif + -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_vec.c busybox-1.12.1/archival/libipkg/pkg_vec.c ---- busybox-1.12.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_vec.c 2008-10-23 13:09:31.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_vec.c busybox-1.13.4/archival/libipkg/pkg_vec.c +--- busybox-1.13.4.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_vec.c 2009-05-31 15:40:37.117996909 +0200 @@ -0,0 +1,231 @@ +/* pkg_vec.c - the itsy package management system + @@ -12804,9 +12815,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_vec.c busybox-1.12.1/archival + qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); +} + -diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_vec.h busybox-1.12.1/archival/libipkg/pkg_vec.h ---- busybox-1.12.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/pkg_vec.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg_vec.h busybox-1.13.4/archival/libipkg/pkg_vec.h +--- busybox-1.13.4.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/pkg_vec.h 2009-05-31 15:40:37.121997140 +0200 @@ -0,0 +1,62 @@ +/* pkg_vec.h - the itsy package management system + @@ -12870,9 +12881,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_vec.h busybox-1.12.1/archival +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)); +#endif + -diff -Nur busybox-1.12.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.12.1/archival/libipkg/sprintf_alloc.h ---- busybox-1.12.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/sprintf_alloc.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/sprintf_alloc.h busybox-1.13.4/archival/libipkg/sprintf_alloc.h +--- busybox-1.13.4.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/sprintf_alloc.h 2009-05-31 15:40:37.121997140 +0200 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12899,9 +12910,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.12.1/ar +#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args) + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/str_list.c busybox-1.12.1/archival/libipkg/str_list.c ---- busybox-1.12.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/str_list.c 2008-10-23 15:53:09.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/str_list.c busybox-1.13.4/archival/libipkg/str_list.c +--- busybox-1.13.4.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/str_list.c 2009-05-31 15:40:37.121997140 +0200 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -12979,9 +12990,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/str_list.c busybox-1.12.1/archiva + (void *)target_str, + (void_list_cmp_t)strcmp); +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/str_list.h busybox-1.12.1/archival/libipkg/str_list.h ---- busybox-1.12.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/str_list.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/str_list.h busybox-1.13.4/archival/libipkg/str_list.h +--- busybox-1.13.4.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/str_list.h 2009-05-31 15:40:37.121997140 +0200 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -13034,9 +13045,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/str_list.h busybox-1.12.1/archiva +char *str_list_remove_elt(str_list_t *list, const char *target_str); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/str_util.c busybox-1.12.1/archival/libipkg/str_util.c ---- busybox-1.12.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/str_util.c 2008-10-23 16:01:50.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/str_util.c busybox-1.13.4/archival/libipkg/str_util.c +--- busybox-1.13.4.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/str_util.c 2009-05-31 15:40:37.125998767 +0200 @@ -0,0 +1,69 @@ +/* str_utils.c - the itsy package management system + @@ -13107,9 +13118,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/str_util.c busybox-1.12.1/archiva + return str ? strdup(str) : NULL; +} + -diff -Nur busybox-1.12.1.orig/archival/libipkg/str_util.h busybox-1.12.1/archival/libipkg/str_util.h ---- busybox-1.12.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/str_util.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/str_util.h busybox-1.13.4/archival/libipkg/str_util.h +--- busybox-1.13.4.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/str_util.h 2009-05-31 15:40:37.125998767 +0200 @@ -0,0 +1,27 @@ +/* str_utils.h - the itsy package management system + @@ -13138,9 +13149,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/str_util.h busybox-1.12.1/archiva +char *str_dup_safe(const char *str); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/user.c busybox-1.12.1/archival/libipkg/user.c ---- busybox-1.12.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/user.c 2008-10-23 16:02:33.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/user.c busybox-1.13.4/archival/libipkg/user.c +--- busybox-1.13.4.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/user.c 2009-05-31 15:40:37.129998160 +0200 @@ -0,0 +1,61 @@ +/* user.c - the itsy package management system + @@ -13203,9 +13214,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/user.c busybox-1.12.1/archival/li + + return response; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/user.h busybox-1.12.1/archival/libipkg/user.h ---- busybox-1.12.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/user.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/user.h busybox-1.13.4/archival/libipkg/user.h +--- busybox-1.13.4.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/user.h 2009-05-31 15:40:37.129998160 +0200 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13230,9 +13241,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/user.h busybox-1.12.1/archival/li + +char *get_user_response(const char *format, ...); + -diff -Nur busybox-1.12.1.orig/archival/libipkg/void_list.c busybox-1.12.1/archival/libipkg/void_list.c ---- busybox-1.12.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/void_list.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/void_list.c busybox-1.13.4/archival/libipkg/void_list.c +--- busybox-1.13.4.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/void_list.c 2009-05-31 15:40:37.129998160 +0200 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13428,9 +13439,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/void_list.c busybox-1.12.1/archiv + else + return NULL; +} -diff -Nur busybox-1.12.1.orig/archival/libipkg/void_list.h busybox-1.12.1/archival/libipkg/void_list.h ---- busybox-1.12.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/void_list.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/void_list.h busybox-1.13.4/archival/libipkg/void_list.h +--- busybox-1.13.4.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/void_list.h 2009-05-31 15:40:37.129998160 +0200 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13491,9 +13502,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/void_list.h busybox-1.12.1/archiv +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp); + +#endif -diff -Nur busybox-1.12.1.orig/archival/libipkg/xsystem.c busybox-1.12.1/archival/libipkg/xsystem.c ---- busybox-1.12.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/xsystem.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/xsystem.c busybox-1.13.4/archival/libipkg/xsystem.c +--- busybox-1.13.4.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/xsystem.c 2009-05-31 15:40:37.133998111 +0200 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13559,9 +13570,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/xsystem.c busybox-1.12.1/archival + return -1; +} + -diff -Nur busybox-1.12.1.orig/archival/libipkg/xsystem.h busybox-1.12.1/archival/libipkg/xsystem.h ---- busybox-1.12.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.12.1/archival/libipkg/xsystem.h 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/archival/libipkg/xsystem.h busybox-1.13.4/archival/libipkg/xsystem.h +--- busybox-1.13.4.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.13.4/archival/libipkg/xsystem.h 2009-05-31 15:40:37.133998111 +0200 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13597,10 +13608,21 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/xsystem.h busybox-1.12.1/archival + +#endif + -diff -Nur busybox-1.12.1.orig/archival/libunarchive/data_extract_all.c busybox-1.12.1/archival/libunarchive/data_extract_all.c ---- busybox-1.12.1.orig/archival/libunarchive/data_extract_all.c 2008-09-28 20:04:15.000000000 +0200 -+++ busybox-1.12.1/archival/libunarchive/data_extract_all.c 2008-10-23 11:53:34.000000000 +0200 -@@ -144,3 +144,16 @@ +diff -Nur busybox-1.13.4.orig/archival/libunarchive/Kbuild busybox-1.13.4/archival/libunarchive/Kbuild +--- busybox-1.13.4.orig/archival/libunarchive/Kbuild 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.4/archival/libunarchive/Kbuild 2009-05-31 15:40:37.133998111 +0200 +@@ -39,6 +39,7 @@ + lib-$(CONFIG_DPKG) += $(DPKG_FILES) + lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) + lib-$(CONFIG_GUNZIP) += decompress_unzip.o ++lib-$(CONFIG_IPKG) += open_transformer.o get_header_tar.o get_header_tar_gz.o + lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o + lib-$(CONFIG_RPM) += open_transformer.o decompress_unzip.o get_header_cpio.o + lib-$(CONFIG_TAR) += get_header_tar.o +diff -Nur busybox-1.13.4.orig/archival/libunarchive/data_extract_all.c busybox-1.13.4/archival/libunarchive/data_extract_all.c +--- busybox-1.13.4.orig/archival/libunarchive/data_extract_all.c 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.4/archival/libunarchive/data_extract_all.c 2009-05-31 15:40:37.133998111 +0200 +@@ -146,3 +146,16 @@ } } } @@ -13617,20 +13639,9 @@ diff -Nur busybox-1.12.1.orig/archival/libunarchive/data_extract_all.c busybox-1 + data_extract_all(archive_handle); + } +} -diff -Nur busybox-1.12.1.orig/archival/libunarchive/Kbuild busybox-1.12.1/archival/libunarchive/Kbuild ---- busybox-1.12.1.orig/archival/libunarchive/Kbuild 2008-09-28 20:04:15.000000000 +0200 -+++ busybox-1.12.1/archival/libunarchive/Kbuild 2008-10-23 16:28:14.000000000 +0200 -@@ -39,6 +39,7 @@ - lib-$(CONFIG_DPKG) += $(DPKG_FILES) - lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) - lib-$(CONFIG_GUNZIP) += decompress_unzip.o -+lib-$(CONFIG_IPKG) += open_transformer.o get_header_tar.o get_header_tar_gz.o - lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o - lib-$(CONFIG_RPM) += open_transformer.o decompress_unzip.o get_header_cpio.o - lib-$(CONFIG_TAR) += get_header_tar.o -diff -Nur busybox-1.12.1.orig/coreutils/md5_sha1_sum.c busybox-1.12.1/coreutils/md5_sha1_sum.c ---- busybox-1.12.1.orig/coreutils/md5_sha1_sum.c 2008-09-28 20:04:18.000000000 +0200 -+++ busybox-1.12.1/coreutils/md5_sha1_sum.c 2008-10-23 11:41:37.000000000 +0200 +diff -Nur busybox-1.13.4.orig/coreutils/md5_sha1_sum.c busybox-1.13.4/coreutils/md5_sha1_sum.c +--- busybox-1.13.4.orig/coreutils/md5_sha1_sum.c 2008-11-09 18:28:07.000000000 +0100 ++++ busybox-1.13.4/coreutils/md5_sha1_sum.c 2009-05-31 15:40:37.141999131 +0200 @@ -8,14 +8,12 @@ #include "libbb.h" @@ -13656,10 +13667,10 @@ diff -Nur busybox-1.12.1.orig/coreutils/md5_sha1_sum.c busybox-1.12.1/coreutils/ { int src_fd, hash_len, count; union _ctx_ { -diff -Nur busybox-1.12.1.orig/include/applets.h busybox-1.12.1/include/applets.h ---- busybox-1.12.1.orig/include/applets.h 2008-09-28 20:04:26.000000000 +0200 -+++ busybox-1.12.1/include/applets.h 2008-10-23 11:41:37.000000000 +0200 -@@ -202,6 +202,7 @@ +diff -Nur busybox-1.13.4.orig/include/applets.h busybox-1.13.4/include/applets.h +--- busybox-1.13.4.orig/include/applets.h 2008-11-09 18:28:17.000000000 +0100 ++++ busybox-1.13.4/include/applets.h 2009-05-31 15:40:37.145999641 +0200 +@@ -203,6 +203,7 @@ USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) USE_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) @@ -13667,10 +13678,10 @@ diff -Nur busybox-1.12.1.orig/include/applets.h busybox-1.12.1/include/applets.h USE_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_NEVER)) -diff -Nur busybox-1.12.1.orig/include/libbb.h busybox-1.12.1/include/libbb.h ---- busybox-1.12.1.orig/include/libbb.h 2008-09-28 20:04:26.000000000 +0200 -+++ busybox-1.12.1/include/libbb.h 2008-10-23 11:47:15.000000000 +0200 -@@ -1264,6 +1264,7 @@ +diff -Nur busybox-1.13.4.orig/include/libbb.h busybox-1.13.4/include/libbb.h +--- busybox-1.13.4.orig/include/libbb.h 2009-04-15 02:09:42.000000000 +0200 ++++ busybox-1.13.4/include/libbb.h 2009-05-31 15:40:37.149999313 +0200 +@@ -1309,6 +1309,7 @@ extern const char bb_uuenc_tbl_std[]; void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC; @@ -13678,7 +13689,7 @@ diff -Nur busybox-1.12.1.orig/include/libbb.h busybox-1.12.1/include/libbb.h typedef struct sha1_ctx_t { uint32_t count[2]; uint32_t hash[5]; -@@ -1272,6 +1273,8 @@ +@@ -1317,6 +1318,8 @@ void sha1_begin(sha1_ctx_t *ctx) FAST_FUNC; void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx) FAST_FUNC; void *sha1_end(void *resbuf, sha1_ctx_t *ctx) FAST_FUNC; @@ -13687,10 +13698,10 @@ diff -Nur busybox-1.12.1.orig/include/libbb.h busybox-1.12.1/include/libbb.h typedef struct md5_ctx_t { uint32_t A; -diff -Nur busybox-1.12.1.orig/include/unarchive.h busybox-1.12.1/include/unarchive.h ---- busybox-1.12.1.orig/include/unarchive.h 2008-09-28 20:04:26.000000000 +0200 -+++ busybox-1.12.1/include/unarchive.h 2008-10-23 11:48:04.000000000 +0200 -@@ -88,6 +88,7 @@ +diff -Nur busybox-1.13.4.orig/include/unarchive.h busybox-1.13.4/include/unarchive.h +--- busybox-1.13.4.orig/include/unarchive.h 2008-11-09 18:28:17.000000000 +0100 ++++ busybox-1.13.4/include/unarchive.h 2009-05-31 15:40:37.149999313 +0200 +@@ -94,6 +94,7 @@ extern void data_skip(archive_handle_t *archive_handle) FAST_FUNC; extern void data_extract_all(archive_handle_t *archive_handle) FAST_FUNC; @@ -13698,10 +13709,10 @@ diff -Nur busybox-1.12.1.orig/include/unarchive.h busybox-1.12.1/include/unarchi extern void data_extract_to_stdout(archive_handle_t *archive_handle) FAST_FUNC; extern void data_extract_to_buffer(archive_handle_t *archive_handle) FAST_FUNC; -diff -Nur busybox-1.12.1.orig/include/usage.h busybox-1.12.1/include/usage.h ---- busybox-1.12.1.orig/include/usage.h 2008-09-28 20:04:26.000000000 +0200 -+++ busybox-1.12.1/include/usage.h 2008-10-23 11:41:37.000000000 +0200 -@@ -1419,6 +1419,82 @@ +diff -Nur busybox-1.13.4.orig/include/usage.h busybox-1.13.4/include/usage.h +--- busybox-1.13.4.orig/include/usage.h 2008-11-09 18:28:17.000000000 +0100 ++++ busybox-1.13.4/include/usage.h 2009-05-31 15:40:37.154000102 +0200 +@@ -1425,6 +1425,82 @@ "$ ls -la /tmp/busybox*\n" \ "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" @@ -13782,16 +13793,5 @@ diff -Nur busybox-1.12.1.orig/include/usage.h busybox-1.12.1/include/usage.h + "\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n" + #define halt_trivial_usage \ - "[-d delay] [-n] [-f]" + "[-d delay] [-n] [-f]" USE_FEATURE_WTMP(" [-w]") #define halt_full_usage "\n\n" \ -diff -Nur busybox-1.12.1.orig/Makefile busybox-1.12.1/Makefile ---- busybox-1.12.1.orig/Makefile 2008-09-28 20:04:30.000000000 +0200 -+++ busybox-1.12.1/Makefile 2008-10-23 11:41:37.000000000 +0200 -@@ -444,6 +444,7 @@ - - libs-y := \ - archival/ \ -+ archival/libipkg/ \ - archival/libunarchive/ \ - console-tools/ \ - coreutils/ \ diff --git a/package/bwm/Makefile b/package/bwm/Makefile index 3a8972649..24c22034b 100644 --- a/package/bwm/Makefile +++ b/package/bwm/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile index db4a582a4..75ed1ea60 100644 --- a/package/cbtt/Makefile +++ b/package/cbtt/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/cbtt/patches/patch-base64_cpp b/package/cbtt/patches/patch-base64_cpp new file mode 100644 index 000000000..d69e6f997 --- /dev/null +++ b/package/cbtt/patches/patch-base64_cpp @@ -0,0 +1,20 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- cbtt80-20060211-src.orig/base64.cpp 2006-02-07 18:44:58.000000000 +0100 ++++ cbtt80-20060211-src/base64.cpp 2009-06-01 19:00:07.000000000 +0200 +@@ -112,7 +112,7 @@ uchar pBase64[] = { + /* Returns: bool - True (!0) if the operation was successful. */
+ /* False (0) if the operation was unsuccessful. */
+ /*---------------------------------------------------------------------------*/
+-char *b64decode(const char *s)
++char *b64decode(char *s)
+ {
+ int l = strlen(s); // Get length of Base64 string.
+ char *b; // Decoding buffer pointers.
+@@ -121,7 +121,6 @@ char *b64decode(const char *s)
+ int y = 0;
+
+ static // Collating sequence...
+- const // ...independant "===".
+ char pPad[] = {0x3d, 0x3d, 0x3d, 0x00};
+
+ if (l % 4) // If it's not modulo 4, then it...
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 4ab5c6ea1..1485cb9d9 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/cfgfs/src/BSDmakefile b/package/cfgfs/src/BSDmakefile index 4d3bf7a11..e10aa1dbc 100644 --- a/package/cfgfs/src/BSDmakefile +++ b/package/cfgfs/src/BSDmakefile @@ -1,14 +1,8 @@ -# $MirOS: contrib/hosted/fwcf/BSDmakefile,v 1.8 2007/03/13 18:14:30 tg Exp $ -#- -# This file is part of the FreeWRT project. FreeWRT is copyrighted -# material, please see the LICENCE file in the top-level directory -# or at http://www.freewrt.org/licence for details. - - SUBDIR+= lib - SUBDIR+= mkfwcf - SUBDIR+= unfwcf - SUBDIR+= tool - SUBDIR+= fwcf.helper +SUBDIR+= lib +SUBDIR+= mkfwcf +SUBDIR+= unfwcf +SUBDIR+= tool +SUBDIR+= fwcf.helper test: _SUBDIRUSE diff --git a/package/cfgfs/src/LICENCE b/package/cfgfs/src/LICENCE index af7542c91..e8a901f83 100644 --- a/package/cfgfs/src/LICENCE +++ b/package/cfgfs/src/LICENCE @@ -30,6 +30,3 @@ c_lzo1x plug-in is covered by the GNU General Public License, Ver- sion 1 or higher. The files in the bundled/ subdirectory are not a part of FWCF and covered by their own licenced. The version 1.0 of FWCF bundles MiniLZO from lzo-2.02 under the GPL 2 or higher only. - -⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼ -$MirOS: contrib/hosted/fwcf/LICENCE,v 1.5 2007/03/13 18:31:07 tg Exp $ diff --git a/package/cfgfs/src/Makefile b/package/cfgfs/src/Makefile index 7ab068c69..4f4b69ee2 100644 --- a/package/cfgfs/src/Makefile +++ b/package/cfgfs/src/Makefile @@ -1,9 +1,3 @@ -# $MirOS: contrib/hosted/fwcf/GNUmakefile,v 1.8 2007/03/09 23:09:34 tg Exp $ -#- -# This file is part of the FreeWRT project. FreeWRT is copyrighted -# material, please see the LICENCE file in the top-level directory -# or at http://www.freewrt.org/licence for details. - SRCS+= tool.c SRCS+= sys_linux.c SRCS+= replace.c diff --git a/package/cfgfs/src/Makefile.inc b/package/cfgfs/src/Makefile.inc index 82f7eb8f9..4a9d6d687 100644 --- a/package/cfgfs/src/Makefile.inc +++ b/package/cfgfs/src/Makefile.inc @@ -1,5 +1,4 @@ # $MirOS: contrib/hosted/fwcf/Makefile.inc,v 1.10 2007/05/08 21:52:53 tg Exp $ -#- # This file is part of the FreeWRT project. FreeWRT is copyrighted # material, please see the LICENCE file in the top-level directory # or at http://www.freewrt.org/licence for details. diff --git a/package/cfgfs/src/fwcf.helper/Makefile b/package/cfgfs/src/fwcf.helper/Makefile index 882c0d486..93065fb7a 100644 --- a/package/cfgfs/src/fwcf.helper/Makefile +++ b/package/cfgfs/src/fwcf.helper/Makefile @@ -1,5 +1,4 @@ # $MirOS: contrib/hosted/fwcf/fwcf.helper/Makefile,v 1.9 2007/03/13 18:14:31 tg Exp $ -#- # This file is part of the FreeWRT project. FreeWRT is copyrighted # material, please see the LICENCE file in the top-level directory # or at http://www.freewrt.org/licence for details. diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index ad75ee79e..890dcf216 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -1,9 +1,8 @@ #!/bin/sh -#- # Copyright (c) 2006, 2007 # Thorsten Glaser <tg@mirbsd.de> # Copyright (c) 2009 -# Waldemar Brodkorb <openadk@waldemar-brodkorb.de> +# Waldemar Brodkorb <wbx@openadk.org> # # Provided that these terms and disclaimer and all copyright notices # are retained or reproduced in an accompanying document, permission @@ -19,7 +18,6 @@ # of dealing in the work, even if advised of the possibility of such # damage or existence of a defect, except proven that it results out # of said person's immediate fault when using the work as intended. -#- # Possible return values: # 0 - everything ok # 1 - syntax error @@ -44,7 +42,13 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin wd=$(pwd) cd / -what='Configuration Filesystem (cfgfs), Version 1.06' +what='Configuration Filesystem Utility (cfgfs), Version 1.06' + +who=$(id -u) +if [ $who -ne 0 ]; then + echo 'Exit. Configuration Filesystem Utility must be run as root.' + exit 1 +fi usage() { cat >&2 <<EOF @@ -109,10 +113,10 @@ EOF exit 1 ;; esac -uname=$(uname -m) -if [[ "$uname" = "i586" ]];then - part=/dev/sda2 -else +# find backend device, first try to find partition with ID 88 +part=$(fdisk -l|awk '$5 == 88 { print $1 }') +if [ -z $part ]; then + # otherwise search for MTD device with name cfgfs part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd\([^:]*\):.*$/\1/')ro fi diff --git a/package/cfgfs/src/lib/Makefile b/package/cfgfs/src/lib/Makefile index 85252b4cb..c23c605ac 100644 --- a/package/cfgfs/src/lib/Makefile +++ b/package/cfgfs/src/lib/Makefile @@ -1,5 +1,4 @@ # $MirOS: contrib/hosted/fwcf/lib/Makefile,v 1.5 2007/03/13 18:14:31 tg Exp $ -#- # This file is part of the FreeWRT project. FreeWRT is copyrighted # material, please see the LICENCE file in the top-level directory # or at http://www.freewrt.org/licence for details. diff --git a/package/cfgfs/src/mkfwcf/Makefile b/package/cfgfs/src/mkfwcf/Makefile index 35eed0cba..2d6ebce6b 100644 --- a/package/cfgfs/src/mkfwcf/Makefile +++ b/package/cfgfs/src/mkfwcf/Makefile @@ -1,5 +1,4 @@ # $MirOS: contrib/hosted/fwcf/mkfwcf/Makefile,v 1.14 2006/09/26 10:25:06 tg Exp $ -#- # This file is part of the FreeWRT project. FreeWRT is copyrighted # material, please see the LICENCE file in the top-level directory # or at http://www.freewrt.org/licence for details. diff --git a/package/cfgfs/src/tool/Makefile b/package/cfgfs/src/tool/Makefile index 8ffa054a2..48e446541 100644 --- a/package/cfgfs/src/tool/Makefile +++ b/package/cfgfs/src/tool/Makefile @@ -1,5 +1,4 @@ # $MirOS: contrib/hosted/fwcf/tool/Makefile,v 1.5 2007/02/28 22:59:38 tg Exp $ -#- # This file is part of the FreeWRT project. FreeWRT is copyrighted # material, please see the LICENCE file in the top-level directory # or at http://www.freewrt.org/licence for details. diff --git a/package/cfgfs/src/unfwcf/Makefile b/package/cfgfs/src/unfwcf/Makefile index 678482ad4..79788eb70 100644 --- a/package/cfgfs/src/unfwcf/Makefile +++ b/package/cfgfs/src/unfwcf/Makefile @@ -1,5 +1,4 @@ # $MirOS: contrib/hosted/fwcf/unfwcf/Makefile,v 1.14 2006/09/26 10:25:06 tg Exp $ -#- # This file is part of the FreeWRT project. FreeWRT is copyrighted # material, please see the LICENCE file in the top-level directory # or at http://www.freewrt.org/licence for details. diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile index 6b7cd9ecf..7d8b2c59b 100644 --- a/package/cgilib/Makefile +++ b/package/cgilib/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index 543b84f37..4d2ff3de6 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 2f9529bf5..bb3145977 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/comgt/Makefile b/package/comgt/Makefile index 06ff87f58..afc21e322 100644 --- a/package/comgt/Makefile +++ b/package/comgt/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile index e84953a6c..def37e738 100644 --- a/package/compositeproto/Makefile +++ b/package/compositeproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in index db5d8a9ca..0fa6464a8 100644 --- a/package/cryptsetup/Config.in +++ b/package/cryptsetup/Config.in @@ -4,7 +4,7 @@ config ADK_PACKAGE_CRYPTSETUP select ADK_PACKAGE_LIBPOPT select ADK_PACKAGE_LIBUUID select ADK_PACKAGE_LIBGCRYPT - select ADK_PACKAGE_DEVICE_MAPPER + select ADK_PACKAGE_LVM select ADK_KPACKAGE_KMOD_BLK_DEV_DM select ADK_KPACKAGE_KMOD_DM_CRYPT select ADK_KPACKAGE_KMOD_CRYPTO_SHA256 diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 58c2c4ce3..a7a93d139 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index 5c6221b08..23ba6ac71 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ctorrent/patches/patch-bencode_cpp b/package/ctorrent/patches/patch-bencode_cpp new file mode 100644 index 000000000..9f2a4381e --- /dev/null +++ b/package/ctorrent/patches/patch-bencode_cpp @@ -0,0 +1,16 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ctorrent-dnh2.orig/bencode.cpp 2006-01-02 03:38:01.000000000 +0100 ++++ ctorrent-dnh2/bencode.cpp 2009-06-01 19:10:05.000000000 +0200 +@@ -213,10 +213,10 @@ size_t bencode_end_dict_list(FILE *fp) + return (EOF == fputc('e',fp)) ? 0 : 1; + } + +-size_t bencode_path2list(const char *pathname, FILE *fp) ++size_t bencode_path2list(char *pathname, FILE *fp) + { + char *pn; +- const char *p = pathname; ++ char *p = pathname; + + if( bencode_begin_list(fp) != 1 ) return 0; + diff --git a/package/ctorrent/patches/patch-bencode_h b/package/ctorrent/patches/patch-bencode_h new file mode 100644 index 000000000..594fa668a --- /dev/null +++ b/package/ctorrent/patches/patch-bencode_h @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ctorrent-dnh2.orig/bencode.h 2005-08-27 05:43:00.000000000 +0200 ++++ ctorrent-dnh2/bencode.h 2009-06-01 19:11:29.000000000 +0200 +@@ -31,6 +31,6 @@ size_t bencode_int(const int integer, FI + size_t bencode_begin_dict(FILE *fp); + size_t bencode_begin_list(FILE *fp); + size_t bencode_end_dict_list(FILE *fp); +-size_t bencode_path2list(const char *pathname, FILE *fp); ++size_t bencode_path2list(char *pathname, FILE *fp); + + #endif diff --git a/package/cups/Makefile b/package/cups/Makefile index c8cac765f..d9dd2ec17 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c new file mode 100644 index 000000000..c1f3a3e94 --- /dev/null +++ b/package/cups/patches/patch-scheduler_auth_c @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- cups-1.3.10.orig/scheduler/auth.c 2009-02-07 06:06:11.000000000 +0100 ++++ cups-1.3.10/scheduler/auth.c 2009-06-01 19:17:20.000000000 +0200 +@@ -54,6 +54,7 @@ + * Include necessary headers... + */ + ++#define _GNU_SOURCE + #include "cupsd.h" + #include <grp.h> + #ifdef HAVE_SHADOW_H diff --git a/package/curl/Makefile b/package/curl/Makefile index 82e07c8f0..078a940bf 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/cutter/Makefile b/package/cutter/Makefile index 79660c005..be28c34da 100755 --- a/package/cutter/Makefile +++ b/package/cutter/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 392581ce8..e3e104ce6 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/cxxtools/patches/patch-src_hdstream_cpp b/package/cxxtools/patches/patch-src_hdstream_cpp new file mode 100644 index 000000000..796b9cdf1 --- /dev/null +++ b/package/cxxtools/patches/patch-src_hdstream_cpp @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- cxxtools-1.4.8.orig/src/hdstream.cpp 2008-05-04 17:55:37.000000000 +0200 ++++ cxxtools-1.4.8/src/hdstream.cpp 2009-06-01 19:40:12.000000000 +0200 +@@ -20,6 +20,7 @@ + */ + + #include "cxxtools/hdstream.h" ++#include <cstdio> + #include <iomanip> + #include <cctype> + diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index bce77f2dc..4b8dabba2 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile index 4ffd21ea1..507592593 100644 --- a/package/damageproto/Makefile +++ b/package/damageproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index d84ae0f1b..ffd292acd 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/dbus/Makefile b/package/dbus/Makefile index b240bc043..9422c9dbf 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -1,14 +1,12 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. include ${TOPDIR}/rules.mk PKG_NAME:= dbus -PKG_VERSION:= 1.0.3 +PKG_VERSION:= 1.2.14 PKG_RELEASE:= 1 -PKG_MD5SUM:= ce328423db5743fe9006d39113b5324d +PKG_MD5SUM:= 2c267ccd45d0b18db8c9edacad63ec98 PKG_DESCR:= DBUS library PKG_SECTION:= net PKG_DEPENDS:= libexpat @@ -17,7 +15,7 @@ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-tests \ diff --git a/package/deco/Makefile b/package/deco/Makefile index 3611bb8a6..0a0fe35dd 100644 --- a/package/deco/Makefile +++ b/package/deco/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/device-mapper/Config.in b/package/device-mapper/Config.in deleted file mode 100644 index 162b07794..000000000 --- a/package/device-mapper/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config ADK_PACKAGE_DEVICE_MAPPER - prompt "device-mapper..................... device mapper tool and lib" - tristate - default n - help - device mapper tool and libdevice mapper tool and lib diff --git a/package/device-mapper/Makefile b/package/device-mapper/Makefile deleted file mode 100644 index b0e48e7a9..000000000 --- a/package/device-mapper/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# $Id$ -#- -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= device-mapper -PKG_VERSION:= 1.02.28 -PKG_RELEASE:= 1 -PKG_MD5SUM:= c9ae0776994a419f9e1ba842164bb626 -PKG_DESCR:= device mapper tools and libraries -PKG_SECTION:= utils -PKG_URL:= http://sources.redhat.com/dm -PKG_SITES:= ftp://sources.redhat.com/pub/dm/ - -DISTFILES:= ${PKG_NAME}.${PKG_VERSION}.tgz -WRKDIST= ${WRKDIR}/${PKG_NAME}.${PKG_VERSION} - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,DEVICE_MAPPER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_STYLE:= gnu -CONFIGURE_ARGS+= --with-user="" --with-group="" \ - --with-optimisation="" \ - --with-kernel-dir=${LINUX_DIR} -BUILD_STYLE:= auto -INSTALL_STYLE:= auto -INSTALL_TARGET+= install_static_lib - -post-install: - ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib - ${CP} ${WRKINST}/usr/lib/libdevmapper.so* \ - ${IDIR_DEVICE_MAPPER}/usr/lib - ${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \ - ${IDIR_DEVICE_MAPPER}/usr/sbin - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/device-mapper/patches/patch-lib_Makefile_in b/package/device-mapper/patches/patch-lib_Makefile_in deleted file mode 100644 index d20b9d5c9..000000000 --- a/package/device-mapper/patches/patch-lib_Makefile_in +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- device-mapper.1.02.28.orig/lib/Makefile.in 2008-06-06 22:44:35.000000000 +0200 -+++ device-mapper.1.02.28/lib/Makefile.in 2008-11-11 12:18:25.000000000 +0100 -@@ -76,7 +76,7 @@ install_static: install_@interface@_stat - $(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a - - install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX) -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ -+ $(INSTALL) -D $(OWNER) $(GROUP) -m 755 $(STRIP) $< \ - $(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) - - install_pkgconfig: -@@ -84,7 +84,7 @@ install_pkgconfig: - $(usrlibdir)/pkgconfig/devmapper.pc - - install_ioctl_static: ioctl/libdevmapper.a -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ -+ $(INSTALL) -D $(OWNER) $(GROUP) -m 755 $(STRIP) $< \ - $(libdir)/libdevmapper.a.$(LIB_VERSION) - - $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION): $(interface)/%.$(LIB_SUFFIX) diff --git a/package/device-mapper/patches/patch-make_tmpl_in b/package/device-mapper/patches/patch-make_tmpl_in deleted file mode 100644 index 69285fbe5..000000000 --- a/package/device-mapper/patches/patch-make_tmpl_in +++ /dev/null @@ -1,16 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- device-mapper.1.02.28.orig/make.tmpl.in 2008-06-06 22:44:35.000000000 +0200 -+++ device-mapper.1.02.28/make.tmpl.in 2009-01-04 14:47:10.000000000 +0100 -@@ -25,10 +25,10 @@ MSGFMT = @MSGFMT@ - LN_S = @LN_S@ - LIBS = @LIBS@ - DEFS += @DEFS@ --CFLAGS += @CFLAGS@ -+CFLAGS ?= @CFLAGS@ - CLDFLAGS += @CLDFLAGS@ - LDDEPS += @LDDEPS@ --LDFLAGS += @LDFLAGS@ -+LDFLAGS ?= @LDFLAGS@ - LIB_SUFFIX = @LIB_SUFFIX@ - - # Setup directory variables diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index 142e7e61d..b68e80096 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index ae19e898e..b0dce52d3 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/dhcpv6/Config.in b/package/dhcpv6/Config.in deleted file mode 100644 index 569320f0c..000000000 --- a/package/dhcpv6/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config ADK_COMPILE_DHCPV6 - depends on ADK_IPV6 - depends ADK_PACKAGE_DHCPV6_SERVER - tristate - default n - -config ADK_PACKAGE_DHCPV6_SERVER - prompt "dhcpv6-server........................ IPv6 DHCP server" - tristate - default n - select ADK_COMPILE_DHCPV6 - select ADK_PACKAGE_LIBNCURSES - select ADK_PACKAGE_LIBNL - help - IPv6 DHCP server diff --git a/package/dhcpv6/Makefile b/package/dhcpv6/Makefile deleted file mode 100644 index 6fdeaca9e..000000000 --- a/package/dhcpv6/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $Id$ -#- -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= dhcpv6 -PKG_VERSION:= 1.2.0 -PKG_RELEASE:= 1 -PKG_MD5SUM:= d537416b33002f56912b7f27477d8d35 -PKG_DESCR:= Dynamic Host Configuration Protocol for IPv6 (DHCPv6) server -PKG_SECTION:= net -PKG_DEPENDS:= libncurses libnl -PKG_URL:= https://fedorahosted.org/dhcpv6 -PKG_SITES:= https://fedorahosted.org/releases/d/h/dhcpv6/ - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,DHCPV6_SERVER,dhcpv6-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_STYLE:= autoconf gnu -BUILD_STYLE:= auto -INSTALL_STYLE:= auto - -post-install: - ${INSTALL_DIR} ${IDIR_DHCP6_SERVER}/usr/sbin - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dhcpv6/ipkg/files/conffiles b/package/dhcpv6/ipkg/files/conffiles deleted file mode 100644 index 267baa94d..000000000 --- a/package/dhcpv6/ipkg/files/conffiles +++ /dev/null @@ -1,4 +0,0 @@ -/etc/dhcpd6/dhcpd6.conf -/etc/dhcpd6/leases6.conf -/etc/dhcpd6/partial_leases6.conf -/etc/dhcp6/sollicit.conf diff --git a/package/dhcpv6/patches/patch-configure b/package/dhcpv6/patches/patch-configure deleted file mode 100644 index 2ef218d4a..000000000 --- a/package/dhcpv6/patches/patch-configure +++ /dev/null @@ -1,26 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dhcpv6-1.2.0.orig/configure 2009-04-03 04:45:15.000000000 +0200 -+++ dhcpv6-1.2.0/configure 2009-05-28 23:10:48.955142356 +0200 -@@ -12654,10 +12654,9 @@ done - - - -- - for ac_header in arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \ - libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \ -- sys/ioctl.h sys/timeb.h syslog.h -+ sys/ioctl.h syslog.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -15942,9 +15941,7 @@ fi - - - -- -- --for ac_func in bzero ftime gettimeofday memset select socket strchr strdup \ -+for ac_func in gettimeofday memset select socket strchr strdup \ - strerror strrchr strstr strtol strtoul - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/package/dhcpv6/patches/patch-configure.orig b/package/dhcpv6/patches/patch-configure.orig deleted file mode 100644 index 8ba5a08ed..000000000 --- a/package/dhcpv6/patches/patch-configure.orig +++ /dev/null @@ -1,25 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dhcpv6-1.2.0.orig/configure 2009-04-03 04:45:15.000000000 +0200 -+++ dhcpv6-1.2.0/configure 2009-05-28 23:09:45.591183981 +0200 -@@ -12654,10 +12654,9 @@ done - - - -- - for ac_header in arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \ - libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \ -- sys/ioctl.h sys/timeb.h syslog.h -+ sys/ioctl.h syslog.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -15943,8 +15942,7 @@ fi - - - -- --for ac_func in bzero ftime gettimeofday memset select socket strchr strdup \ -+for ac_func in ftime gettimeofday memset select socket strchr strdup \ - strerror strrchr strstr strtol strtoul - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/package/dhcpv6/patches/patch-configure_ac b/package/dhcpv6/patches/patch-configure_ac deleted file mode 100644 index 3ca204c05..000000000 --- a/package/dhcpv6/patches/patch-configure_ac +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dhcpv6-1.2.0.orig/configure.ac 2009-04-03 04:33:56.000000000 +0200 -+++ dhcpv6-1.2.0/configure.ac 2009-05-28 23:10:31.256646671 +0200 -@@ -45,7 +45,7 @@ AC_CHECK_HEADERS([sys/types.h sys/socket - # Check for headers we must have on the system - AC_CHECK_HEADERS([arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \ - libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \ -- sys/ioctl.h sys/timeb.h syslog.h], -+ sys/ioctl.h syslog.h], - [], - [AC_MSG_FAILURE([*** Header file $ac_header not found.])], - [[#ifdef HAVE_SYS_TYPES_H -@@ -97,7 +97,7 @@ AC_FUNC_REALLOC - AC_FUNC_SELECT_ARGTYPES - AC_TYPE_SIGNAL - AC_FUNC_STAT --AC_CHECK_FUNCS([bzero ftime gettimeofday memset select socket strchr strdup \ -+AC_CHECK_FUNCS([gettimeofday memset select socket strchr strdup \ - strerror strrchr strstr strtol strtoul], - [], - [AC_MSG_FAILURE([*** Required function $ac_func not found.])]) diff --git a/package/dhcpv6/patches/patch-configure_ac.orig b/package/dhcpv6/patches/patch-configure_ac.orig deleted file mode 100644 index b5ad3d3c8..000000000 --- a/package/dhcpv6/patches/patch-configure_ac.orig +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dhcpv6-1.2.0.orig/configure.ac 2009-04-03 04:33:56.000000000 +0200 -+++ dhcpv6-1.2.0/configure.ac 2009-05-28 23:09:25.701939971 +0200 -@@ -45,7 +45,7 @@ AC_CHECK_HEADERS([sys/types.h sys/socket - # Check for headers we must have on the system - AC_CHECK_HEADERS([arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \ - libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \ -- sys/ioctl.h sys/timeb.h syslog.h], -+ sys/ioctl.h syslog.h], - [], - [AC_MSG_FAILURE([*** Header file $ac_header not found.])], - [[#ifdef HAVE_SYS_TYPES_H -@@ -97,7 +97,7 @@ AC_FUNC_REALLOC - AC_FUNC_SELECT_ARGTYPES - AC_TYPE_SIGNAL - AC_FUNC_STAT --AC_CHECK_FUNCS([bzero ftime gettimeofday memset select socket strchr strdup \ -+AC_CHECK_FUNCS([ftime gettimeofday memset select socket strchr strdup \ - strerror strrchr strstr strtol strtoul], - [], - [AC_MSG_FAILURE([*** Required function $ac_func not found.])]) diff --git a/package/dhcpv6/patches/patch-src_relay6_socket_c b/package/dhcpv6/patches/patch-src_relay6_socket_c deleted file mode 100644 index c5f37d926..000000000 --- a/package/dhcpv6/patches/patch-src_relay6_socket_c +++ /dev/null @@ -1,48 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dhcpv6-1.2.0.orig/src/relay6_socket.c 2009-04-03 00:53:38.000000000 +0200 -+++ dhcpv6-1.2.0/src/relay6_socket.c 2009-05-28 23:09:11.155499136 +0200 -@@ -399,7 +399,7 @@ int send_message() { - if (mesg->sent == 1) - return 0; - -- bzero((char *) &sin6, sizeof(struct sockaddr_in6)); -+ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6)); - sin6.sin6_family = AF_INET6; - sin6.sin6_flowinfo = 0; - sin6.sin6_scope_id = 0; -@@ -494,7 +494,7 @@ int send_message() { - if (mesg->msg_type == DH6_RELAY_FORW) { - for (ipv6uni = IPv6_uniaddr_list.next; ipv6uni != &IPv6_uniaddr_list; - ipv6uni = ipv6uni->next) { -- bzero((char *) &sin6, sizeof(struct sockaddr_in6)); -+ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6)); - sin6.sin6_family = AF_INET6; - - memset(dest_addr, 0, INET6_ADDRSTRLEN); -@@ -564,7 +564,7 @@ int send_message() { - iface = iface->next) { - uservers = iface->sname; - while (uservers != NULL) { -- bzero((char *) &sin6, sizeof(struct sockaddr_in6)); -+ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6)); - sin6.sin6_family = AF_INET6; - - memset(dest_addr, 0, INET6_ADDRSTRLEN); -@@ -644,7 +644,7 @@ int send_message() { - - for (si = sifaces_list.next; si != &sifaces_list; si = si->next) { - *(mesg->hc_pointer) = MAXHOPCOUNT; -- bzero((char *) &sin6, sizeof(struct sockaddr_in6)); -+ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6)); - sin6.sin6_family = AF_INET6; - - memset(dest_addr, 0, INET6_ADDRSTRLEN); -@@ -734,7 +734,7 @@ int send_message() { - continue; - - *(mesg->hc_pointer) = MAXHOPCOUNT; -- bzero((char *) &sin6, sizeof(struct sockaddr_in6)); -+ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6)); - sin6.sin6_family = AF_INET6; - - memset(dest_addr, 0, INET6_ADDRSTRLEN); diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index ea99684be..13cc6bedc 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -1,16 +1,14 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. include ${TOPDIR}/rules.mk PKG_NAME:= digitemp -PKG_VERSION:= 3.3.2 +PKG_VERSION:= 3.6.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0b6cfb36d198767836de54d9fb11bbdb +PKG_MD5SUM:= 9be2e48db37920f21925ae6e88f83b84 PKG_DESCR:= simple to use program for reading values from 1-wire devices -PKG_SECTION:= app +PKG_SECTION:= misc PKG_DEPENDS:= libusb PKG_URL:= http://www.digitemp.com/software/linux PKG_SITES:= http://www.digitemp.com/software/linux/ @@ -19,6 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TCFLAGS+= -I./src -I./userial ALL_TARGET= ds2490 BUILD_STYLE= auto diff --git a/package/digitemp/patches/001-Makefile.patch b/package/digitemp/patches/001-Makefile.patch deleted file mode 100644 index a08164b86..000000000 --- a/package/digitemp/patches/001-Makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- digitemp-3.3.2.orig/Makefile 2004-02-04 15:17:10.000000000 +0100 -+++ digitemp-3.3.2/Makefile 2006-08-16 20:17:27.000000000 +0200 -@@ -15,8 +15,6 @@ - - VERSION = 3.3.2 - -- --CC = gcc - CFLAGS = -I./src -I./userial -O2 # -g -Wall - LIBS = -lm - -@@ -57,7 +55,7 @@ - CFLAGS += -DLINUX - - # Set LOCK to yes for serial port locking support -- LOCK = yes -+ #LOCK = yes - - endif - -@@ -123,7 +121,7 @@ - $(CC) $(OBJS) $(ONEWIREOBJS) $(DS9097UOBJS) -o digitemp_DS9097U $(LIBS) - - ds2490: $(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS2490OBJS) -- $(CC) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS) -+ $(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS) - - - # Clean up the object files and the sub-directory for distributions diff --git a/package/digitemp/patches/patch-Makefile b/package/digitemp/patches/patch-Makefile new file mode 100644 index 000000000..10ac0c97f --- /dev/null +++ b/package/digitemp/patches/patch-Makefile @@ -0,0 +1,14 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- digitemp-3.6.0.orig/Makefile 2008-08-28 23:37:00.000000000 +0200 ++++ digitemp-3.6.0/Makefile 2009-06-01 20:04:20.000000000 +0200 +@@ -11,8 +11,8 @@ + + VERSION = 3.6.0 + +-CC = gcc +-CFLAGS = -I./src -I./userial -O2 -Wall # -g ++CC ?= gcc ++CFLAGS ?= -I./src -I./userial + + OBJS = src/digitemp.o src/device_name.o src/ds2438.o + HDRS = src/digitemp.h src/device_name.h diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 10fb0b247..9d14a2726 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index ce5a0d430..ae7e2bc57 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile index 7f69e2d60..8153e9426 100644 --- a/package/dovecot/Makefile +++ b/package/dovecot/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 186dae9af..22a5680ac 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -26,7 +24,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-pam \ --enable-openpty \ --enable-syslog \ - --disable-shadow \ + --enable-shadow \ --disable-lastlog \ --disable-utmp \ --disable-utmpx \ diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst index 1e45f3924..8cde82f3f 100644 --- a/package/dropbear/files/dropbear.postinst +++ b/package/dropbear/files/dropbear.postinst @@ -1,3 +1,3 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh -add_rcconf '"NO" to disable' dropbear_flags "" +add_rcconf '"NO" to disable' dropbear_flags "-w" diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile index e15d98ecc..30a838378 100644 --- a/package/dsniff/Makefile +++ b/package/dsniff/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 12abd583a..fad66f179 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/elinks/Makefile b/package/elinks/Makefile index 64468e331..672c982de 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/em28xx/Makefile b/package/em28xx/Makefile index 9a0067a9f..ba0a2fa04 100644 --- a/package/em28xx/Makefile +++ b/package/em28xx/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/esound/Makefile b/package/esound/Makefile index 6da76d2a6..123ade95c 100644 --- a/package/esound/Makefile +++ b/package/esound/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile index fba2d465f..ec8f43ccd 100644 --- a/package/ether-wake/Makefile +++ b/package/ether-wake/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile index e37c59066..4f9d35e62 100644 --- a/package/ethtool/Makefile +++ b/package/ethtool/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/evieext/Makefile b/package/evieext/Makefile index 49eae3120..adc4f0002 100644 --- a/package/evieext/Makefile +++ b/package/evieext/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/exmap/Makefile b/package/exmap/Makefile index f620df545..be7953f5b 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/expat/Makefile b/package/expat/Makefile index c74b8a3c4..77764a080 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile index f0f46b79f..2d1b0db96 100644 --- a/package/ez-ipupdate/Makefile +++ b/package/ez-ipupdate/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/faad2/Makefile b/package/faad2/Makefile index ed707cc86..20403e056 100644 --- a/package/faad2/Makefile +++ b/package/faad2/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile index 3026df385..ecf18041e 100644 --- a/package/fakeidentd/Makefile +++ b/package/fakeidentd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/fbset/Makefile b/package/fbset/Makefile index 23819e5f8..1591e6704 100644 --- a/package/fbset/Makefile +++ b/package/fbset/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index f35bc9fbf..c35add42e 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index d38b28aa2..267fd6b10 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/file/Makefile b/package/file/Makefile index 1c2797ed1..88f9a39b4 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile index ecf7857d5..b45ed4fe1 100644 --- a/package/fixesproto/Makefile +++ b/package/fixesproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/flac/Makefile b/package/flac/Makefile index ed434362e..d5c06c17f 100644 --- a/package/flac/Makefile +++ b/package/flac/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/fontcacheproto/Makefile b/package/fontcacheproto/Makefile index 6bd625df8..2ab26d96a 100644 --- a/package/fontcacheproto/Makefile +++ b/package/fontcacheproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile index 7e712635a..c42c8c10e 100644 --- a/package/fontsproto/Makefile +++ b/package/fontsproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/fping/Makefile b/package/fping/Makefile index 212b5ee51..0e7127d50 100644 --- a/package/fping/Makefile +++ b/package/fping/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/fprobe-ulog/Makefile b/package/fprobe-ulog/Makefile index 31b7596d7..7b7fda126 100644 --- a/package/fprobe-ulog/Makefile +++ b/package/fprobe-ulog/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile index 53691c108..66d2b4abf 100644 --- a/package/fprobe/Makefile +++ b/package/fprobe/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/freeradius-client/Config.in b/package/freeradius-client/Config.in new file mode 100644 index 000000000..79325a755 --- /dev/null +++ b/package/freeradius-client/Config.in @@ -0,0 +1,21 @@ +config ADK_COMPILE_FREERADIUS_CLIENT + tristate + default n + depends ADK_PACKAGE_LIBFREERADIUS_CLIENT + +config ADK_PACKAGE_FREERADIUS_CLIENT + prompt "freeradius-client................. RADIUS client" + tristate + default n + select ADK_PACKAGE_LIBOPENSSL + select ADK_PACKAGE_LIBFREERADIUS_CLIENT + help + http://freeradius.org/freeradius-client/ + +config ADK_PACKAGE_LIBFREERADIUS_CLIENT + prompt "libfreeradius-client.............. RADIUS client library" + tristate + default n + select ADK_COMPILE_FREERADIUS_CLIENT + help + http://freeradius.org/freeradius-client/ diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile new file mode 100644 index 000000000..19f6a236c --- /dev/null +++ b/package/freeradius-client/Makefile @@ -0,0 +1,39 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= freeradius-client +PKG_VERSION:= 1.1.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= edd4d904e802ff66d35532be1475cfa7 +PKG_DESCR:= RADIUS client +PKG_SECTION:= net +PKG_DEPENDS:= libopenssl +PKG_URL:= http://www.freeradius.org +PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ \ + http://freeradius.portal-to-web.de/ \ + ftp://ftp.uk.freeradius.org/pub/radius/ + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,FREERADIUS_CLIENT,freeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +CONFIGURE_ENV+= ac_cv_func_uname=no +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +do-install: + ${INSTALL_DIR} ${IDIR_FREERADIUS_CLIENT}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/radiusclient \ + ${IDIR_FREERADIUS_CLIENT}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/rad{login,status} \ + ${IDIR_FREERADIUS_CLIENT}/usr/sbin + ${CP} ${WRKINST}/etc ${IDIR_FREERADIUS_CLIENT}/ + ${INSTALL_DIR} ${IDIR_LIBFREERADIUS_CLIENT}/usr/lib + ${CP} ${WRKINST}/usr/lib/libfreeradius-client.so* \ + ${IDIR_LIBFREERADIUS_CLIENT}/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/freeradius/Config.in b/package/freeradius-server/Config.in index a7a2fa7c1..56fcf16ea 100644 --- a/package/freeradius/Config.in +++ b/package/freeradius-server/Config.in @@ -1,7 +1,5 @@ -#menu "freeradius........................ A Flexible RADIUS server implementation" - -config ADK_PACKAGE_FREERADIUS - prompt "freeradius........................ Flexible RADIUS server" +config ADK_PACKAGE_FREERADIUS_SERVER + prompt "freeradius-server................. Flexible RADIUS server" tristate default n select ADK_PACKAGE_LIBLTDL @@ -9,125 +7,74 @@ config ADK_PACKAGE_FREERADIUS select ADK_PACKAGE_LIBPTHREAD help A flexible RADIUS server - http://www.freeradius.org/ - Depends: - - libltdl - - libopenssl - - libpthread - - libmysqlclient (for MySQL support) - - libopenldap (for LDAP support) - - libpq (for PostgreSQL support) - config ADK_PACKAGE_FREERADIUS_DEMOCERTS prompt " freeradius-democerts.......... Demo certificates to test the server" tristate default n - depends ADK_PACKAGE_FREERADIUS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_CHAP prompt " freeradius-mod-chap........... CHAP module" tristate default n - depends ADK_PACKAGE_FREERADIUS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_DETAIL prompt " freeradius-mod-detail......... Detailed accounting module" tristate default n - depends ADK_PACKAGE_FREERADIUS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_DIGEST prompt " freeradius-mod-digest......... Digest authentication" tristate default n - depends ADK_PACKAGE_FREERADIUS - -config ADK_PACKAGE_FREERADIUS_MOD_EAP - prompt " freeradius-mod-eap............ Base EAP module" - tristate - default n - depends ADK_PACKAGE_FREERADIUS - -config ADK_PACKAGE_FREERADIUS_MOD_EAP_GTC - prompt " freeradius-mod-eap-gtc...... EAP/GTC module" - tristate - default n - depends ADK_PACKAGE_FREERADIUS_MOD_EAP - -config ADK_PACKAGE_FREERADIUS_MOD_EAP_MD5 - prompt " freeradius-mod-eap-md5...... EAP/MD5 module" - tristate - default n - depends ADK_PACKAGE_FREERADIUS_MOD_EAP - -config ADK_PACKAGE_FREERADIUS_MOD_EAP_MSCHAPV2 - prompt " freeradius-mod-eap-mschapv2. EAP/MS-CHAPv2 module" - tristate - default n - depends ADK_PACKAGE_FREERADIUS_MOD_EAP - -config ADK_PACKAGE_FREERADIUS_MOD_EAP_PEAP - prompt " freeradius-mod-eap-peap..... EAP/PEAP module" - tristate - default n - depends ADK_PACKAGE_FREERADIUS_MOD_EAP - -config ADK_PACKAGE_FREERADIUS_MOD_EAP_TLS - prompt " freeradius-mod-eap-tls...... EAP/TLS module" - tristate - default n - depends ADK_PACKAGE_FREERADIUS_MOD_EAP - -config ADK_PACKAGE_FREERADIUS_MOD_EAP_TTLS - prompt " freeradius-mod-eap-ttls... EAP/TTLS module" - tristate - default n - depends ADK_PACKAGE_FREERADIUS_MOD_EAP_TLS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_FILES prompt " freeradius-mod-files.......... Module using local files for authorization" tristate default y - depends ADK_PACKAGE_FREERADIUS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_LDAP prompt " freeradius-mod-ldap........... LDAP module" tristate default n select ADK_PACKAGE_LIBOPENLDAP - depends ADK_PACKAGE_FREERADIUS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_MSCHAP prompt " freeradius-mod-mschap......... MS-CHAP and MS-CHAPv2 module" tristate default n - depends ADK_PACKAGE_FREERADIUS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_PAP prompt " freeradius-mod-pap............ PAP module" tristate default n - depends ADK_PACKAGE_FREERADIUS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_PREPROCESS prompt " freeradius-mod-preprocess..... Request pre-processing module" tristate default n - depends ADK_PACKAGE_FREERADIUS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_REALM prompt " freeradius-mod-realm.......... Realms handling module" tristate default n - depends ADK_PACKAGE_FREERADIUS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_SQL prompt " freeradius-mod-sql............ Base SQL module" tristate default n - depends ADK_PACKAGE_FREERADIUS + depends ADK_PACKAGE_FREERADIUS_SERVER config ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL prompt " freeradius-mod-sql-mysql.... MySQL module" @@ -148,6 +95,4 @@ config ADK_PACKAGE_FREERADIUS_UTILS prompt " freeradius-utils.............. Misc. client utilities" tristate default n - depends ADK_PACKAGE_FREERADIUS - -#endmenu + depends ADK_PACKAGE_FREERADIUS_SERVER diff --git a/package/freeradius/Makefile b/package/freeradius-server/Makefile index f6e4a29ca..7071d2a49 100644 --- a/package/freeradius/Makefile +++ b/package/freeradius-server/Makefile @@ -1,14 +1,12 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. include ${TOPDIR}/rules.mk -PKG_NAME:= freeradius -PKG_VERSION:= 2.1.4 +PKG_NAME:= freeradius-server +PKG_VERSION:= 2.1.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 07837a2e78028a0fcf5fc3bb5ca292e9 +PKG_MD5SUM:= 078f7d29b4d2d34f7c992abf772c28a0 PKG_DESCR:= a flexible RADIUS server PKG_SECTION:= net PKG_DEPENDS:= libltdl libopenssl libpthread @@ -17,9 +15,6 @@ PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ \ http://freeradius.portal-to-web.de/ \ ftp://ftp.uk.freeradius.org/pub/radius/ -DISTFILES:= ${PKG_NAME}-server-${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-server-${PKG_VERSION} - PKG_CONFIGURE_OPTIONS:= ifneq (${ADK_PACKAGE_FREERADIUS_MOD_LDAP},) @@ -69,18 +64,11 @@ ${2}-install: done endef -$(eval $(call PKG_template,FREERADIUS,freeradius,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_SERVER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP,freeradius-mod-eap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_GTC,freeradius-mod-eap-gtc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MD5,freeradius-mod-eap-md5,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MSCHAPV2,freeradius-mod-eap-mschapv2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_PEAP,freeradius-mod-eap-peap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TLS,freeradius-mod-eap-tls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TTLS,freeradius-mod-eap-ttls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -95,13 +83,6 @@ $(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PK $(eval $(call PKG_mod_template,FREERADIUS_MOD_CHAP,rlm_chap,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_DETAIL,rlm_detail,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_DIGEST,rlm_digest,)) -$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP,libeap rlm_eap,eap.conf)) -$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_GTC,rlm_eap_gtc,)) -$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_MD5,rlm_eap_md5,)) -$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_MSCHAPV2,rlm_eap_mschapv2,)) -$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_PEAP,rlm_eap_peap,)) -$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_TLS,rlm_eap_tls,)) -$(eval $(call PKG_mod_template,FREERADIUS_MOD_EAP_TTLS,rlm_eap_ttls,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_FILES,rlm_files,acct_users preproxy_users users)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_MSCHAP,rlm_mschap,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_LDAP,rlm_ldap,ldap.attrmap)) @@ -125,6 +106,8 @@ CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTIONS} \ --without-rlm_checkval \ --without-rlm_counter \ --without-rlm_dbm \ + --without-rlm_eap \ + --without-rlm_eap2 \ --without-rlm_eap_sim \ --without-rlm_example \ --without-rlm_ippool \ @@ -158,27 +141,27 @@ FAKE_FLAGS+= R="${WRKINST}" \ INSTALLSTRIP="" post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} - ${INSTALL_DIR} ${IDIR_FREERADIUS}/etc/freeradius - ${CP} ./files/users ${IDIR_FREERADIUS}/etc/freeradius/ - ${INSTALL_DATA} ./files/radiusd.conf ${IDIR_FREERADIUS}/etc/freeradius - ${INSTALL_DATA} ./files/clients.conf ${IDIR_FREERADIUS}/etc/freeradius + ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/etc/freeradius + ${CP} ./files/users ${IDIR_FREERADIUS_SERVER}/etc/freeradius/ + ${INSTALL_DATA} ./files/radiusd.conf ${IDIR_FREERADIUS_SERVER}/etc/freeradius + ${INSTALL_DATA} ./files/clients.conf ${IDIR_FREERADIUS_SERVER}/etc/freeradius for f in dictionary; do \ ${CP} ${WRKINST}/etc/freeradius/$${f} \ - ${IDIR_FREERADIUS}/etc/freeradius/ ; \ + ${IDIR_FREERADIUS_SERVER}/etc/freeradius/ ; \ done - ${INSTALL_DIR} ${IDIR_FREERADIUS}/usr/share/freeradius + ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/share/freeradius ${CP} ${WRKINST}/usr/share/freeradius/dictionary \ - ${IDIR_FREERADIUS}/usr/share/freeradius/ + ${IDIR_FREERADIUS_SERVER}/usr/share/freeradius/ for f in freeradius freeradius.internal rfc2865 rfc2866 rfc2867 rfc2868 rfc2869 rfc3162 rfc3576 rfc3580 rfc4072 rfc4372 rfc4675 rfc4679 rfc5176; do \ cp ${WRKINST}/usr/share/freeradius/dictionary.$${f} \ - ${IDIR_FREERADIUS}/usr/share/freeradius/ ; \ + ${IDIR_FREERADIUS_SERVER}/usr/share/freeradius/ ; \ done - ${INSTALL_DIR} ${IDIR_FREERADIUS}/usr/lib/freeradius + ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/lib/freeradius ${CP} ${WRKINST}/usr/lib/freeradius/libfreeradius-radius{,-*}.so \ - ${IDIR_FREERADIUS}/usr/lib - ${INSTALL_DIR} ${IDIR_FREERADIUS}/usr/sbin + ${IDIR_FREERADIUS_SERVER}/usr/lib + ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/sbin ${CP} ${WRKINST}/usr/sbin/radiusd \ - ${IDIR_FREERADIUS}/usr/sbin/ + ${IDIR_FREERADIUS_SERVER}/usr/sbin/ ${INSTALL_DIR} ${IDIR_FREERADIUS_DEMOCERTS}/etc/freeradius ${CP} ${WRKINST}/etc/freeradius/certs \ ${IDIR_FREERADIUS_DEMOCERTS}/etc/freeradius/ @@ -187,9 +170,6 @@ post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} rm -rf ${IDIR_FREERADIUS_DEMOCERTS}/etc/freeradius/certs/demoCA/index* rm -rf ${IDIR_FREERADIUS_DEMOCERTS}/etc/freeradius/certs/demoCA/serial* ${INSTALL_DIR} ${IDIR_FREERADIUS_UTILS}/usr/bin - for f in radclient; do \ - ${CP} ${WRKINST}/usr/bin/$${f} \ - ${IDIR_FREERADIUS_UTILS}/usr/bin/ ; \ - done + ${INSTALL_BIN} ${WRKINST}/usr/bin/radclient ${IDIR_FREERADIUS_UTILS}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/freeradius/files/clients.conf b/package/freeradius-server/files/clients.conf index 6c136a197..6c136a197 100644 --- a/package/freeradius/files/clients.conf +++ b/package/freeradius-server/files/clients.conf diff --git a/package/freeradius/files/freeradius-mod-eap.conffiles b/package/freeradius-server/files/freeradius-mod-eap.conffiles index 7e0e30e73..7e0e30e73 100644 --- a/package/freeradius/files/freeradius-mod-eap.conffiles +++ b/package/freeradius-server/files/freeradius-mod-eap.conffiles diff --git a/package/freeradius/files/freeradius-mod-files.conffiles b/package/freeradius-server/files/freeradius-mod-files.conffiles index 4fcd92bff..4fcd92bff 100644 --- a/package/freeradius/files/freeradius-mod-files.conffiles +++ b/package/freeradius-server/files/freeradius-mod-files.conffiles diff --git a/package/freeradius/files/freeradius-mod-realm.conffiles b/package/freeradius-server/files/freeradius-mod-realm.conffiles index a4d412612..a4d412612 100644 --- a/package/freeradius/files/freeradius-mod-realm.conffiles +++ b/package/freeradius-server/files/freeradius-mod-realm.conffiles diff --git a/package/freeradius/files/freeradius-mod-sql.conffiles b/package/freeradius-server/files/freeradius-mod-sql.conffiles index 8ab119d07..8ab119d07 100644 --- a/package/freeradius/files/freeradius-mod-sql.conffiles +++ b/package/freeradius-server/files/freeradius-mod-sql.conffiles diff --git a/package/freeradius/files/freeradius.conffiles b/package/freeradius-server/files/freeradius.conffiles index 56552e6c1..56552e6c1 100644 --- a/package/freeradius/files/freeradius.conffiles +++ b/package/freeradius-server/files/freeradius.conffiles diff --git a/package/freeradius/files/freeradius.postinst b/package/freeradius-server/files/freeradius.postinst index c65fa195f..c65fa195f 100644 --- a/package/freeradius/files/freeradius.postinst +++ b/package/freeradius-server/files/freeradius.postinst diff --git a/package/freeradius/files/radiusd.conf b/package/freeradius-server/files/radiusd.conf index b9a573f69..b9a573f69 100644 --- a/package/freeradius/files/radiusd.conf +++ b/package/freeradius-server/files/radiusd.conf diff --git a/package/freeradius/files/radiusd.init b/package/freeradius-server/files/radiusd.init index 818f803ff..818f803ff 100644 --- a/package/freeradius/files/radiusd.init +++ b/package/freeradius-server/files/radiusd.init diff --git a/package/freeradius/files/users b/package/freeradius-server/files/users index df78de04c..df78de04c 100644 --- a/package/freeradius/files/users +++ b/package/freeradius-server/files/users diff --git a/package/freeradius/patches/patch-share_dictionary b/package/freeradius-server/patches/patch-share_dictionary index 49b472d43..6027a7810 100644 --- a/package/freeradius/patches/patch-share_dictionary +++ b/package/freeradius-server/patches/patch-share_dictionary @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- freeradius-server-2.1.4.orig/share/dictionary 2009-03-11 03:26:50.000000000 +0100 -+++ freeradius-server-2.1.4/share/dictionary 2009-04-29 21:42:22.287143645 +0200 +--- freeradius-server-2.1.6.orig/share/dictionary 2009-05-18 13:13:55.000000000 +0200 ++++ freeradius-server-2.1.6/share/dictionary 2009-06-01 16:15:56.702126337 +0200 @@ -54,7 +54,7 @@ # this directive to the end of this file if you want to see the # old names in the logfiles, INSTEAD OF the new names. @@ -10,7 +10,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ # # Include the RFC dictionaries next. -@@ -80,109 +80,109 @@ $INCLUDE dictionary.rfc5176 +@@ -82,110 +82,12 @@ $INCLUDE dictionary.rfc5176 # # Include vendor dictionaries after the standard ones. # @@ -31,49 +31,22 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.cablelabs -$INCLUDE dictionary.cabletron -$INCLUDE dictionary.cisco -+#$INCLUDE dictionary.3com -+#$INCLUDE dictionary.3gpp -+#$INCLUDE dictionary.3gpp2 -+#$INCLUDE dictionary.acc -+#$INCLUDE dictionary.airespace -+#$INCLUDE dictionary.alcatel -+#$INCLUDE dictionary.alteon -+#$INCLUDE dictionary.alvarion -+#$INCLUDE dictionary.apc -+#$INCLUDE dictionary.aruba -+#$INCLUDE dictionary.azaire -+#$INCLUDE dictionary.ascend -+#$INCLUDE dictionary.bay -+#$INCLUDE dictionary.bintec -+#$INCLUDE dictionary.cablelabs -+#$INCLUDE dictionary.cabletron -+#$INCLUDE dictionary.cisco # # The Cisco VPN300 dictionary is the same as the altiga one. # You shouldn't use both at the same time. # - #$INCLUDE dictionary.cisco.vpn3000 +-#$INCLUDE dictionary.cisco.vpn3000 -$INCLUDE dictionary.cisco.vpn5000 -$INCLUDE dictionary.cisco.bbsm -$INCLUDE dictionary.clavister -$INCLUDE dictionary.colubris -$INCLUDE dictionary.cosine -+#$INCLUDE dictionary.cisco.vpn5000 -+#$INCLUDE dictionary.cisco.bbsm -+#$INCLUDE dictionary.clavister -+#$INCLUDE dictionary.colubris -+#$INCLUDE dictionary.cosine - #$INCLUDE dictionary.dhcp +-#$INCLUDE dictionary.dhcp -$INCLUDE dictionary.digium -$INCLUDE dictionary.epygi -$INCLUDE dictionary.erx -$INCLUDE dictionary.ericsson -$INCLUDE dictionary.extreme -+#$INCLUDE dictionary.digium -+#$INCLUDE dictionary.epygi -+#$INCLUDE dictionary.erx -+#$INCLUDE dictionary.ericsson -+#$INCLUDE dictionary.extreme $INCLUDE dictionary.freeradius -$INCLUDE dictionary.freeswitch -$INCLUDE dictionary.fortinet @@ -83,6 +56,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.h3c -$INCLUDE dictionary.hp -$INCLUDE dictionary.huawei +-$INCLUDE dictionary.infonet -$INCLUDE dictionary.issanni -$INCLUDE dictionary.itk -$INCLUDE dictionary.ipunplugged @@ -103,46 +77,16 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.nexans -$INCLUDE dictionary.ntua -$INCLUDE dictionary.nokia -+#$INCLUDE dictionary.freeswitch -+#$INCLUDE dictionary.fortinet -+#$INCLUDE dictionary.foundry -+#$INCLUDE dictionary.gandalf -+#$INCLUDE dictionary.gemtek -+#$INCLUDE dictionary.h3c -+#$INCLUDE dictionary.hp -+#$INCLUDE dictionary.huawei -+#$INCLUDE dictionary.issanni -+#$INCLUDE dictionary.itk -+#$INCLUDE dictionary.ipunplugged -+#$INCLUDE dictionary.juniper -+#$INCLUDE dictionary.jradius -+#$INCLUDE dictionary.karlnet -+#$INCLUDE dictionary.lancom -+#$INCLUDE dictionary.livingston -+#$INCLUDE dictionary.localweb -+#$INCLUDE dictionary.lucent -+#$INCLUDE dictionary.manzara -+#$INCLUDE dictionary.merit -+#$INCLUDE dictionary.microsoft -+#$INCLUDE dictionary.mikrotik -+#$INCLUDE dictionary.navini -+#$INCLUDE dictionary.netscreen -+#$INCLUDE dictionary.networkphysics -+#$INCLUDE dictionary.nexans -+#$INCLUDE dictionary.ntua -+#$INCLUDE dictionary.nokia # - # Commented out because of attribute conflicts. - # - #$INCLUDE dictionary.nokia.conflict +-# Commented out because of attribute conflicts. +-# +-#$INCLUDE dictionary.nokia.conflict -$INCLUDE dictionary.nomadix -$INCLUDE dictionary.nortel -+#$INCLUDE dictionary.nomadix -+#$INCLUDE dictionary.nortel - # - # Commented out because of attribute conflicts. - # - #$INCLUDE dictionary.openser +-# +-# Commented out because of attribute conflicts. +-# +-#$INCLUDE dictionary.openser -$INCLUDE dictionary.packeteer -$INCLUDE dictionary.patton -$INCLUDE dictionary.propel @@ -174,37 +118,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.wispr -$INCLUDE dictionary.xedia -$INCLUDE dictionary.xylan -+#$INCLUDE dictionary.packeteer -+#$INCLUDE dictionary.patton -+#$INCLUDE dictionary.propel -+#$INCLUDE dictionary.prosoft -+#$INCLUDE dictionary.quiconnect -+#$INCLUDE dictionary.quintum -+#$INCLUDE dictionary.redback -+#$INCLUDE dictionary.redcreek -+#$INCLUDE dictionary.riverstone -+#$INCLUDE dictionary.roaringpenguin -+#$INCLUDE dictionary.shasta -+#$INCLUDE dictionary.shiva -+#$INCLUDE dictionary.slipstream -+#$INCLUDE dictionary.sonicwall -+#$INCLUDE dictionary.springtide -+#$INCLUDE dictionary.starent -+#$INCLUDE dictionary.telebit -+#$INCLUDE dictionary.trapeze -+#$INCLUDE dictionary.tropos -+#$INCLUDE dictionary.t_systems_nova -+#$INCLUDE dictionary.usr -+#$INCLUDE dictionary.utstarcom -+#$INCLUDE dictionary.valemount -+#$INCLUDE dictionary.versanet -+#$INCLUDE dictionary.vqp -+#$INCLUDE dictionary.waverider -+#$INCLUDE dictionary.walabi -+#$INCLUDE dictionary.wimax -+#$INCLUDE dictionary.wispr -+#$INCLUDE dictionary.xedia -+#$INCLUDE dictionary.xylan # # And finally the server internal attributes. diff --git a/package/freeradius/patches/patch-src_main_event_c b/package/freeradius-server/patches/patch-src_main_event_c index c2067c04e..99184d09a 100644 --- a/package/freeradius/patches/patch-src_main_event_c +++ b/package/freeradius-server/patches/patch-src_main_event_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- freeradius-server-2.1.4.orig/src/main/event.c 2009-03-11 03:26:50.000000000 +0100 -+++ freeradius-server-2.1.4/src/main/event.c 2009-05-09 23:47:40.000000000 +0200 -@@ -1628,8 +1628,9 @@ static int originated_coa_request(REQUES +--- freeradius-server-2.1.6.orig/src/main/event.c 2009-05-18 13:13:55.000000000 +0200 ++++ freeradius-server-2.1.6/src/main/event.c 2009-06-01 17:06:44.356592479 +0200 +@@ -1667,8 +1667,9 @@ static int originated_coa_request(REQUES */ request->num_proxied_requests = 1; request->num_proxied_responses = 0; diff --git a/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in b/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in new file mode 100644 index 000000000..13cbb8215 --- /dev/null +++ b/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- freeradius-server-2.1.6.orig/src/modules/rlm_eap/Makefile.in 2009-05-18 13:13:55.000000000 +0200 ++++ freeradius-server-2.1.6/src/modules/rlm_eap/Makefile.in 2009-06-01 17:23:33.047631797 +0200 +@@ -37,7 +37,7 @@ radeapclient.lo: radeapclient.c $(HEADER + + install-subdirs: + @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=install common +- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radeapclient$(EXEEXT) $(R)$(bindir) ++ #$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radeapclient$(EXEEXT) $(R)$(bindir) + + common: + @for dir in $(RLM_SUBDIRS); do \ diff --git a/package/freeradius/files/freeradius-mod-ldap.conffiles b/package/freeradius/files/freeradius-mod-ldap.conffiles deleted file mode 100644 index ada9fafc1..000000000 --- a/package/freeradius/files/freeradius-mod-ldap.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/freeradius/ldap.attrmap diff --git a/package/freeradius/files/freeradius-mod-preprocess.conffiles b/package/freeradius/files/freeradius-mod-preprocess.conffiles deleted file mode 100644 index b29cca816..000000000 --- a/package/freeradius/files/freeradius-mod-preprocess.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/freeradius/hints -/etc/freeradius/huntgroups diff --git a/package/freetype/Makefile b/package/freetype/Makefile index d9cd8bf96..81d18cb51 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/frickin/Makefile b/package/frickin/Makefile index 770da6e86..e43d5d0eb 100644 --- a/package/frickin/Makefile +++ b/package/frickin/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/fuse/Makefile b/package/fuse/Makefile index e7acd10fa..b3b3658d1 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gatling/Makefile b/package/gatling/Makefile index 7e6b40763..623008b31 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 3c9bc296c..6f36c1a9f 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -43,7 +41,11 @@ post-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/ ${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/ +ifeq ($(ADK_TARGET_LIB_GLIBC),y) + ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib +else ${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib +endif rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/include-fixed rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 395a7af4c..bd3c14cfb 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile index 2209f0308..d1d001112 100644 --- a/package/gdbm/Makefile +++ b/package/gdbm/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index cbcc8909b..383f040f6 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 2bdf3eadb..04e1bf06c 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile index 3dfc58c77..dba286e4b 100644 --- a/package/gkrellmd/Makefile +++ b/package/gkrellmd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/glib/Makefile b/package/glib/Makefile index fb97ec818..66e3329c8 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 569bf7d4a..b2e0d1a6f 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -26,7 +24,7 @@ ifeq ($(ADK_SSP),y) endif $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_GLIBC)/lib/ $(CP) $(STAGING_DIR)/lib/ld-*.so* $(IDIR_GLIBC)/lib/ - -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ + -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_GLIBC)/lib/; \ $(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \ done diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index 1da2723f0..bfc0f135c 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gmp/Makefile b/package/gmp/Makefile index 14e24ebf0..e3e0c7d0d 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 1f14ebf2d..83fe67761 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gpg/Makefile b/package/gpg/Makefile index 3dcd24f3b..6ce049855 100644 --- a/package/gpg/Makefile +++ b/package/gpg/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gpm/Makefile b/package/gpm/Makefile index 341ce0333..8058b82a6 100644 --- a/package/gpm/Makefile +++ b/package/gpm/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 22369e103..42d75ee63 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/gsm/Makefile b/package/gsm/Makefile index 1f8687388..aba1e0366 100644 --- a/package/gsm/Makefile +++ b/package/gsm/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/haserl/Makefile b/package/haserl/Makefile index 56ef46c19..59c1f6d0c 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile index 4824f2ab5..a24108ea4 100644 --- a/package/hdparm/Makefile +++ b/package/hdparm/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 163d0632a..3ae793bc0 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/heyu/Makefile b/package/heyu/Makefile index 7e9efc5a0..c3d40ca56 100644 --- a/package/heyu/Makefile +++ b/package/heyu/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index faf9fbdaa..cf6b8c73c 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile index 628ddca35..e8dbe39f3 100644 --- a/package/htpdate/Makefile +++ b/package/htpdate/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/httping/Makefile b/package/httping/Makefile index 64ebd15f6..e494d9bd2 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/httping/patches/patch-str_c b/package/httping/patches/patch-str_c new file mode 100644 index 000000000..8778ef40b --- /dev/null +++ b/package/httping/patches/patch-str_c @@ -0,0 +1,16 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- httping-1.3.0.orig/str.c 2009-02-18 16:32:43.000000000 +0100 ++++ httping-1.3.0/str.c 2009-06-01 21:31:19.000000000 +0200 +@@ -18,6 +18,7 @@ + #include "mem.h" + #include "utils.h" + ++/* + #ifndef strndup + char *strndup(char *in, int size) + { +@@ -29,3 +30,4 @@ char *strndup(char *in, int size) + return out; + } + #endif ++*/ diff --git a/package/httping/patches/patch-str_h b/package/httping/patches/patch-str_h new file mode 100644 index 000000000..c7b81ed65 --- /dev/null +++ b/package/httping/patches/patch-str_h @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- httping-1.3.0.orig/str.h 2009-02-18 16:32:43.000000000 +0100 ++++ httping-1.3.0/str.h 2009-06-01 21:30:39.000000000 +0200 +@@ -15,6 +15,8 @@ + + #include <string.h> + ++/* + #ifndef strndup + char *strndup(char *in, int size); + #endif ++*/ diff --git a/package/httptunnel/Makefile b/package/httptunnel/Makefile index 58d56e06b..4d4171d30 100644 --- a/package/httptunnel/Makefile +++ b/package/httptunnel/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/icecast/Makefile b/package/icecast/Makefile index 3db42aee2..55ac16f1e 100644 --- a/package/icecast/Makefile +++ b/package/icecast/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index 3eb5c5663..545a27e91 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/iftop/Makefile b/package/iftop/Makefile index 1c123734c..0a83c3b8e 100644 --- a/package/iftop/Makefile +++ b/package/iftop/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile index 995f70d15..b26be8b8d 100644 --- a/package/igmpproxy/Makefile +++ b/package/igmpproxy/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile index 0305f070c..84a321b87 100644 --- a/package/inputproto/Makefile +++ b/package/inputproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile index 7074ef874..2fd4c2136 100644 --- a/package/ipcad/Makefile +++ b/package/ipcad/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 3796df176..dfc9b4732 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index d2703e645..ca71c53ab 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 10a3539e9..4d72e5918 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ipset/Makefile b/package/ipset/Makefile index daaaa72a0..504f7be09 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 409eaceba..292fc8297 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index 5fc36418d..d8d01ef8b 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/irssi/Makefile b/package/irssi/Makefile index 93c7d7b50..35f196048 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/iw/Makefile b/package/iw/Makefile index 8e153b5cc..2f63420c0 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 71417f59d..230bfd9e7 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index 5c4e8f05c..a15e3da03 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile index b73742ff8..bee278c3a 100644 --- a/package/kbproto/Makefile +++ b/package/kbproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/kismet/Makefile b/package/kismet/Makefile index 907d2e535..1cff83cd8 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/knock/Makefile b/package/knock/Makefile index 384c82ed3..c99b9a7b5 100644 --- a/package/knock/Makefile +++ b/package/knock/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/knock/patches/patch-src_knockd_c b/package/knock/patches/patch-src_knockd_c index d9f399bd6..7d8512c96 100644 --- a/package/knock/patches/patch-src_knockd_c +++ b/package/knock/patches/patch-src_knockd_c @@ -1,7 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- knock-0.5.orig/src/knockd.c 2005-06-27 07:11:34.000000000 +0200 -+++ knock-0.5/src/knockd.c 2009-05-29 17:03:55.776378324 +0200 -@@ -1064,7 +1064,7 @@ char* get_ip(const char* iface, char *bu ++++ knock-0.5/src/knockd.c 2009-06-01 21:43:53.000000000 +0200 +@@ -46,6 +46,7 @@ + #include <syslog.h> + #include <pcap.h> + #include <errno.h> ++#include <linux/limits.h> + #include "list.h" + + static char version[] = "0.5"; +@@ -1064,7 +1065,7 @@ char* get_ip(const char* iface, char *bu return(NULL); } diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 80b757823..38dff7af3 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile index 3a9978957..b3512d9f0 100644 --- a/package/l2tpns/Makefile +++ b/package/l2tpns/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/lame/Makefile b/package/lame/Makefile index 315f501d5..5d86199a6 100644 --- a/package/lame/Makefile +++ b/package/lame/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/less/Makefile b/package/less/Makefile index 92b79f244..38e963bd3 100644 --- a/package/less/Makefile +++ b/package/less/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libICE/Makefile b/package/libICE/Makefile index 6705f3976..9db94cf91 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libSM/Makefile b/package/libSM/Makefile index 2f9a74e89..86fc53b1c 100644 --- a/package/libSM/Makefile +++ b/package/libSM/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libX11/Makefile b/package/libX11/Makefile index b2c3ab1ff..4c6debf0c 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -7,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libX11 PKG_VERSION:= 1.1.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 2feb39a0de6f05b25c308268691d960c PKG_DESCR:= X11 client-side library PKG_SECTION:= x11 @@ -26,7 +24,8 @@ BUILD_STYLE= auto INSTALL_STYLE= auto confprog post-install: - ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib + ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 ${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/ + ${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11 include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in index 3a5366af1..9d27c162e 100644 --- a/package/libX11/patches/patch-src_util_Makefile_in +++ b/package/libX11/patches/patch-src_util_Makefile_in @@ -1,6 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- libX11-1.1.5.orig/src/util/Makefile.in 2008-09-04 23:48:56.000000000 +0200 -+++ libX11-1.1.5/src/util/Makefile.in 2008-12-22 13:41:42.000000000 +0100 ++++ libX11-1.1.5/src/util/Makefile.in 2009-05-30 21:53:42.350425696 +0200 +@@ -52,7 +52,7 @@ makekeys_OBJECTS = makekeys-makekeys.$(O + makekeys_LDADD = $(LDADD) + makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ $(HOSTLDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles @@ -82,7 +82,7 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@ BIGFONT_LIBS = @BIGFONT_LIBS@ CC = @CC@ @@ -10,9 +19,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ -@@ -229,7 +229,7 @@ top_builddir = @top_builddir@ +@@ -227,9 +227,9 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - makekeys_CFLAGS = $(X11_CFLAGS) +-makekeys_CFLAGS = $(X11_CFLAGS) ++makekeys_CFLAGS = $(HOSTCFLAGS) -#override CC = gcc +override CC = gcc diff --git a/package/libX11/patches/patch-src_util_Makefile_in.orig b/package/libX11/patches/patch-src_util_Makefile_in.orig deleted file mode 100644 index fb4885f40..000000000 --- a/package/libX11/patches/patch-src_util_Makefile_in.orig +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libX11-1.1.5.orig/src/util/Makefile.in 2008-09-04 23:48:56.000000000 +0200 -+++ libX11-1.1.5/src/util/Makefile.in 2008-12-22 13:39:31.000000000 +0100 -@@ -229,7 +229,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - makekeys_CFLAGS = $(X11_CFLAGS) - --#override CC = gcc -+override CC = gcc - LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - EXTRA_DIST = mkks.sh - diff --git a/package/libXau/Makefile b/package/libXau/Makefile index 12f3b90be..d0f43c7bc 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile index 1af747632..52c444ced 100644 --- a/package/libXaw/Makefile +++ b/package/libXaw/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index 8d9bada25..8b52dc91e 100644 --- a/package/libXdmcp/Makefile +++ b/package/libXdmcp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 6d3ef856f..bf3648798 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libXfont/Config.in b/package/libXfont/Config.in index 68aacfc92..b8553405a 100644 --- a/package/libXfont/Config.in +++ b/package/libXfont/Config.in @@ -1,6 +1,7 @@ config ADK_PACKAGE_LIBXFONT - prompt "libxfont................................ X keyboard library" + prompt "libxfont................................ X font library" tristate default n + select ADK_PACKAGE_LIBFREETYPE help http://www.x.org diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index fdb5df17f..8ebf1d199 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -11,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= cb202f7b1af5fc95a7f35f0a62e52e6e PKG_DESCR:= X font Library PKG_SECTION:= x11 +PKG_DEPENDS:= libfreetype PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile index f4d87f790..28af7968d 100644 --- a/package/libXmu/Makefile +++ b/package/libXmu/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile index a766bc76e..d57f8094a 100644 --- a/package/libXpm/Makefile +++ b/package/libXpm/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 6c0b85d8e..a2eeb5aa3 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libXv/Config.in b/package/libXv/Config.in new file mode 100644 index 000000000..59cf46b96 --- /dev/null +++ b/package/libXv/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_LIBXV + prompt "libXv................................. X library" + tristate + default n + help + http://www.x.org diff --git a/package/libXv/Makefile b/package/libXv/Makefile new file mode 100644 index 000000000..b09a39d37 --- /dev/null +++ b/package/libXv/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libXv +PKG_VERSION:= 1.0.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c2ce7e6651b3a8fdfefb2c53dea431fc +PKG_DESCR:= X11 Xvideo extensions +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBXV,libxv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= --disable-malloc0returnsnull +BUILD_STYLE= auto +INSTALL_STYLE= auto + +post-install: + ${INSTALL_DIR} ${IDIR_LIBXV}/usr/lib + ${CP} ${WRKINST}/usr/lib/libXv.so* ${IDIR_LIBXV}/usr/lib/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile index 2be0c3b5b..e8f7b62c2 100644 --- a/package/libXxf86dga/Makefile +++ b/package/libXxf86dga/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libao/Makefile b/package/libao/Makefile index 0f94f65f9..d728b47ee 100644 --- a/package/libao/Makefile +++ b/package/libao/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libart/Makefile b/package/libart/Makefile index f37251c98..3f21e9300 100644 --- a/package/libart/Makefile +++ b/package/libart/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index c376e65e3..36b2becf3 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libc/Makefile b/package/libc/Makefile index a07967255..786b3f32f 100644 --- a/package/libc/Makefile +++ b/package/libc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libcli/Makefile b/package/libcli/Makefile index ba99e764f..41d4eead2 100755 --- a/package/libcli/Makefile +++ b/package/libcli/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile index 487351e55..587a76ef4 100644 --- a/package/libdaemon/Makefile +++ b/package/libdaemon/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libdb/Makefile b/package/libdb/Makefile index 782e913d6..40cdb4763 100644 --- a/package/libdb/Makefile +++ b/package/libdb/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile index d96404c10..a1e028bbb 100644 --- a/package/libdnet/Makefile +++ b/package/libdnet/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libelf/Makefile b/package/libelf/Makefile index 664c3f3cc..cc308facb 100644 --- a/package/libelf/Makefile +++ b/package/libelf/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 9a91b1caa..8a35575c3 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libffi/Makefile b/package/libffi/Makefile index 881c07ba4..d1c71d881 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile index 487d3b71a..a6f883d90 100644 --- a/package/libfontenc/Makefile +++ b/package/libfontenc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index a414dca74..f8ea5e1b7 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libgd/Makefile b/package/libgd/Makefile index 32d4f49a6..2217d4244 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index b9de6136c..ec554b0da 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile index 7a9b3b409..d5f893a80 100644 --- a/package/libgssglue/Makefile +++ b/package/libgssglue/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index 75f314167..d4b092ba5 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile index 3c705c692..34b2417cc 100644 --- a/package/libid3tag/Makefile +++ b/package/libid3tag/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index 6259a59fd..c10b4d689 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libmad/Makefile b/package/libmad/Makefile index 0c3ab8f51..3b6d14be2 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libnet/Makefile b/package/libnet/Makefile index 788650ba7..fbad8f90b 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libnfsidmap/Makefile b/package/libnfsidmap/Makefile index 926882056..1a4bd35af 100644 --- a/package/libnfsidmap/Makefile +++ b/package/libnfsidmap/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 2844d15b7..91e265071 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libnl/Makefile b/package/libnl/Makefile index d11f3e2bb..a1c4657f7 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libogg/Makefile b/package/libogg/Makefile index fb95c2209..3242d1b91 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libol/Makefile b/package/libol/Makefile index 9e8243c03..6629e2d18 100644 --- a/package/libol/Makefile +++ b/package/libol/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile index 1be2121c4..f93bf4c00 100644 --- a/package/libosip2/Makefile +++ b/package/libosip2/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile index 276d11886..2252d83f5 100644 --- a/package/libowfat/Makefile +++ b/package/libowfat/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libp11/Makefile b/package/libp11/Makefile index e71e780b4..12565f97c 100644 --- a/package/libp11/Makefile +++ b/package/libp11/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 2e8415ee7..877b35a37 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index b4c8dc652..ccf80e9a1 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 11111108d..9d95fd0ba 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libpri/Makefile b/package/libpri/Makefile index 5da4ebe04..7da358229 100644 --- a/package/libpri/Makefile +++ b/package/libpri/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index cbf398e1f..74b0ea865 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index bcdb41134..ed47b9cd5 100644 --- a/package/librpcsecgss/Makefile +++ b/package/librpcsecgss/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libshout/Makefile b/package/libshout/Makefile index b5f9c3a09..f91cd809c 100644 --- a/package/libshout/Makefile +++ b/package/libshout/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile index 266f82f9c..e056aab28 100644 --- a/package/libsigc++/Makefile +++ b/package/libsigc++/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index ae07966ab..1d6359c59 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index 239a297bc..abccb263a 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index 811d1c5f1..42e9311b5 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 240382feb..90aa220d4 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 0cf696875..0a8ee70e8 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libtool/Makefile b/package/libtool/Makefile index 1e88dd366..40aa46663 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index eb3d7b4ac..3cbe6d082 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index cfe80adea..31f2cd6e9 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile index 82fd5e34f..452616011 100644 --- a/package/libusb-compat/Makefile +++ b/package/libusb-compat/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libusb/Makefile b/package/libusb/Makefile index c705ba982..dec66a988 100644 --- a/package/libusb/Makefile +++ b/package/libusb/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index 6729737b3..a78edf31d 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile index 1d840d21f..d68e1a46b 100644 --- a/package/libvorbisidec/Makefile +++ b/package/libvorbisidec/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index 3835cc6b0..eeaa4c051 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index ed4dc172c..2025a1a64 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 4b9f50c7f..447fa5e7f 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 467200e37..69d8e8432 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/links/Makefile b/package/links/Makefile index f44745e3e..5238c599f 100644 --- a/package/links/Makefile +++ b/package/links/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index fe5e0c47b..b3e646704 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/linux-atm/patches/patch-src_led_main_c b/package/linux-atm/patches/patch-src_led_main_c new file mode 100644 index 000000000..63c5b5e9b --- /dev/null +++ b/package/linux-atm/patches/patch-src_led_main_c @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- linux-atm-2.5.0.orig/src/led/main.c 2005-10-06 19:27:50.000000000 +0200 ++++ linux-atm-2.5.0/src/led/main.c 2009-06-01 22:38:27.000000000 +0200 +@@ -31,6 +31,7 @@ + #endif + + /* Global includes */ ++#include <limits.h> + #include <stdlib.h> + #include <stdio.h> + #include <sys/time.h> diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile index 7596927dc..bd2b102ef 100644 --- a/package/logrotate/Makefile +++ b/package/logrotate/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/lrzsz/Makefile b/package/lrzsz/Makefile index 47784d0a6..955b6925e 100644 --- a/package/lrzsz/Makefile +++ b/package/lrzsz/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/lua/Makefile b/package/lua/Makefile index 4df8515cc..583de4562 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 65249a1da..6a9aa81a7 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -10,7 +8,8 @@ PKG_VERSION:= 2.02.45 PKG_RELEASE:= 1 PKG_MD5SUM:= 440daa01b8f2ec4fe97b1cc621108220 PKG_DESCR:= logical volume management -PKG_SECTION:= utils +PKG_SECTION:= misc +PKG_DEPENDS:= device-mapper PKG_URL:= http://sourceware.org/lvm2/ PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/ @@ -20,18 +19,25 @@ WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION} include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},${PKG_SECTION},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-user="" --with-group="" \ --with-optimisation="" \ - --with-lvm1=none \ - --enable-static_link \ - --with-kernel-dir=${LINUX_DIR} + --with-lvm1=none BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: + # lvm ${INSTALL_DIR} ${IDIR_LVM}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm.static ${IDIR_LVM}/usr/sbin/lvm + ${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm + # device-mapper + ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib + ${CP} ${WRKINST}/usr/lib/libdevmapper.so* \ + ${IDIR_DEVICE_MAPPER}/usr/lib + ${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \ + ${IDIR_DEVICE_MAPPER}/usr/sbin + chmod u+w ${IDIR_DEVICE_MAPPER}/usr/lib/*.so* include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lynx/Makefile b/package/lynx/Makefile index e51227fea..388109c89 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 48b418bfc..b3af9aa21 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/macchanger/Makefile b/package/macchanger/Makefile index a5ad82a80..c9f8aab41 100755 --- a/package/macchanger/Makefile +++ b/package/macchanger/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/madplay/Makefile b/package/madplay/Makefile index 8d5894b4f..e890cc3c2 100644 --- a/package/madplay/Makefile +++ b/package/madplay/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/maradns/Makefile b/package/maradns/Makefile index b481106c3..2b183195b 100644 --- a/package/maradns/Makefile +++ b/package/maradns/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mc/Makefile b/package/mc/Makefile index 4bd541c14..10ed0320a 100644 --- a/package/mc/Makefile +++ b/package/mc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mgetty/Makefile b/package/mgetty/Makefile index cb3f9b49b..3628f7043 100644 --- a/package/mgetty/Makefile +++ b/package/mgetty/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/miau/Makefile b/package/miau/Makefile index b18ea6503..5ceb9a48e 100644 --- a/package/miau/Makefile +++ b/package/miau/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/miax/Makefile b/package/miax/Makefile index 8c4753355..f028a4879 100644 --- a/package/miax/Makefile +++ b/package/miax/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/microperl/Makefile b/package/microperl/Makefile index 8ac27e660..ea04c6e2f 100644 --- a/package/microperl/Makefile +++ b/package/microperl/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index 17f8caced..e43e7f4bf 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mini_httpd/patches/patch-htpasswd_c b/package/mini_httpd/patches/patch-htpasswd_c new file mode 100644 index 000000000..bfea3fc7c --- /dev/null +++ b/package/mini_httpd/patches/patch-htpasswd_c @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- mini_httpd-1.19.orig/htpasswd.c 2001-12-19 01:08:10.000000000 +0100 ++++ mini_httpd-1.19/htpasswd.c 2009-06-01 22:50:44.000000000 +0200 +@@ -49,7 +49,7 @@ static void getword(char *word, char *li + while((line[y++] = line[x++])); + } + +-static int getline(char *s, int n, FILE *f) { ++static int getline2(char *s, int n, FILE *f) { + register int i=0; + + while(1) { +@@ -189,7 +189,7 @@ int main(int argc, char *argv[]) { + strcpy(user,argv[2]); + + found = 0; +- while(!(getline(line,MAX_STRING_LEN,f))) { ++ while(!(getline2(line,MAX_STRING_LEN,f))) { + if(found || (line[0] == '#') || (!line[0])) { + putline(tfp,line); + continue; diff --git a/package/mini_sendmail/Makefile b/package/mini_sendmail/Makefile index a091df078..0724048bd 100644 --- a/package/mini_sendmail/Makefile +++ b/package/mini_sendmail/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/miredo/Makefile b/package/miredo/Makefile index 90161bd97..23e284270 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 1ef2368b0..5ef85559f 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/moc/Makefile b/package/moc/Makefile index 021271303..994ced6c6 100644 --- a/package/moc/Makefile +++ b/package/moc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/monit/Makefile b/package/monit/Makefile index 68ef0e683..86859645d 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/motion/Makefile b/package/motion/Makefile index 5253297cd..80f70edc0 100644 --- a/package/motion/Makefile +++ b/package/motion/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 4b943e484..ba51f04f4 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile index 5d1c86f47..6c95863b3 100644 --- a/package/mpfr/Makefile +++ b/package/mpfr/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in index a1f1b676b..5dca1eb2f 100644 --- a/package/mplayer/Config.in +++ b/package/mplayer/Config.in @@ -2,6 +2,8 @@ config ADK_PACKAGE_MPLAYER prompt "mplayer........................... popular movie player" tristate default n + select ADK_PACKAGE_LIBJPEG + select ADK_PACKAGE_LIBPNG select ADK_PACKAGE_LIBPTHREAD select ADK_PACKAGE_LIBOGG select ADK_PACKAGE_LIBVORBIS diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index b3a908e8b..0c330a792 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -11,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 7e27e535c2d267637df34898f1b91707 PKG_DESCR:= popular video player PKG_SECTION:= video -PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread +PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg PKG_URL:= http://www.mplayerhq.hu PKG_SITES:= http://www7.mplayerhq.hu/MPlayer/releases/ @@ -25,6 +23,32 @@ $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P BUILD_STYLE:= auto INSTALL_STYLE:= auto +ifeq ($(ADK_X11),y) +CONFIGURE_ARG:= --enable-x11 +else +CONFIGURE_ARG:= --disable-x11 +endif + +ifeq (${ADK_LINUX_X86_ALIX1C},y) +CONFIGURE_CPU_OPTS:= \ + --disable-ssse3 \ + --disable-sse2 \ + --disable-sse \ + --enable-mmxext \ + --enable-3dnowext \ + --enable-mmx \ + --enable-3dnow +else +CONFIGURE_CPU_OPTS:= \ + --disable-ssse3 \ + --disable-sse2 \ + --disable-sse \ + --disable-mmxext \ + --disable-3dnowext \ + --disable-mmx \ + --disable-3dnow +endif + pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ ./configure \ @@ -36,16 +60,11 @@ pre-configure: --host-cc=$(HOSTCC) \ --with-extraincdir=$(STAGING_DIR)/usr/include \ --with-extralibdir=$(STAGING_DIR)/usr/lib \ - --disable-ssse3 \ - --disable-sse2 \ - --disable-sse \ - --enable-mmxext \ - --enable-3dnowext \ - --enable-mmx \ - --enable-3dnow \ --disable-mencoder \ --enable-fbdev \ --enable-alsa \ + --enable-png \ + --enable-jpeg \ --enable-mad \ --enable-faad-external \ --disable-faad-internal \ @@ -62,7 +81,7 @@ pre-configure: --disable-ftp \ --disable-v4l2 \ --disable-ivtv \ - --enable-vidix-internal \ + --disable-vidix-internal \ --disable-dvdread-internal \ --disable-libdvdcss-internal \ --disable-freetype \ @@ -79,7 +98,9 @@ pre-configure: --disable-tga \ --disable-pnm \ --disable-md5sum \ - --disable-x11 \ + --disable-liblzo \ + ${CONFIGURE_CPU_OPTS} \ + ${CONFIGURE_ARG} \ ); diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 4cac9e588..537800ffb 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mrd6/patches/patch-src_bgp_bgp_cpp b/package/mrd6/patches/patch-src_bgp_bgp_cpp new file mode 100644 index 000000000..ac83dc5a4 --- /dev/null +++ b/package/mrd6/patches/patch-src_bgp_bgp_cpp @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- mrd6-0.9.6.orig/src/bgp/bgp.cpp 2008-01-25 11:44:46.000000000 +0100 ++++ mrd6-0.9.6/src/bgp/bgp.cpp 2009-06-01 22:57:15.000000000 +0200 +@@ -29,6 +29,7 @@ + + #include <mrdpriv/bgp/def.h> + ++#include <limits.h> + #include <sys/ioctl.h> + #include <sys/socket.h> + #include <sys/times.h> /* times */ diff --git a/package/mrd6/patches/patch-src_mrd_cpp b/package/mrd6/patches/patch-src_mrd_cpp new file mode 100644 index 000000000..cb2e1dceb --- /dev/null +++ b/package/mrd6/patches/patch-src_mrd_cpp @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- mrd6-0.9.6.orig/src/mrd.cpp 2008-01-24 11:59:47.000000000 +0100 ++++ mrd6-0.9.6/src/mrd.cpp 2009-06-01 22:55:38.000000000 +0200 +@@ -45,6 +45,7 @@ + #include <cstdlib> + #include <errno.h> + ++#include <limits.h> + #include <unistd.h> + #include <fcntl.h> + diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile index 8280a958d..b42b26654 100644 --- a/package/mt-daapd/Makefile +++ b/package/mt-daapd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mtr/Makefile b/package/mtr/Makefile index 87afd18d9..a53f2ee8d 100644 --- a/package/mtr/Makefile +++ b/package/mtr/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mutt/Makefile b/package/mutt/Makefile index 7b6137104..4a5673dd9 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/mysql/Makefile b/package/mysql/Makefile index 32662ec4c..f0951d29f 100644 --- a/package/mysql/Makefile +++ b/package/mysql/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/nano/Makefile b/package/nano/Makefile index 65baf4f69..455bc7972 100644 --- a/package/nano/Makefile +++ b/package/nano/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index e9bb8bf12..06f2ef055 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile index 8a378af46..4cdefc38e 100644 --- a/package/ndisc/Makefile +++ b/package/ndisc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/neon/Makefile b/package/neon/Makefile index 947390d65..e0d6c88d8 100644 --- a/package/neon/Makefile +++ b/package/neon/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 32c2c755a..1fca35b41 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/netperf/Makefile b/package/netperf/Makefile index 4bf5c123c..fbec25d18 100644 --- a/package/netperf/Makefile +++ b/package/netperf/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/netperf/patches/patch-src_netlib_c b/package/netperf/patches/patch-src_netlib_c new file mode 100644 index 000000000..688054fde --- /dev/null +++ b/package/netperf/patches/patch-src_netlib_c @@ -0,0 +1,17 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- netperf-2.4.3.orig/src/netlib.c 2007-02-15 01:12:35.000000000 +0100 ++++ netperf-2.4.3/src/netlib.c 2009-06-01 23:36:22.000000000 +0200 +@@ -1900,8 +1900,13 @@ bind_to_specific_processor(int processor + + #if defined(__CPU_SETSIZE) + #define NETPERF_CPU_SETSIZE __CPU_SETSIZE ++#if defined(__CPU_SET_S) ++#define NETPERF_CPU_SET(cpu, cpusetp) __CPU_SET_S(cpu, sizeof (cpu_set_t), cpusetp) ++#define NETPERF_CPU_ZERO(cpusetp) __CPU_ZERO_S (sizeof (cpu_set_t), cpusetp) ++#else + #define NETPERF_CPU_SET(cpu, cpusetp) __CPU_SET(cpu, cpusetp) + #define NETPERF_CPU_ZERO(cpusetp) __CPU_ZERO (cpusetp) ++#endif + typedef cpu_set_t netperf_cpu_set_t; + #else + #define NETPERF_CPU_SETSIZE sizeof(unsigned long) diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile index 9a32909b8..2f1ee958f 100644 --- a/package/netstat-nat/Makefile +++ b/package/netstat-nat/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index e52cdb38e..fbb64d057 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/nmap/Makefile b/package/nmap/Makefile index a1f69228b..5e4222551 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile index 492e4a6dd..c50a8bab1 100644 --- a/package/ntfs-3g/Makefile +++ b/package/ntfs-3g/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile index ef0f62022..12187c7b9 100644 --- a/package/ntpclient/Makefile +++ b/package/ntpclient/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/nut/Config.in b/package/nut/Config.in index 2da404567..9539f8a03 100644 --- a/package/nut/Config.in +++ b/package/nut/Config.in @@ -78,26 +78,11 @@ config ADK_PACKAGE_NUT_DRIVER_BESTUFERRUPS boolean default n -config ADK_PACKAGE_NUT_DRIVER_BLAZER - prompt "blazer............................ Driver for Blazer UPS models" - boolean - default n - -config ADK_PACKAGE_NUT_DRIVER_CPSUPS - prompt "cpsups............................ Driver for CyberPower text protocol UPS" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_CYBERPOWER prompt "cyberpower........................ Driver for Cyber Power Systems" boolean default n -config ADK_PACKAGE_NUT_DRIVER_ESUPSSMART - prompt "esupssmart........................ Driver for ES UPS" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_ETAPRO prompt "etapro............................ Driver for ETA UPS" boolean @@ -108,11 +93,6 @@ config ADK_PACKAGE_NUT_DRIVER_EVERUPS boolean default n -config ADK_PACKAGE_NUT_DRIVER_FENTONUPS - prompt "fentonups......................... Driver for Fenton Technologies units" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_GAMATRONIC prompt "gamatronic........................ Driver for Gamatronic UPS" boolean @@ -123,11 +103,6 @@ config ADK_PACKAGE_NUT_DRIVER_GENERICUPS boolean default n -config ADK_PACKAGE_NUT_DRIVER_IPPON - prompt "ippon............................. Driver for Ippon UPS devices" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_ISBMEX prompt "isbmex............................ Driver for SOLA/BASIC Mexico models" boolean @@ -158,11 +133,6 @@ config ADK_PACKAGE_NUT_DRIVER_MGE_UTALK boolean default n -config ADK_PACKAGE_NUT_DRIVER_MUSTEK - prompt "mustek............................ Driver for Mustek UPS models" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_ONEAC prompt "oneac............................. Driver for UPS using the Oneac Advanced Interface" boolean @@ -185,6 +155,12 @@ config ADK_PACKAGE_NUT_DRIVER_POWERMUST prompt "powermust......................... Driver for Powermust" boolean default n + +config ADK_PACKAGE_NUT_DRIVER_POWERPANEL + prompt "powerpanel........................ Driver for Powerpanel units" + boolean + default n + help config ADK_PACKAGE_NUT_DRIVER_RHINO prompt "rhino............................. Driver for Microsol Rhino UPS" @@ -206,11 +182,6 @@ config ADK_PACKAGE_NUT_DRIVER_SAFENET * - Sweex 500/1000 * - others using SafeNet software and serial interface -config ADK_PACKAGE_NUT_DRIVER_SMS - prompt "sms............................... Driver for SMS UPS hardware" - boolean - default n - config ADK_PACKAGE_NUT_DRIVER_SOLIS prompt "solis............................. Driver for Microsol Solis UPS" boolean diff --git a/package/nut/Makefile b/package/nut/Makefile index 2bf1c12f8..d7eeb7b8c 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -38,12 +36,12 @@ endef DRIVERS_y:= $(eval $(call DRIVER_template,BESTUPS,bestups)) -$(eval $(call DRIVER_template,FENTONUPS,fentonups)) $(eval $(call DRIVER_template,APCSMART,apcsmart)) $(eval $(call DRIVER_template,EVERUPS,everups)) $(eval $(call DRIVER_template,BELKIN,belkin)) $(eval $(call DRIVER_template,MASTERGUARD,masterguard)) $(eval $(call DRIVER_template,POWERCOM,powercom)) +$(eval $(call DRIVER_template,POWERPANEL,powerpanel)) $(eval $(call DRIVER_template,CYBERPOWER,cyberpower)) $(eval $(call DRIVER_template,TRIPPLITE,tripplite)) $(eval $(call DRIVER_template,VICTRONUPS,victronups)) @@ -53,16 +51,10 @@ $(eval $(call DRIVER_template,BESTUFERRUPS,bestuferrups)) $(eval $(call DRIVER_template,ISBMEX,isbmex)) $(eval $(call DRIVER_template,ETAPRO,etapro)) $(eval $(call DRIVER_template,LIEBERT,liebert)) -$(eval $(call DRIVER_template,SMS,sms)) -$(eval $(call DRIVER_template,ESUPSSMART,esupssmart)) $(eval $(call DRIVER_template,TRIPPLITESU,tripplitesu)) -$(eval $(call DRIVER_template,BLAZER,blazer)) $(eval $(call DRIVER_template,SAFENET,safenet)) $(eval $(call DRIVER_template,BELKINUNV,belkinunv)) $(eval $(call DRIVER_template,ONEAC,oneac)) -$(eval $(call DRIVER_template,IPPON,ippon)) -$(eval $(call DRIVER_template,CPSUPS,cpsups)) -$(eval $(call DRIVER_template,MUSTEK,mustek)) $(eval $(call DRIVER_template,METASYS,metasys)) $(eval $(call DRIVER_template,BESTFCOM,bestfcom)) $(eval $(call DRIVER_template,UPSCODE2,upscode2)) @@ -75,7 +67,7 @@ CONFIG_DRIVERS=$(shell echo ${DRIVERS_y} | tr ' ' ',') INSTALL_DRIVERS_tmp=${DRIVERS_y} ifneq (${ADK_PACKAGE_NUT_USB},) -INSTALL_DRIVERS_tmp+= hidups energizerups newhidups tripplite_usb +INSTALL_DRIVERS_tmp+= usbhid-ups tripplite_usb endif ifneq (${ADK_PACKAGE_NUT_SNMP},) INSTALL_DRIVERS_tmp+= snmp-ups @@ -86,8 +78,8 @@ CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \ --without-cgi \ --with-drivers=${INSTALL_DRIVERS} \ - --with-group=root \ - --with-user=root + --with-group=0 \ + --with-user=0 ifneq (${ADK_PACKAGE_NUT_SSL},) CONFIGURE_ARGS+= --with-ssl @@ -108,7 +100,7 @@ INSTALL_TARGET+= install-snmp endif post-install: - ${INSTALL_DIR} ${IDIR_NUT}/usr/{s,}bin + ${INSTALL_DIR} ${IDIR_NUT}/usr/{s,}bin ${IDIR_NUT}/etc ${INSTALL_BIN} ${WRKINST}/usr/sbin/ups{d,mon,sched} \ ${IDIR_NUT}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/{${INSTALL_DRIVERS}} \ diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index 1cac5d270..cfa72a988 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index c45b72fc5..e730f51bc 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile index f6492e4b7..844f800a7 100644 --- a/package/opencdk/Makefile +++ b/package/opencdk/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/openct/Makefile b/package/openct/Makefile index c561727b3..0a53477be 100644 --- a/package/openct/Makefile +++ b/package/openct/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/openldap/Makefile b/package/openldap/Makefile index a42da2b16..988dc61ca 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile index 96c425866..f341614d1 100644 --- a/package/openntpd/Makefile +++ b/package/openntpd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/openobex/Makefile b/package/openobex/Makefile index 25cebd71a..41dfb4f6d 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 2c742ca95..cac67d7c7 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/opensips/Makefile b/package/opensips/Makefile index 45491e7b8..db6d4b69d 100644 --- a/package/opensips/Makefile +++ b/package/opensips/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/opensips/files/opensips.cfg b/package/opensips/files/opensips.cfg index 3b5d4d42e..e94262ebe 100644 --- a/package/opensips/files/opensips.cfg +++ b/package/opensips/files/opensips.cfg @@ -1,5 +1,4 @@ # -# $Id: openser.cfg 1827 2007-03-12 15:22:53Z bogdan_iancu $ # # simple quick-start config script # Please refer to the Core CookBook at http://www.openser.org/dokuwiki/doku.php diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 45ea785f4..6a6dfa380 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile index 283fa911c..9e3054c4a 100644 --- a/package/openssl-pkcs11/Makefile +++ b/package/openssl-pkcs11/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/openssl/Makefile b/package/openssl/Makefile index bc5a9a2f2..d17dd6163 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 7fea6fdd9..fef0c8c16 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index b18303d75..c88869999 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 4688dedf7..6b8b720a4 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/osiris/Makefile b/package/osiris/Makefile index e7d8504e9..97f1e9d52 100644 --- a/package/osiris/Makefile +++ b/package/osiris/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/owfs/Makefile b/package/owfs/Makefile index 23579266d..9be07eabb 100644 --- a/package/owfs/Makefile +++ b/package/owfs/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile index 6e990a7c2..bbf315e2f 100644 --- a/package/p910nd/Makefile +++ b/package/p910nd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/palantir/Makefile b/package/palantir/Makefile index 986954309..e87cb295c 100644 --- a/package/palantir/Makefile +++ b/package/palantir/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/parprouted/Makefile b/package/parprouted/Makefile index ee596b393..d1200520a 100644 --- a/package/parprouted/Makefile +++ b/package/parprouted/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index bd5da3cba..d6530bc1c 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/pcre/Makefile b/package/pcre/Makefile index e6876a1f1..a2324d4f6 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/php/Makefile b/package/php/Makefile index 6e3ded395..cd5ecf48c 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/picocom/Makefile b/package/picocom/Makefile index d8a9e17ea..2b7fe906f 100644 --- a/package/picocom/Makefile +++ b/package/picocom/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile index 44bf8e656..95379106f 100644 --- a/package/pipacs/Makefile +++ b/package/pipacs/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/pipacs/src/Makefile b/package/pipacs/src/Makefile index a9a88059d..3a48e88f7 100644 --- a/package/pipacs/src/Makefile +++ b/package/pipacs/src/Makefile @@ -1,4 +1,3 @@ -# $Id$ EXTRA_CFLAGS := -c -I. PIPACS_OBJS := pipacs.o parser.o diff --git a/package/pixman/Makefile b/package/pixman/Makefile index 3eccea865..f25739f67 100644 --- a/package/pixman/Makefile +++ b/package/pixman/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index bd300dd9e..c57e9008a 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/popt/Makefile b/package/popt/Makefile index c58c59cb2..0aa970c08 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -7,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= popt PKG_VERSION:= 1.15 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c61ef795fa450eb692602a661ec8d7f1 PKG_DESCR:= a command line option parsing library PKG_SECTION:= libs @@ -19,6 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu +CONFIGURE_ENV+= am_cv_func_iconv=no BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/portmap/Makefile b/package/portmap/Makefile index e4eba9d32..a1864a135 100644 --- a/package/portmap/Makefile +++ b/package/portmap/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile index 459298b3f..351438d72 100644 --- a/package/portsentry/Makefile +++ b/package/portsentry/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index 05929cbbd..fa676f312 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ppp/Makefile b/package/ppp/Makefile index e24dcdd2c..4cf657ed3 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 8c892d1d8..18de2b04e 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index b47443718..0a5a10b87 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile index 2bc7ab4b3..8da620254 100644 --- a/package/privoxy/Makefile +++ b/package/privoxy/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/procmail/Makefile b/package/procmail/Makefile index fcb6f214b..b03828a3c 100644 --- a/package/procmail/Makefile +++ b/package/procmail/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/procmail/patches/patch-src_fields_c b/package/procmail/patches/patch-src_fields_c new file mode 100644 index 000000000..73586c79b --- /dev/null +++ b/package/procmail/patches/patch-src_fields_c @@ -0,0 +1,23 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- procmail-3.22.orig/src/fields.c 2001-09-11 06:57:08.000000000 +0200 ++++ procmail-3.22/src/fields.c 2009-06-02 00:23:11.000000000 +0200 +@@ -110,16 +110,16 @@ void dispfield(p)register const struct f + /* try and append one valid field to rdheader from stdin */ + int readhead P((void)) + { int idlen; +- getline(); ++ getline2(); + if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */ + return 0; + if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */ + { if(rdheader) + return 0; /* the From_ line was a fake! */ +- for(;buflast=='>';getline()); /* gather continued >From_ lines */ ++ for(;buflast=='>';getline2()); /* gather continued >From_ lines */ + } + else +- for(;;getline()) /* get the rest of the continued field */ ++ for(;;getline2()) /* get the rest of the continued field */ + { switch(buflast) /* will this line be continued? */ + { case ' ':case '\t': /* yep, it sure is */ + continue; diff --git a/package/procmail/patches/patch-src_formail_c b/package/procmail/patches/patch-src_formail_c new file mode 100644 index 000000000..6fe45ab53 --- /dev/null +++ b/package/procmail/patches/patch-src_formail_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- procmail-3.22.orig/src/formail.c 2001-09-11 06:57:32.000000000 +0200 ++++ procmail-3.22/src/formail.c 2009-06-02 00:22:47.000000000 +0200 +@@ -819,7 +819,7 @@ splitit: { if(!lnl) /* did the p + { if(split) /* gobble up the next start separator */ + { buffilled=0; + #ifdef sMAILBOX_SEPARATOR +- getline();buffilled=0; /* but only if it's defined */ ++ getline2();buffilled=0; /* but only if it's defined */ + #endif + if(buflast!=EOF) /* if any */ + goto splitit; diff --git a/package/procmail/patches/patch-src_formisc_c b/package/procmail/patches/patch-src_formisc_c new file mode 100644 index 000000000..c77cf94c2 --- /dev/null +++ b/package/procmail/patches/patch-src_formisc_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- procmail-3.22.orig/src/formisc.c 2001-06-29 04:20:45.000000000 +0200 ++++ procmail-3.22/src/formisc.c 2009-06-02 00:23:57.000000000 +0200 +@@ -115,7 +115,7 @@ void loadchar(c)const int c; /* a + buf[buffilled++]=c; + } + +-int getline P((void)) /* read a newline-terminated line */ ++int getline2 P((void)) /* read a newline-terminated line */ + { if(buflast==EOF) /* at the end of our Latin already? */ + { loadchar('\n'); /* fake empty line */ + return EOF; /* spread the word */ diff --git a/package/procmail/patches/patch-src_formisc_h b/package/procmail/patches/patch-src_formisc_h new file mode 100644 index 000000000..9ee95d928 --- /dev/null +++ b/package/procmail/patches/patch-src_formisc_h @@ -0,0 +1,9 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- procmail-3.22.orig/src/formisc.h 1999-04-19 08:42:15.000000000 +0200 ++++ procmail-3.22/src/formisc.h 2009-06-02 00:22:16.000000000 +0200 +@@ -17,4 +17,4 @@ void + char* + skipwords P((char*start)); + int +- getline P((void)); ++ getline2 P((void)); diff --git a/package/procps/Makefile b/package/procps/Makefile index a57e034fe..3839b3133 100644 --- a/package/procps/Makefile +++ b/package/procps/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile index 0888dcf96..dab849974 100644 --- a/package/ptunnel/Makefile +++ b/package/ptunnel/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/quagga/Makefile b/package/quagga/Makefile index 6ac348331..02b8b0347 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/raddump/Makefile b/package/raddump/Makefile index 8031ece50..28c84e709 100755 --- a/package/raddump/Makefile +++ b/package/raddump/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/radiusclient-ng/Config.in b/package/radiusclient-ng/Config.in deleted file mode 100644 index 4e37c02da..000000000 --- a/package/radiusclient-ng/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config ADK_COMPILE_RADIUSCLIENT_NG - tristate - default n - depends ADK_PACKAGE_LIBRADIUSCLIENT_NG - -config ADK_PACKAGE_RADIUSCLIENT_NG - prompt "radiusclient-ng................... RADIUS client" - tristate - default n - select ADK_PACKAGE_LIBOPENSSL - select ADK_PACKAGE_LIBRADIUSCLIENT_NG - help - Purpose of this project is to build portable, easy-to-use and standard compliant - library suitable for developing free and commercial software that need support - for a RADIUS protocol (RFCs 2128 and 2139). - - http://developer.berlios.de/projects/radiusclient-ng/ - - Depends: libopenssl - -config ADK_PACKAGE_LIBRADIUSCLIENT_NG - prompt "libradiusclient-ng................ RADIUS client library" - tristate - default n - select ADK_COMPILE_RADIUSCLIENT_NG - help - Developpment library from radiusclient-ng diff --git a/package/radiusclient-ng/Makefile b/package/radiusclient-ng/Makefile deleted file mode 100644 index 610b006ed..000000000 --- a/package/radiusclient-ng/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# $Id$ -#- -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= radiusclient-ng -PKG_VERSION:= 0.5.6 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 6fb7d4d0aefafaee7385831ac46a8e9c -PKG_DESCR:= RADIUS client -PKG_SECTION:= net -PKG_DEPENDS:= libopenssl -PKG_SITES:= http://download.berlios.de/radiusclient-ng/ \ - http://download2.berlios.de/radiusclient-ng/ - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,RADIUSCLIENT_NG,radiusclient-ng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBRADIUSCLIENT_NG,libradiusclient-ng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_STYLE:= gnu -CONFIGURE_ARGS+= ac_cv_func_getdomainname=yes -BUILD_STYLE:= auto -ALL_TARGET:= install-exec install-data -MAKE_FLAGS+= DESTDIR="${WRKINST}" - -do-install: - ${INSTALL_DIR} ${IDIR_RADIUSCLIENT_NG}/usr - ${CP} ${WRKINST}/usr/sbin ${IDIR_RADIUSCLIENT_NG}/usr/ - ${CP} ${WRKINST}/etc ${IDIR_RADIUSCLIENT_NG}/ - ${INSTALL_DIR} ${IDIR_LIBRADIUSCLIENT_NG}/usr - ${CP} ${WRKINST}/usr/lib ${IDIR_LIBRADIUSCLIENT_NG}/usr/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/radiusclient-ng/patches/01-cross_compile.patch b/package/radiusclient-ng/patches/01-cross_compile.patch deleted file mode 100644 index 3c4e3d192..000000000 --- a/package/radiusclient-ng/patches/01-cross_compile.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur radiusclient-ng-0.5.5.orig/configure radiusclient-ng-0.5.5/configure ---- radiusclient-ng-0.5.5.orig/configure 2007-02-05 13:53:08.000000000 +0100 -+++ radiusclient-ng-0.5.5/configure 2007-03-05 10:36:37.000000000 +0100 -@@ -23332,8 +23332,7 @@ - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+See \`config.log' for more details." >&2;} } - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ diff --git a/package/radvd/Makefile b/package/radvd/Makefile index 89f46e94f..e2d7ab460 100644 --- a/package/radvd/Makefile +++ b/package/radvd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile index fe2cc6a63..13ff30a01 100644 --- a/package/randrproto/Makefile +++ b/package/randrproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile index 9158c3f9b..0121f933c 100644 --- a/package/rarpd/Makefile +++ b/package/rarpd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/rdate/Makefile b/package/rdate/Makefile index 39d74f6bf..f35a8e851 100644 --- a/package/rdate/Makefile +++ b/package/rdate/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/rdate/rdate.init b/package/rdate/rdate.init index 88bf464b9..988028f59 100644 --- a/package/rdate/rdate.init +++ b/package/rdate/rdate.init @@ -1,15 +1,13 @@ -#!/bin/mksh -#FWINIT 54 -# It’s important that this is lower than openntpd’s FWinit number +#!/bin/sh +#PKG rdate +#INIT 54 + . /etc/rc.conf + case $1 in autostart|start|restart) - if [[ $(ls -l /usr/sbin/rdate) != *ucb* ]]; then - rm -f /usr/sbin/rdate - ln -s ../ucb/rdate /usr/sbin/rdate - fi [[ $rdate_flags = NO ]] && exit 0 - /usr/ucb/rdate $rdate_flags + rdate $rdate_flags ;; autostop|stop) ;; diff --git a/package/readline/Makefile b/package/readline/Makefile index bdc05960e..a9d81fa1e 100644 --- a/package/readline/Makefile +++ b/package/readline/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/reaim/Makefile b/package/reaim/Makefile index 77d09db0e..7b55eeed4 100644 --- a/package/reaim/Makefile +++ b/package/reaim/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/reaim/patches/501-cross_compile-install.patch b/package/reaim/patches/501-cross_compile-install.patch index 9e88f617e..db33bf6c3 100644 --- a/package/reaim/patches/501-cross_compile-install.patch +++ b/package/reaim/patches/501-cross_compile-install.patch @@ -1,7 +1,7 @@ diff -urN reaim-0.8/Makefile reaim-0.8/Makefile ---- reaim-0.8/Makefile 2002-11-28 06:10:38.000000000 +0100 -+++ reaim-0.8/Makefile 2005-10-07 12:07:43.000000000 +0200 -@@ -11,7 +11,10 @@ +--- reaim-0.8.orig/Makefile 2002-11-28 06:10:38.000000000 +0100 ++++ reaim-0.8/Makefile 2009-06-02 00:30:32.000000000 +0200 +@@ -11,7 +11,10 @@ FW_FLAGS="-DUSE_IPF" endif reaim: reaim.c diff --git a/package/reaim/patches/patch-reaim_c b/package/reaim/patches/patch-reaim_c new file mode 100644 index 000000000..7f208061e --- /dev/null +++ b/package/reaim/patches/patch-reaim_c @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- reaim-0.8.orig/reaim.c 2003-03-25 13:35:31.000000000 +0100 ++++ reaim-0.8/reaim.c 2009-06-02 00:30:51.000000000 +0200 +@@ -190,6 +190,7 @@ + #include <netdb.h> + #include <time.h> + #include <ctype.h> ++#include <limits.h> + + #include <getopt.h> + #include <sys/ioctl.h> diff --git a/package/renderproto/Makefile b/package/renderproto/Makefile index 498e29dcc..cdf37cf11 100644 --- a/package/renderproto/Makefile +++ b/package/renderproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/resourceproto/Makefile b/package/resourceproto/Makefile index a81948d9b..f53312ebf 100644 --- a/package/resourceproto/Makefile +++ b/package/resourceproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile index bdb69a492..c79f76869 100644 --- a/package/rp-pppoe/Makefile +++ b/package/rp-pppoe/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile index ee6228092..cc711c505 100644 --- a/package/rrdcollect/Makefile +++ b/package/rrdcollect/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index 6903ef045..e1c09b1e5 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/rrs/Makefile b/package/rrs/Makefile index 9404034f4..b4c0df6db 100644 --- a/package/rrs/Makefile +++ b/package/rrs/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 99c1d9743..013bffe81 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index 1b6723f86..dc3ee50a2 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ruby/Makefile b/package/ruby/Makefile index 76d35b1ee..10ac8285b 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -33,9 +31,8 @@ post-configure: echo "socket" >> ${WRKBUILD}/ext/Setup post-install: - ${INSTALL_DIR} ${IDIR_RUBY}/usr rm -rf ${WRKINST}/usr/lib/site_ruby find ${WRKINST}/usr -name "*.h" -delete - ${CP} ${WRKINST}/usr ${IDIR_RUBY}/usr + ${CP} ${WRKINST}/usr ${IDIR_RUBY}/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/samba/Makefile b/package/samba/Makefile index 0b2897e31..bbc50cc18 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index 7f5e28958..dcfb9b60d 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile index 1b7db8704..f0b66541d 100644 --- a/package/scanlogd/Makefile +++ b/package/scanlogd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/scdp/Makefile b/package/scdp/Makefile index e89fd88db..24629ecb0 100644 --- a/package/scdp/Makefile +++ b/package/scdp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/screen/Makefile b/package/screen/Makefile index ec298f437..5ce7ed6e4 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/scrnsaverproto/Makefile b/package/scrnsaverproto/Makefile index 0b67063d4..8a0eade8a 100644 --- a/package/scrnsaverproto/Makefile +++ b/package/scrnsaverproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/scsi-spin/Makefile b/package/scsi-spin/Makefile index 5f5e84ead..f8a551b9b 100644 --- a/package/scsi-spin/Makefile +++ b/package/scsi-spin/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ser2net/Makefile b/package/ser2net/Makefile index 543f1b2f1..33041b28f 100644 --- a/package/ser2net/Makefile +++ b/package/ser2net/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile index 903ac2204..9dbf0356c 100644 --- a/package/serdisplib/Makefile +++ b/package/serdisplib/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile index 2a9af67e7..12e685bd5 100644 --- a/package/setpwc/Makefile +++ b/package/setpwc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/setserial/Makefile b/package/setserial/Makefile index 95be6da82..47e179329 100644 --- a/package/setserial/Makefile +++ b/package/setserial/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/shat/Makefile b/package/shat/Makefile index a25533dc9..b9ab7096a 100644 --- a/package/shat/Makefile +++ b/package/shat/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile index 230d6e56d..44ddbfffe 100644 --- a/package/shorewall-common/Makefile +++ b/package/shorewall-common/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/shorewall-shell/Makefile b/package/shorewall-shell/Makefile index 54611e247..c5d1bfb0c 100644 --- a/package/shorewall-shell/Makefile +++ b/package/shorewall-shell/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile index f2fe5c3f2..d04603641 100644 --- a/package/siproxd/Makefile +++ b/package/siproxd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 00c9be071..089cb6afe 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile index 7ae648c16..ad6c7ee93 100644 --- a/package/sispmctl/Makefile +++ b/package/sispmctl/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/snort-wireless/Makefile b/package/snort-wireless/Makefile index 542898b0f..829b9410f 100644 --- a/package/snort-wireless/Makefile +++ b/package/snort-wireless/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/snort/Makefile b/package/snort/Makefile index 081229029..d57a6c555 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/socat/Makefile b/package/socat/Makefile index d0e18af7c..ab6d5c059 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/speex/Makefile b/package/speex/Makefile index d36189df2..56dfb2d14 100644 --- a/package/speex/Makefile +++ b/package/speex/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index 8f5ff918f..225c7e78a 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/squid/Config.in b/package/squid/Config.in index 47c1250b4..bdace2a49 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,9 +1,9 @@ -#menu "squid............................. proxy and web cache" config ADK_PACKAGE_SQUID prompt "squid............................. full-featured Web proxy cache" tristate default n + depends ADK_CXX select ADK_PACKAGE_LIBOPENSSL help Squid is a high-performance proxy caching server for web clients, @@ -13,6 +13,8 @@ config ADK_PACKAGE_SQUID http://www.squid-cache.org +menu "squid............................. proxy and web cache modules" + config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM prompt " squid-mod-basic-auth-getpwnam....... getpwnam basic authentication helper" tristate @@ -34,13 +36,6 @@ config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB help Samba basic authentication helper -config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_WINBIND - prompt " squid-mod-basic-auth-winbind........ Winbind basic authentication helper" - tristate - depends ADK_PACKAGE_SQUID - help - Winbind basic authentication helper - config ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD prompt " squid-mod-digest-auth-password...... Password digest authentication ehlper" tristate @@ -62,13 +57,6 @@ config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP help Unix group external ACL helper -config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP - prompt " squid-mod-external-acl-winbind-group Winbind group external ACL helper" - tristate - depends ADK_PACKAGE_SQUID - help - Winbind group external ACL helper - config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH prompt " squid-mod-ntlm-auth-fakeauth........ Fakeauth NTLM authentication helper" tristate @@ -83,11 +71,4 @@ config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH help Samba NTLM authentication helper -config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_WINBIND_AUTH - prompt " squid-mod-ntlm-auth-winbind-auth.... Winbind NTLM authentication helper" - tristate - depends ADK_PACKAGE_SQUID - help - Winbind NTLM authentication helper - -#endmenu +endmenu diff --git a/package/squid/Makefile b/package/squid/Makefile index c16cdd219..2a63e19f8 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -1,23 +1,19 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. include ${TOPDIR}/rules.mk PKG_NAME:= squid -PKG_VERSION:= 2.5.STABLE13 +PKG_VERSION:= 3.0.STABLE15 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3e64468e123be1246d17486dab6bee87 +PKG_MD5SUM:= 4c41585af1d90ccbcf1d23ec0dda6f8d PKG_DESCR:= squid web and cache proxy PKG_SECTION:= net PKG_DEPENDS:= libopenssl libpthread PKG_URL:= http://www.squid-cache.org -PKG_SITES:= http://www.squid-cache.org/Versions/v2/2.5/ +PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.0/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - -AUTH_MODULES:=basic digest ntlm +AUTH_MODULES:= basic digest ntlm ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},) BASIC_AUTH_HELPERS+= getpwnam endif @@ -27,80 +23,56 @@ endif ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB},) BASIC_AUTH_HELPERS+= SMB endif -ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_WINBIND},) -BASIC_AUTH_HELPERS+= winbind -endif - ifneq (${ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD},) DIGEST_AUTH_HELPERS:= password endif - ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER},) EXTERNAL_ACL_HELPERS+= ip_user endif ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP},) EXTERNAL_ACL_HELPERS+= unix_group endif -ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP},) -EXTERNAL_ACL_HELPERS+= winbind_group -endif - ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH},) NTLM_AUTH_HELPERS+= fakeauth endif ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH},) NTLM_AUTH_HELPERS+= SMB endif -ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_WINBIND_AUTH},) -NTLM_AUTH_HELPERS+= winbind -endif include ${TOPDIR}/mk/package.mk define PKG_mod_template -if [ -e ${WRKINST}/usr/lib/squid/${2} ]; then \ - ${INSTALL_DIR} ${IDIR_${1}}/usr/lib/squid/ ; \ - ${INSTALL_BIN} ${WRKINST}/usr/lib/squid/${2} ${IDIR_${1}}/usr/lib/squid/ ; \ -fi -endef -#$${IPKG_${1}}: -# install -d -m0755 $${IDIR_${1}}/usr/lib/squid -# if [ -e ${WRKINST}/usr/lib/squid/${2} ]; then \ -# ${CP} ${WRKINST}/usr/lib/squid/${2} $${IDIR_${1}}/usr/lib/squid/ ; \ -# fi -# ${RSTRIP} $${IDIR_${1}} -# ${IPKG_BUILD} $${IDIR_${1}} ${PACKAGE_DIR} -# -#endef +INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install +${2}-install: + if [ -e ${WRKINST}/usr/lib/squid/${2} ]; then \ + ${INSTALL_DIR} ${IDIR_${1}}/usr/lib/squid/ ; \ + ${INSTALL_BIN} ${WRKINST}/usr/lib/squid/${2} ${IDIR_${1}}/usr/lib/squid/ ; \ + + fi +endef $(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_WINBIND,${PKG_NAME}-mod-basic-auth-winbind,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,${PKG_NAME}-mod-external-acl-winbind-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,${PKG_NAME}-mod-ntlm-auth-smb-auth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,${PKG_NAME}-mod-ntlm-auth-winbind-auth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth}} -#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap}} -#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth}} -#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth}} -#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_WINBIND,wb_auth}} -#${eval ${call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth}} -#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check}} -#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth}} -#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group}} -#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,wb_group}} -#${eval ${call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth}} -#${eval ${call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth}} -#${eval ${call PKG_mod_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,wb_ntlmauth}} +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap)) +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check)) +$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group)) +$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth)) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ @@ -120,11 +92,12 @@ CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ ac_cv_sizeof_u_int64_t=8 \ ac_cv_func_setresuid=no \ ac_cv_func_va_copy=no \ - ac_cv_func___va_copy=no + ac_cv_func___va_copy=no \ + ac_cv_epoll_works=yes \ + ac_cv_func_strnstr=no CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --libexecdir=/usr/lib/squid \ --sysconfdir=/etc/squid \ - --enable-static \ --with-gnu-ld \ --enable-x-accelerator-vary \ --with-pthreads \ @@ -134,6 +107,7 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --enable-arp-acl \ --enable-ssl \ --enable-htcp \ + --disable-esi \ --enable-err-languages=English \ --enable-default-err-language=English \ --enable-linux-netfilter \ @@ -153,7 +127,7 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \ BUILD_STYLE:= auto INSTALL_STYLE:= auto -post-install: +post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_SQUID}/etc/squid ${INSTALL_DATA} ${WRKINST}/etc/squid/mime.conf \ ${WRKINST}/etc/squid/squid.conf ${IDIR_SQUID}/etc/squid/ @@ -161,18 +135,5 @@ post-install: ${CP} ${WRKINST}/usr/share/squid/* ${IDIR_SQUID}/usr/share/squid/ ${INSTALL_DIR} ${IDIR_SQUID}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/squid ${IDIR_SQUID}/usr/sbin/ - $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth) - $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap) - $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth) - $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth) - $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_WINBIND,wb_auth) - $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth) - $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check) - $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth) - $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group) - $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,wb_group) - $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth) - $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth) - $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,wb_ntlmauth) include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/squid/patches/patch-configure b/package/squid/patches/patch-configure deleted file mode 100644 index 5ea663655..000000000 --- a/package/squid/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ -$Id$ ---- squid-2.5.STABLE13.orig/configure 2006-03-12 12:29:22.000000000 +0100 -+++ squid-2.5.STABLE13/configure 2006-10-02 20:00:32.000000000 +0200 -@@ -1538,6 +1538,7 @@ CRYPTLIB='' - REGEXLIB='' # -lregex - LIBREGEX='' # libregex.a - -+if false; then - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -@@ -1573,7 +1574,7 @@ if test -n "$PKGCONFIG"; then - else - echo "$ac_t""no" 1>&6 - fi -- -+fi - - echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 - echo "configure:1580: checking for Cygwin environment" >&5 diff --git a/package/squid/patches/patch-include_config_h b/package/squid/patches/patch-include_config_h deleted file mode 100644 index 1c8b1dc23..000000000 --- a/package/squid/patches/patch-include_config_h +++ /dev/null @@ -1,48 +0,0 @@ -$Id$ - - evil kludge because configure only checks the host system, - not the build system, yet builds a tool to run on it (cf_gen) - - the real way to do this is probably to enhance configure.in - the way gcc uses it if doing a build with build!=(host==target), - but this should be enough for now; contact tg@ (PR#71) if it isn't - ---- squid-2.5.STABLE13.orig/include/config.h 2005-04-23 03:32:27.000000000 +0200 -+++ squid-2.5.STABLE13/include/config.h 2006-09-18 19:21:26.000000000 +0200 -@@ -34,7 +34,36 @@ - #ifndef SQUID_CONFIG_H - #define SQUID_CONFIG_H - -+#ifndef BUILD_HOST_TOOL - #include "autoconf.h" /* For GNU autoconf variables */ -+#else -+/* we just hope our host systems can cope */ -+#define STDC_HEADERS 1 -+#define HAVE_MEMCPY 1 -+#define HAVE_MEMMOVE 1 -+#define HAVE_MEMSET 1 -+#define HAVE_MKSTEMP 1 -+#define HAVE_MKTIME 1 -+#define HAVE_ASSERT_H 1 -+#define HAVE_CTYPE_H 1 -+#define HAVE_DIRENT_H 1 -+#define HAVE_ERRNO_H 1 -+#define HAVE_FCNTL_H 1 -+#define HAVE_GETOPT_H 1 -+#define HAVE_INTTYPES_H 1 -+#define HAVE_LIMITS_H 1 -+#define HAVE_SIGNAL_H 1 -+#define HAVE_STDARG_H 1 -+#define HAVE_STDDEF_H 1 -+#define HAVE_STDIO_H 1 -+#define HAVE_STDLIB_H 1 -+#define HAVE_STRING_H 1 -+#define HAVE_SYS_PARAM_H 1 -+#define HAVE_SYS_STAT_H 1 -+#define HAVE_SYS_TIME_H 1 -+#define HAVE_TIME_H 1 -+#define HAVE_UNISTD_H 1 -+#endif - #include "version.h" - - /**************************************************************************** diff --git a/package/squid/patches/patch-lib_util_c b/package/squid/patches/patch-lib_util_c deleted file mode 100644 index 622df36d6..000000000 --- a/package/squid/patches/patch-lib_util_c +++ /dev/null @@ -1,22 +0,0 @@ -$Id$ - - the host tools don't need libm - ---- squid-2.5.STABLE13.orig/lib/util.c 2005-06-30 20:50:56.000000000 +0200 -+++ squid-2.5.STABLE13/lib/util.c 2006-09-18 19:23:46.000000000 +0200 -@@ -704,6 +704,7 @@ xpercent(double part, double whole) - return xdiv(100 * part, whole); - } - -+#ifndef BUILD_HOST_TOOL - int - xpercentInt(double part, double whole) - { -@@ -714,6 +715,7 @@ xpercentInt(double part, double whole) - return (int) floor(xpercent(part, whole) + 0.5); - #endif - } -+#endif - - /* somewhat safer division */ - double diff --git a/package/squid/patches/patch-src_Makefile_in b/package/squid/patches/patch-src_Makefile_in deleted file mode 100644 index c77f4d6fb..000000000 --- a/package/squid/patches/patch-src_Makefile_in +++ /dev/null @@ -1,19 +0,0 @@ -$Id$ - - cross-configure kludge - ---- squid-2.5.STABLE13.orig/src/Makefile.in 2005-09-28 22:57:21.000000000 +0200 -+++ squid-2.5.STABLE13/src/Makefile.in 2006-09-18 19:24:05.000000000 +0200 -@@ -702,7 +702,12 @@ cachemgr$(CGIEXT)$(EXEEXT): $(cachemgr__ - $(LINK) $(cachemgr__CGIEXT__LDFLAGS) $(cachemgr__CGIEXT__OBJECTS) $(cachemgr__CGIEXT__LDADD) $(LIBS) - cf_gen$(EXEEXT): $(cf_gen_OBJECTS) $(cf_gen_DEPENDENCIES) - @rm -f cf_gen$(EXEEXT) -+ifneq (${HOSTCC},) -+ ${HOSTCC} ${INCLUDES} -DNDEBUG -DBUILD_HOST_TOOL -o cf_gen$(EXEEXT) \ -+ $(srcdir)/cf_gen.c $(top_srcdir)/lib/util.c -+else - $(LINK) $(cf_gen_LDFLAGS) $(cf_gen_OBJECTS) $(cf_gen_LDADD) $(LIBS) -+endif - dnsserver$(EXEEXT): $(dnsserver_OBJECTS) $(dnsserver_DEPENDENCIES) - @rm -f dnsserver$(EXEEXT) - $(LINK) $(dnsserver_LDFLAGS) $(dnsserver_OBJECTS) $(dnsserver_LDADD) $(LIBS) diff --git a/package/srelay/Makefile b/package/srelay/Makefile index 6106efb1f..f0065f3ff 100644 --- a/package/srelay/Makefile +++ b/package/srelay/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile index d752865e5..738fa125c 100644 --- a/package/ssltunnel/Makefile +++ b/package/ssltunnel/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile index 0d81a36dd..00dafa296 100644 --- a/package/ssmtp/Makefile +++ b/package/ssmtp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/strace/Makefile b/package/strace/Makefile index 75c04afe6..0eda1d6c9 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/stress/Makefile b/package/stress/Makefile index 8bde6d54b..4ac1858ce 100644 --- a/package/stress/Makefile +++ b/package/stress/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 88bd980cb..5086db30f 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile index 34e902b13..26f96f449 100644 --- a/package/swconfig/Makefile +++ b/package/swconfig/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile index 92f52814d..13ea83eeb 100644 --- a/package/syslog-ng/Makefile +++ b/package/syslog-ng/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/sysstat/Makefile b/package/sysstat/Makefile index 9b5bdefcb..e1f28029b 100644 --- a/package/sysstat/Makefile +++ b/package/sysstat/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/tar/Makefile b/package/tar/Makefile index 638ba6432..a38e55e67 100644 --- a/package/tar/Makefile +++ b/package/tar/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/tcl/Makefile b/package/tcl/Makefile index 5892064bd..c1437cf8d 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile index 69a701849..77c8ed6ba 100644 --- a/package/tcp_wrappers/Makefile +++ b/package/tcp_wrappers/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 59250a6fb..cce37c8fc 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/tinc/Makefile b/package/tinc/Makefile index e9af51f7a..27f61a2ca 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index 9d2fa7637..12e01de18 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile index 40989c2d5..915ef3dc1 100644 --- a/package/tmsnc/Makefile +++ b/package/tmsnc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/tmsnc/patches/patch-Makefile b/package/tmsnc/patches/patch-Makefile new file mode 100644 index 000000000..c0be7120d --- /dev/null +++ b/package/tmsnc/patches/patch-Makefile @@ -0,0 +1,149 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- tmsnc-0.3.2.orig/Makefile 2006-10-17 13:14:22.000000000 +0200 ++++ tmsnc-0.3.2/Makefile 2009-06-02 01:13:53.000000000 +0200 +@@ -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 \ + $(top_srcdir)/autopackage/default.apspec.in \ +@@ -76,21 +76,21 @@ DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print + distcleancheck_listfiles = find . -type f -print +-ACLOCAL = ${SHELL} /home/jonas/tmsnc/missing --run aclocal-1.9 +-AMDEP_FALSE = # +-AMDEP_TRUE = +-AMTAR = ${SHELL} /home/jonas/tmsnc/missing --run tar +-AUTOCONF = ${SHELL} /home/jonas/tmsnc/missing --run autoconf +-AUTOHEADER = ${SHELL} /home/jonas/tmsnc/missing --run autoheader +-AUTOMAKE = ${SHELL} /home/jonas/tmsnc/missing --run automake-1.9 +-AWK = mawk +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CPP = gcc -E +-CPPFLAGS = +-CURSES_INCLUDEDIR = +-CURSES_LIBS = -lncurses -lpanel -lform ++ACLOCAL = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run aclocal-1.9 ++AMDEP_FALSE = ++AMDEP_TRUE = # ++AMTAR = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run tar ++AUTOCONF = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run autoconf ++AUTOHEADER = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run autoheader ++AUTOMAKE = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run automake-1.9 ++AWK = gawk ++CC = /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc ++CCDEPMODE = depmode=none ++CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all ++CPP = /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E ++CPPFLAGS = -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG ++CURSES_INCLUDEDIR = -I/home/wbx/alix1c/openadk/cross_i586/target/include -DRENAMED_NCURSES ++CURSES_LIBS = -L/home/wbx/alix1c/openadk/cross_i586/target/lib -lncurses -lpanel -lform + CYGPATH_W = echo + DEFS = -DHAVE_CONFIG_H + DEPDIR = .deps +@@ -104,13 +104,13 @@ INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_PROGRAM = ${INSTALL} + INSTALL_SCRIPT = ${INSTALL} + INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +-LDFLAGS = +-LIBICONV = ++LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib ++LIBICONV = /home/wbx/alix1c/openadk/cross_i586/target/usr/lib/libiconv.so -Wl,-rpath -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib + LIBOBJS = + LIBS = +-LTLIBICONV = ++LTLIBICONV = -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -liconv -R/home/wbx/alix1c/openadk/cross_i586/target/usr/lib + LTLIBOBJS = +-MAKEINFO = ${SHELL} /home/jonas/tmsnc/missing --run makeinfo ++MAKEINFO = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run makeinfo + OBJEXT = o + OPENSSL_FALSE = # + OPENSSL_TRUE = +@@ -122,57 +122,57 @@ PACKAGE_TARNAME = + PACKAGE_VERSION = + PATH_SEPARATOR = : + SET_MAKE = +-SHELL = /bin/sh +-SSLINC = +-SSLLIB = -lssl -lcrypto +-STRIP = ++SHELL = /bin/bash ++SSLINC = -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include ++SSLLIB = -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -lssl -lcrypto ++STRIP = i586-linux-strip + TALKFILTERS_FALSE = + TALKFILTERS_TRUE = # + TFLIB = + VERSION = 0.3.2 +-ac_ct_CC = gcc +-am__fastdepCC_FALSE = # +-am__fastdepCC_TRUE = ++ac_ct_CC = ++am__fastdepCC_FALSE = ++am__fastdepCC_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 = ${datarootdir} ++datadir = /usr/share + datarootdir = ${prefix}/share + docdir = ${datarootdir}/doc/${PACKAGE} + dvidir = ${docdir} + 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 + htmldir = ${docdir} + includedir = ${prefix}/include + infodir = ${datarootdir}/info +-install_sh = /home/jonas/tmsnc/install-sh ++install_sh = /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/install-sh + libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec ++libexecdir = /usr/sbin + localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man ++localstatedir = /var ++mandir = /usr/share/man + mkdir_p = mkdir -p -- + oldincludedir = /usr/include + pdfdir = ${docdir} +-prefix = /usr/local +-program_transform_name = s,x,x, ++prefix = /usr ++program_transform_name = s&$$&&;s&^&& + psdir = ${docdir} + sbindir = ${exec_prefix}/sbin + sharedstatedir = ${prefix}/com +-sysconfdir = ${prefix}/etc +-target_alias = ++sysconfdir = /etc ++target_alias = i586-linux + tmsnc_VERSION = 0.3.2 + AUTOMAKE_OPTIONS = no-dependencies + SUBDIRS = src doc diff --git a/package/tmsnc/patches/patch-config_log b/package/tmsnc/patches/patch-config_log new file mode 100644 index 000000000..519c7681e --- /dev/null +++ b/package/tmsnc/patches/patch-config_log @@ -0,0 +1,756 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- tmsnc-0.3.2.orig/config.log 2006-10-17 13:14:23.000000000 +0200 ++++ tmsnc-0.3.2/config.log 2009-06-02 01:13:54.000000000 +0200 +@@ -4,22 +4,22 @@ running configure, to aid debugging if c + It was created by configure, which was + generated by GNU Autoconf 2.60a. Invocation command line was + +- $ ./configure ++ $ /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/configure --build=x86_64-linux-gnu --host=i586-linux --target=i586-linux --program-prefix= --program-suffix= --prefix=/usr --datadir=/usr/share --mandir=/usr/share/man --libexecdir=/usr/sbin --localstatedir=/var --sysconfdir=/etc --disable-nls --enable-shared --enable-static --disable-dependency-tracking --disable-libtool-lock --disable-debug --enable-ipv6 --with-libiconv-prefix=/home/wbx/alix1c/openadk/cross_i586/target/usr --with-openssl=/home/wbx/alix1c/openadk/cross_i586/target/usr --with-ncurses=/home/wbx/alix1c/openadk/cross_i586/target + + ## --------- ## + ## Platform. ## + ## --------- ## + +-hostname = prophet +-uname -m = i686 +-uname -r = 2.6.18-mactel ++hostname = natrium ++uname -m = x86_64 ++uname -r = 2.6.26-2-amd64 + uname -s = Linux +-uname -v = #1 SMP Tue Oct 10 12:17:51 CEST 2006 ++uname -v = #1 SMP Fri Mar 27 04:02:59 UTC 2009 + + /usr/bin/uname -p = unknown + /bin/uname -X = unknown + +-/bin/arch = i686 ++/bin/arch = unknown + /usr/bin/arch -k = unknown + /usr/convex/getsysinfo = unknown + /usr/bin/hostinfo = unknown +@@ -27,10 +27,12 @@ uname -v = #1 SMP Tue Oct 10 12:17:51 CE + /usr/bin/oslevel = unknown + /bin/universe = unknown + ++PATH: /home/wbx/alix1c/openadk/scripts ++PATH: /home/wbx/alix1c/openadk/cross_i586/host/bin ++PATH: /home/wbx/alix1c/openadk/cross_i586/target/scripts + PATH: /usr/local/bin + PATH: /usr/bin + PATH: /bin +-PATH: /usr/bin/X11 + PATH: /usr/games + + +@@ -43,87 +45,85 @@ configure:1845: result: /usr/bin/install + configure:1856: checking whether build environment is sane + configure:1899: result: yes + configure:1964: checking for gawk +-configure:1994: result: no +-configure:1964: checking for mawk +-configure:1980: found /usr/bin/mawk +-configure:1991: result: mawk +-configure:2002: checking whether make sets $(MAKE) ++configure:1980: found /usr/bin/gawk ++configure:1991: result: gawk ++configure:2002: checking whether /usr/bin/make sets $(MAKE) + configure:2023: result: yes +-configure:2258: checking for gcc +-configure:2274: found /usr/bin/gcc +-configure:2285: result: gcc ++configure:2099: checking for i586-linux-strip ++configure:2115: found /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-strip ++configure:2126: result: i586-linux-strip ++configure:2218: checking for i586-linux-gcc ++configure:2245: result: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc + configure:2523: checking for C compiler version +-configure:2530: gcc --version >&5 +-gcc (GCC) 4.1.2 20060901 (prerelease) (Debian 4.1.1-13) +-Copyright (C) 2006 Free Software Foundation, Inc. ++configure:2530: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc --version >&5 ++i586-linux-gnu-gcc (GCC) 4.4.0 ++Copyright (C) 2009 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. + + configure:2533: $? = 0 +-configure:2540: gcc -v >&5 ++configure:2540: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -v >&5 + Using built-in specs. +-Target: i486-linux-gnu +-Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --with-tune=i686 --enable-checking=release i486-linux-gnu ++Target: i586-linux-gnu ++Configured with: /home/wbx/alix1c/openadk/toolchain_build_i586/gcc-4.4.0/configure --prefix=/home/wbx/alix1c/openadk/cross_i586/host --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=i586-linux-gnu --with-gmp=/home/wbx/alix1c/openadk/cross_i586/host --with-mpfr=/home/wbx/alix1c/openadk/cross_i586/host --disable-__cxa_atexit --enable-target-optspace --with-gnu-ld --without-headers --disable-libmudflap --disable-libgomp --disable-biarch --disable-multilib --disable-nls --enable-libssp --enable-languages=c,c++ --with-sysroot=/home/wbx/alix1c/openadk/cross_i586/target --with-slibdir=/home/wbx/alix1c/openadk/cross_i586/target/lib --enable-shared + Thread model: posix +-gcc version 4.1.2 20060901 (prerelease) (Debian 4.1.1-13) ++gcc version 4.4.0 (GCC) + configure:2543: $? = 0 +-configure:2550: gcc -V >&5 +-gcc: '-V' option must have argument ++configure:2550: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -V >&5 ++i586-linux-gnu-gcc: '-V' option must have argument + configure:2553: $? = 1 + configure:2576: checking for C compiler default output file name +-configure:2603: gcc conftest.c >&5 ++configure:2603: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c >&5 + configure:2606: $? = 0 + configure:2644: result: a.out + configure:2661: checking whether the C compiler works +-configure:2671: ./a.out +-configure:2674: $? = 0 + configure:2691: result: yes + configure:2698: checking whether we are cross compiling +-configure:2700: result: no ++configure:2700: result: yes + configure:2703: checking for suffix of executables +-configure:2710: gcc -o conftest conftest.c >&5 ++configure:2710: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -o conftest -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c >&5 + configure:2713: $? = 0 + configure:2737: result: + configure:2743: checking for suffix of object files +-configure:2769: gcc -c conftest.c >&5 ++configure:2769: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:2772: $? = 0 + configure:2795: result: o + configure:2799: checking whether we are using the GNU C compiler +-configure:2828: gcc -c conftest.c >&5 ++configure:2828: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:2834: $? = 0 + configure:2841: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:2844: $? = 0 + configure:2851: test -s conftest.o + configure:2854: $? = 0 + configure:2868: result: yes +-configure:2873: checking whether gcc accepts -g +-configure:2903: gcc -c -g conftest.c >&5 ++configure:2873: checking whether /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc accepts -g ++configure:2903: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -g -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:2909: $? = 0 + configure:2916: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:2919: $? = 0 + configure:2926: test -s conftest.o + configure:2929: $? = 0 + configure:3059: result: yes +-configure:3076: checking for gcc option to accept ISO C89 +-configure:3150: gcc -c -g -O2 conftest.c >&5 ++configure:3076: checking for /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc option to accept ISO C89 ++configure:3150: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:3156: $? = 0 + configure:3163: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:3166: $? = 0 + configure:3173: test -s conftest.o + configure:3176: $? = 0 + configure:3196: result: none needed +-configure:3225: checking for style of include used by make ++configure:3225: checking for style of include used by /usr/bin/make + configure:3253: result: GNU +-configure:3281: checking dependency style of gcc +-configure:3371: result: gcc3 ++configure:3281: checking dependency style of /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc ++configure:3371: result: none + configure:3401: checking for a BSD-compatible install + configure:3457: result: /usr/bin/install -c +-configure:3468: checking whether make sets $(MAKE) ++configure:3468: checking whether /usr/bin/make sets $(MAKE) + configure:3489: result: yes + configure:3506: checking how to run the C preprocessor +-configure:3546: gcc -E conftest.c ++configure:3546: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c + configure:3552: $? = 0 +-configure:3590: gcc -E conftest.c ++configure:3590: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c + conftest.c:10:28: error: ac_nonexistent.h: No such file or directory + configure:3596: $? = 1 + configure: failed program was: +@@ -137,10 +137,10 @@ configure: failed program was: + | #define VERSION "0.3.2" + | /* end confdefs.h. */ + | #include <ac_nonexistent.h> +-configure:3636: result: gcc -E +-configure:3665: gcc -E conftest.c ++configure:3636: result: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E ++configure:3665: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c + configure:3671: $? = 0 +-configure:3709: gcc -E conftest.c ++configure:3709: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c + conftest.c:10:28: error: ac_nonexistent.h: No such file or directory + configure:3715: $? = 1 + configure: failed program was: +@@ -159,19 +159,15 @@ configure:3834: result: /bin/grep + configure:3839: checking for egrep + configure:3917: result: /bin/grep -E + configure:3922: checking for ANSI C header files +-configure:3952: gcc -c -g -O2 conftest.c >&5 ++configure:3952: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:3958: $? = 0 + configure:3965: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:3968: $? = 0 + configure:3975: test -s conftest.o + configure:3978: $? = 0 +-configure:4074: gcc -o conftest -g -O2 conftest.c >&5 +-configure:4077: $? = 0 +-configure:4083: ./conftest +-configure:4086: $? = 0 + configure:4103: result: yes + configure:4129: checking for sys/types.h +-configure:4150: gcc -c -g -O2 conftest.c >&5 ++configure:4150: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4156: $? = 0 + configure:4163: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4166: $? = 0 +@@ -179,7 +175,7 @@ configure:4173: test -s conftest.o + configure:4176: $? = 0 + configure:4189: result: yes + configure:4129: checking for sys/stat.h +-configure:4150: gcc -c -g -O2 conftest.c >&5 ++configure:4150: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4156: $? = 0 + configure:4163: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4166: $? = 0 +@@ -187,7 +183,7 @@ configure:4173: test -s conftest.o + configure:4176: $? = 0 + configure:4189: result: yes + configure:4129: checking for stdlib.h +-configure:4150: gcc -c -g -O2 conftest.c >&5 ++configure:4150: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4156: $? = 0 + configure:4163: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4166: $? = 0 +@@ -195,7 +191,7 @@ configure:4173: test -s conftest.o + configure:4176: $? = 0 + configure:4189: result: yes + configure:4129: checking for string.h +-configure:4150: gcc -c -g -O2 conftest.c >&5 ++configure:4150: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4156: $? = 0 + configure:4163: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4166: $? = 0 +@@ -203,7 +199,7 @@ configure:4173: test -s conftest.o + configure:4176: $? = 0 + configure:4189: result: yes + configure:4129: checking for memory.h +-configure:4150: gcc -c -g -O2 conftest.c >&5 ++configure:4150: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4156: $? = 0 + configure:4163: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4166: $? = 0 +@@ -211,7 +207,7 @@ configure:4173: test -s conftest.o + configure:4176: $? = 0 + configure:4189: result: yes + configure:4129: checking for strings.h +-configure:4150: gcc -c -g -O2 conftest.c >&5 ++configure:4150: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4156: $? = 0 + configure:4163: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4166: $? = 0 +@@ -219,7 +215,7 @@ configure:4173: test -s conftest.o + configure:4176: $? = 0 + configure:4189: result: yes + configure:4129: checking for inttypes.h +-configure:4150: gcc -c -g -O2 conftest.c >&5 ++configure:4150: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4156: $? = 0 + configure:4163: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4166: $? = 0 +@@ -227,7 +223,7 @@ configure:4173: test -s conftest.o + configure:4176: $? = 0 + configure:4189: result: yes + configure:4129: checking for stdint.h +-configure:4150: gcc -c -g -O2 conftest.c >&5 ++configure:4150: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4156: $? = 0 + configure:4163: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4166: $? = 0 +@@ -235,7 +231,7 @@ configure:4173: test -s conftest.o + configure:4176: $? = 0 + configure:4189: result: yes + configure:4129: checking for unistd.h +-configure:4150: gcc -c -g -O2 conftest.c >&5 ++configure:4150: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4156: $? = 0 + configure:4163: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4166: $? = 0 +@@ -243,7 +239,7 @@ configure:4173: test -s conftest.o + configure:4176: $? = 0 + configure:4189: result: yes + configure:4201: checking for pid_t +-configure:4231: gcc -c -g -O2 conftest.c >&5 ++configure:4231: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4237: $? = 0 + configure:4244: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4247: $? = 0 +@@ -251,7 +247,7 @@ configure:4254: test -s conftest.o + configure:4257: $? = 0 + configure:4269: result: yes + configure:4281: checking for size_t +-configure:4311: gcc -c -g -O2 conftest.c >&5 ++configure:4311: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4317: $? = 0 + configure:4324: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4327: $? = 0 +@@ -259,7 +255,7 @@ configure:4334: test -s conftest.o + configure:4337: $? = 0 + configure:4349: result: yes + configure:4361: checking whether time.h and sys/time.h may both be included +-configure:4391: gcc -c -g -O2 conftest.c >&5 ++configure:4391: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4397: $? = 0 + configure:4404: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4407: $? = 0 +@@ -267,7 +263,7 @@ configure:4414: test -s conftest.o + configure:4417: $? = 0 + configure:4429: result: yes + configure:4439: checking whether struct tm is in sys/time.h or time.h +-configure:4467: gcc -c -g -O2 conftest.c >&5 ++configure:4467: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:4473: $? = 0 + configure:4480: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4483: $? = 0 +@@ -275,7 +271,7 @@ configure:4490: test -s conftest.o + configure:4493: $? = 0 + configure:4505: result: time.h + configure:4516: checking for library containing gethostbyname +-configure:4557: gcc -o conftest -g -O2 conftest.c >&5 ++configure:4557: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -o conftest -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c >&5 + configure:4563: $? = 0 + configure:4570: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4573: $? = 0 +@@ -283,17 +279,15 @@ configure:4580: test -s conftest + configure:4583: $? = 0 + configure:4607: result: none required + configure:4615: checking for socket +-configure:4671: gcc -o conftest -g -O2 conftest.c >&5 ++configure:4671: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -o conftest -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c >&5 + configure:4677: $? = 0 + configure:4684: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:4687: $? = 0 + configure:4694: test -s conftest + configure:4697: $? = 0 + configure:4710: result: yes +-configure:5084: checking location of ncurses.h file... +-configure:5092: result: Found ncurses on /usr/include/ncurses.h + configure:5367: checking for use_default_colors +-configure:5423: gcc -o conftest -g -O2 conftest.c -lncurses >&5 ++configure:5423: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -o conftest -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c -L/home/wbx/alix1c/openadk/cross_i586/target/lib -lncurses >&5 + configure:5429: $? = 0 + configure:5436: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:5439: $? = 0 +@@ -301,7 +295,7 @@ configure:5446: test -s conftest + configure:5449: $? = 0 + configure:5463: result: yes + configure:5367: checking for resizeterm +-configure:5423: gcc -o conftest -g -O2 conftest.c -lncurses >&5 ++configure:5423: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -o conftest -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c -L/home/wbx/alix1c/openadk/cross_i586/target/lib -lncurses >&5 + configure:5429: $? = 0 + configure:5436: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:5439: $? = 0 +@@ -309,7 +303,7 @@ configure:5446: test -s conftest + configure:5449: $? = 0 + configure:5463: result: yes + configure:5367: checking for resize_term +-configure:5423: gcc -o conftest -g -O2 conftest.c -lncurses >&5 ++configure:5423: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -o conftest -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c -L/home/wbx/alix1c/openadk/cross_i586/target/lib -lncurses >&5 + configure:5429: $? = 0 + configure:5436: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:5439: $? = 0 +@@ -317,9 +311,9 @@ configure:5446: test -s conftest + configure:5449: $? = 0 + configure:5463: result: yes + configure:5367: checking for wadd_wch +-configure:5423: gcc -o conftest -g -O2 conftest.c -lncurses >&5 +-/tmp/cciXPB1b.o: In function `main': +-/home/jonas/tmsnc/conftest.c:60: undefined reference to `wadd_wch' ++configure:5423: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -o conftest -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c -L/home/wbx/alix1c/openadk/cross_i586/target/lib -lncurses >&5 ++/tmp/ccezoIMb.o: In function `main': ++conftest.c:(.text+0x1d): undefined reference to `wadd_wch' + collect2: ld returned 1 exit status + configure:5429: $? = 1 + configure: failed program was: +@@ -342,8 +336,8 @@ configure: failed program was: + | #define HAVE_STDINT_H 1 + | #define HAVE_UNISTD_H 1 + | #define TIME_WITH_SYS_TIME 1 +-| #define HAS_CURSES 1 + | #define USE_NCURSES 1 ++| #define HAS_CURSES 1 + | #define HAVE_USE_DEFAULT_COLORS 1 + | #define HAVE_RESIZETERM 1 + | #define HAVE_RESIZE_TERM 1 +@@ -388,25 +382,71 @@ configure: failed program was: + | } + configure:5463: result: no + configure:5515: checking build system type +-configure:5533: result: i686-pc-linux-gnu ++configure:5533: result: x86_64-pc-linux-gnu + configure:5555: checking host system type +-configure:5570: result: i686-pc-linux-gnu ++configure:5570: result: i586-pc-linux-gnu + configure:5616: checking for ld used by GCC +-configure:5680: result: /usr/bin/ld +-configure:5689: checking if the linker (/usr/bin/ld) is GNU ld ++configure:5680: result: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-ld ++configure:5689: checking if the linker (/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-ld) is GNU ld + configure:5702: result: yes + configure:5709: checking for shared library run path origin + configure:5722: result: done + configure:6152: checking for iconv +-configure:6184: gcc -o conftest -g -O2 conftest.c >&5 +-configure:6190: $? = 0 +-configure:6197: test -z "$ac_c_werror_flag" || test ! -s conftest.err +-configure:6200: $? = 0 +-configure:6207: test -s conftest +-configure:6210: $? = 0 ++configure:6184: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -o conftest -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c >&5 ++/tmp/ccwM6z8w.o: In function `main': ++conftest.c:(.text+0x28): undefined reference to `libiconv_open' ++conftest.c:(.text+0x3d): undefined reference to `libiconv' ++conftest.c:(.text+0x46): undefined reference to `libiconv_close' ++collect2: ld returned 1 exit status ++configure:6190: $? = 1 ++configure: failed program was: ++| /* confdefs.h. */ ++| #define PACKAGE_NAME "" ++| #define PACKAGE_TARNAME "" ++| #define PACKAGE_VERSION "" ++| #define PACKAGE_STRING "" ++| #define PACKAGE_BUGREPORT "" ++| #define PACKAGE "tmsnc" ++| #define VERSION "0.3.2" ++| #define STDC_HEADERS 1 ++| #define HAVE_SYS_TYPES_H 1 ++| #define HAVE_SYS_STAT_H 1 ++| #define HAVE_STDLIB_H 1 ++| #define HAVE_STRING_H 1 ++| #define HAVE_MEMORY_H 1 ++| #define HAVE_STRINGS_H 1 ++| #define HAVE_INTTYPES_H 1 ++| #define HAVE_STDINT_H 1 ++| #define HAVE_UNISTD_H 1 ++| #define TIME_WITH_SYS_TIME 1 ++| #define USE_NCURSES 1 ++| #define HAS_CURSES 1 ++| #define HAVE_USE_DEFAULT_COLORS 1 ++| #define HAVE_RESIZETERM 1 ++| #define HAVE_RESIZE_TERM 1 ++| /* end confdefs.h. */ ++| #include <stdlib.h> ++| #include <iconv.h> ++| int ++| main () ++| { ++| iconv_t cd = iconv_open("",""); ++| iconv(cd,NULL,NULL,NULL,NULL); ++| iconv_close(cd); ++| ; ++| return 0; ++| } ++configure:6249: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -o conftest -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c /home/wbx/alix1c/openadk/cross_i586/target/usr/lib/libiconv.so -Wl,-rpath -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib >&5 ++configure:6255: $? = 0 ++configure:6262: test -z "$ac_c_werror_flag" || test ! -s conftest.err ++configure:6265: $? = 0 ++configure:6272: test -s conftest ++configure:6275: $? = 0 + configure:6292: result: yes ++configure:6302: checking how to link with libiconv ++configure:6304: result: /home/wbx/alix1c/openadk/cross_i586/target/usr/lib/libiconv.so -Wl,-rpath -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib + configure:6315: checking for iconv declaration +-configure:6354: gcc -c -g -O2 conftest.c >&5 ++configure:6354: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -c -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG conftest.c >&5 + configure:6360: $? = 0 + configure:6367: test -z "$ac_c_werror_flag" || test ! -s conftest.err + configure:6370: $? = 0 +@@ -415,10 +455,10 @@ configure:6380: $? = 0 + configure:6396: result: + extern size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); + configure:6424: checking for openssl +-configure:6494: result: yes ++configure:6447: result: /home/wbx/alix1c/openadk/cross_i586/target/usr + configure:6521: checking for gtf_filter_warez in -ltalkfilters +-configure:6556: gcc -o conftest -g -O2 conftest.c -ltalkfilters >&5 +-/usr/bin/ld: cannot find -ltalkfilters ++configure:6556: /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -o conftest -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib conftest.c -ltalkfilters >&5 ++/home/wbx/alix1c/openadk/cross_i586/host/lib/gcc/i586-linux-gnu/4.4.0/../../../../i586-linux-gnu/bin/ld: cannot find -ltalkfilters + collect2: ld returned 1 exit status + configure:6562: $? = 1 + configure: failed program was: +@@ -441,8 +481,8 @@ configure: failed program was: + | #define HAVE_STDINT_H 1 + | #define HAVE_UNISTD_H 1 + | #define TIME_WITH_SYS_TIME 1 +-| #define HAS_CURSES 1 + | #define USE_NCURSES 1 ++| #define HAS_CURSES 1 + | #define HAVE_USE_DEFAULT_COLORS 1 + | #define HAVE_RESIZETERM 1 + | #define HAVE_RESIZE_TERM 1 +@@ -481,37 +521,40 @@ generated by GNU Autoconf 2.60a. Invoca + CONFIG_COMMANDS = + $ ./config.status + +-on prophet ++on natrium + + config.status:646: creating Makefile + config.status:646: creating doc/Makefile + config.status:646: creating src/Makefile + config.status:646: creating autopackage/default.apspec + config.status:646: creating src/config.h ++config.status:875: src/config.h is unchanged + config.status:921: executing depfiles commands + + ## ---------------- ## + ## Cache variables. ## + ## ---------------- ## + +-ac_cv_build=i686-pc-linux-gnu ++ac_cv_build=x86_64-pc-linux-gnu + ac_cv_c_compiler_gnu=yes +-ac_cv_env_CC_set= +-ac_cv_env_CC_value= +-ac_cv_env_CFLAGS_set= +-ac_cv_env_CFLAGS_value= +-ac_cv_env_CPPFLAGS_set= +-ac_cv_env_CPPFLAGS_value= ++ac_cv_env_CC_set=set ++ac_cv_env_CC_value=/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc ++ac_cv_env_CFLAGS_set=set ++ac_cv_env_CFLAGS_value='-fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all' ++ac_cv_env_CPPFLAGS_set=set ++ac_cv_env_CPPFLAGS_value='-I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG' + ac_cv_env_CPP_set= + ac_cv_env_CPP_value= +-ac_cv_env_LDFLAGS_set= +-ac_cv_env_LDFLAGS_value= +-ac_cv_env_build_alias_set= +-ac_cv_env_build_alias_value= +-ac_cv_env_host_alias_set= +-ac_cv_env_host_alias_value= +-ac_cv_env_target_alias_set= +-ac_cv_env_target_alias_value= ++ac_cv_env_LDFLAGS_set=set ++ac_cv_env_LDFLAGS_value='-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib' ++ac_cv_env_build_alias_set=set ++ac_cv_env_build_alias_value=x86_64-linux-gnu ++ac_cv_env_host_alias_set=set ++ac_cv_env_host_alias_value=i586-linux ++ac_cv_env_target_alias_set=set ++ac_cv_env_target_alias_value=i586-linux ++ac_cv_func_malloc_0_nonnull=yes ++ac_cv_func_realloc_0_nonnull=yes + ac_cv_func_resize_term=yes + ac_cv_func_resizeterm=yes + ac_cv_func_socket=yes +@@ -528,18 +571,19 @@ ac_cv_header_sys_stat_h=yes + ac_cv_header_sys_types_h=yes + ac_cv_header_time=yes + ac_cv_header_unistd_h=yes +-ac_cv_host=i686-pc-linux-gnu ++ac_cv_host=i586-pc-linux-gnu + ac_cv_lib_talkfilters_gtf_filter_warez=no + ac_cv_objext=o + ac_cv_path_EGREP='/bin/grep -E' + ac_cv_path_GREP=/bin/grep + ac_cv_path_install='/usr/bin/install -c' +-ac_cv_prog_AWK=mawk +-ac_cv_prog_CPP='gcc -E' +-ac_cv_prog_ac_ct_CC=gcc ++ac_cv_prog_AWK=gawk ++ac_cv_prog_CC=/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc ++ac_cv_prog_CPP='/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E' ++ac_cv_prog_STRIP=i586-linux-strip + ac_cv_prog_cc_c89= + ac_cv_prog_cc_g=yes +-ac_cv_prog_make_make_set=yes ++ac_cv_prog_make__usr_bin_make_set=yes + ac_cv_search_gethostbyname='none required' + ac_cv_struct_tm=time.h + ac_cv_type_pid_t=yes +@@ -549,14 +593,14 @@ acl_cv_hardcode_libdir_flag_spec='${wl}- + acl_cv_hardcode_libdir_separator= + acl_cv_hardcode_minus_L=no + acl_cv_libext=a +-acl_cv_path_LD=/usr/bin/ld ++acl_cv_path_LD=/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-ld + acl_cv_prog_gnu_ld=yes + acl_cv_rpath=done + acl_cv_shlibext=so + acl_cv_wl=-Wl, +-am_cv_CC_dependencies_compiler_type=gcc3 ++am_cv_CC_dependencies_compiler_type=none + am_cv_func_iconv=yes +-am_cv_lib_iconv=no ++am_cv_lib_iconv=yes + am_cv_proto_iconv='extern size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);' + am_cv_proto_iconv_arg1= + +@@ -564,22 +608,22 @@ am_cv_proto_iconv_arg1= + ## Output variables. ## + ## ----------------- ## + +-ACLOCAL='${SHELL} /home/jonas/tmsnc/missing --run aclocal-1.9' +-AMDEPBACKSLASH='\' +-AMDEP_FALSE='#' +-AMDEP_TRUE='' +-AMTAR='${SHELL} /home/jonas/tmsnc/missing --run tar' +-AUTOCONF='${SHELL} /home/jonas/tmsnc/missing --run autoconf' +-AUTOHEADER='${SHELL} /home/jonas/tmsnc/missing --run autoheader' +-AUTOMAKE='${SHELL} /home/jonas/tmsnc/missing --run automake-1.9' +-AWK='mawk' +-CC='gcc' +-CCDEPMODE='depmode=gcc3' +-CFLAGS='-g -O2' +-CPP='gcc -E' +-CPPFLAGS='' +-CURSES_INCLUDEDIR='' +-CURSES_LIBS='-lncurses -lpanel -lform' ++ACLOCAL='${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run aclocal-1.9' ++AMDEPBACKSLASH='' ++AMDEP_FALSE='' ++AMDEP_TRUE='#' ++AMTAR='${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run tar' ++AUTOCONF='${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run autoconf' ++AUTOHEADER='${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run autoheader' ++AUTOMAKE='${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run automake-1.9' ++AWK='gawk' ++CC='/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc' ++CCDEPMODE='depmode=none' ++CFLAGS='-fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all' ++CPP='/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E' ++CPPFLAGS='-I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG' ++CURSES_INCLUDEDIR='-I/home/wbx/alix1c/openadk/cross_i586/target/include -DRENAMED_NCURSES' ++CURSES_LIBS=' -L/home/wbx/alix1c/openadk/cross_i586/target/lib -lncurses -lpanel -lform' + CYGPATH_W='echo' + DEFS='-DHAVE_CONFIG_H' + DEPDIR='.deps' +@@ -593,13 +637,13 @@ INSTALL_DATA='${INSTALL} -m 644' + INSTALL_PROGRAM='${INSTALL}' + INSTALL_SCRIPT='${INSTALL}' + INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s' +-LDFLAGS='' +-LIBICONV='' ++LDFLAGS='-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib' ++LIBICONV='/home/wbx/alix1c/openadk/cross_i586/target/usr/lib/libiconv.so -Wl,-rpath -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib' + LIBOBJS='' + LIBS='' +-LTLIBICONV='' ++LTLIBICONV='-L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -liconv -R/home/wbx/alix1c/openadk/cross_i586/target/usr/lib' + LTLIBOBJS='' +-MAKEINFO='${SHELL} /home/jonas/tmsnc/missing --run makeinfo' ++MAKEINFO='${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run makeinfo' + OBJEXT='o' + OPENSSL_FALSE='#' + OPENSSL_TRUE='' +@@ -611,57 +655,57 @@ PACKAGE_TARNAME='' + PACKAGE_VERSION='' + PATH_SEPARATOR=':' + SET_MAKE='' +-SHELL='/bin/sh' +-SSLINC='' +-SSLLIB='-lssl -lcrypto' +-STRIP='' ++SHELL='/bin/bash' ++SSLINC='-I/home/wbx/alix1c/openadk/cross_i586/target/usr/include' ++SSLLIB='-L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -lssl -lcrypto' ++STRIP='i586-linux-strip' + TALKFILTERS_FALSE='' + TALKFILTERS_TRUE='#' + TFLIB='' + VERSION='0.3.2' +-ac_ct_CC='gcc' +-am__fastdepCC_FALSE='#' +-am__fastdepCC_TRUE='' ++ac_ct_CC='' ++am__fastdepCC_FALSE='' ++am__fastdepCC_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='${datarootdir}' ++datadir='/usr/share' + datarootdir='${prefix}/share' + docdir='${datarootdir}/doc/${PACKAGE}' + dvidir='${docdir}' + 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' + htmldir='${docdir}' + includedir='${prefix}/include' + infodir='${datarootdir}/info' +-install_sh='/home/jonas/tmsnc/install-sh' ++install_sh='/home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/install-sh' + libdir='${exec_prefix}/lib' +-libexecdir='${exec_prefix}/libexec' ++libexecdir='/usr/sbin' + localedir='${datarootdir}/locale' +-localstatedir='${prefix}/var' +-mandir='${datarootdir}/man' ++localstatedir='/var' ++mandir='/usr/share/man' + mkdir_p='mkdir -p --' + oldincludedir='/usr/include' + pdfdir='${docdir}' +-prefix='/usr/local' +-program_transform_name='s,x,x,' ++prefix='/usr' ++program_transform_name='s&$$&&;s&^&&' + psdir='${docdir}' + sbindir='${exec_prefix}/sbin' + sharedstatedir='${prefix}/com' +-sysconfdir='${prefix}/etc' +-target_alias='' ++sysconfdir='/etc' ++target_alias='i586-linux' + tmsnc_VERSION='0.3.2' + + ## ----------- ## +@@ -686,8 +730,8 @@ tmsnc_VERSION='0.3.2' + #define HAVE_STDINT_H 1 + #define HAVE_UNISTD_H 1 + #define TIME_WITH_SYS_TIME 1 +-#define HAS_CURSES 1 + #define USE_NCURSES 1 ++#define HAS_CURSES 1 + #define HAVE_USE_DEFAULT_COLORS 1 + #define HAVE_RESIZETERM 1 + #define HAVE_RESIZE_TERM 1 +@@ -696,21 +740,3 @@ tmsnc_VERSION='0.3.2' + #define HAVE_OPENSSL 1 + + configure: exit 0 +- +-## ---------------------- ## +-## Running config.status. ## +-## ---------------------- ## +- +-This file was extended by config.status, which was +-generated by GNU Autoconf 2.60a. Invocation command line was +- +- CONFIG_FILES = +- CONFIG_HEADERS = +- CONFIG_LINKS = +- CONFIG_COMMANDS = +- $ ./config.status src/config.h +- +-on prophet +- +-config.status:646: creating src/config.h +-config.status:875: src/config.h is unchanged diff --git a/package/tmsnc/patches/patch-config_status b/package/tmsnc/patches/patch-config_status new file mode 100644 index 000000000..36bd2d279 --- /dev/null +++ b/package/tmsnc/patches/patch-config_status @@ -0,0 +1,223 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- tmsnc-0.3.2.orig/config.status 2006-10-17 13:14:22.000000000 +0200 ++++ tmsnc-0.3.2/config.status 2009-06-02 01:13:53.000000000 +0200 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # Generated by configure. + # Run this file to recreate the current configuration. + # Compiler output produced by configure, useful for debugging +@@ -7,7 +7,7 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false +-SHELL=${CONFIG_SHELL-/bin/sh} ++SHELL=${CONFIG_SHELL-/bin/bash} + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## +@@ -321,14 +321,14 @@ Report bugs to <bug-autoconf@gnu.org>." + + ac_cs_version="\ + config.status +-configured by ./configure, generated by GNU Autoconf 2.60a, +- with options \"\" ++configured by /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/configure, generated by GNU Autoconf 2.60a, ++ with options \"'--build=x86_64-linux-gnu' '--host=i586-linux' '--target=i586-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/sbin' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-debug' '--enable-ipv6' '--with-libiconv-prefix=/home/wbx/alix1c/openadk/cross_i586/target/usr' '--with-openssl=/home/wbx/alix1c/openadk/cross_i586/target/usr' '--with-ncurses=/home/wbx/alix1c/openadk/cross_i586/target' 'build_alias=x86_64-linux-gnu' 'host_alias=i586-linux' 'target_alias=i586-linux' 'CC=/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc' 'CFLAGS=-fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib' 'CPPFLAGS=-I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG'\" + + Copyright (C) 2006 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +-ac_pwd='/home/jonas/tmsnc' ++ac_pwd='/home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2' + srcdir='.' + INSTALL='/usr/bin/install -c' + # If no file are specified by the user, then we need to provide default +@@ -396,10 +396,10 @@ if $ac_cs_silent; then + fi + + if $ac_cs_recheck; then +- echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " $ac_configure_extra_args " --no-create --no-recursion" >&6 +- CONFIG_SHELL=/bin/sh ++ echo "running CONFIG_SHELL=/bin/bash /bin/bash /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/configure " '--build=x86_64-linux-gnu' '--host=i586-linux' '--target=i586-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/sbin' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-debug' '--enable-ipv6' '--with-libiconv-prefix=/home/wbx/alix1c/openadk/cross_i586/target/usr' '--with-openssl=/home/wbx/alix1c/openadk/cross_i586/target/usr' '--with-ncurses=/home/wbx/alix1c/openadk/cross_i586/target' 'build_alias=x86_64-linux-gnu' 'host_alias=i586-linux' 'target_alias=i586-linux' 'CC=/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc' 'CFLAGS=-fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib' 'CPPFLAGS=-I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG' $ac_configure_extra_args " --no-create --no-recursion" >&6 ++ CONFIG_SHELL=/bin/bash + export CONFIG_SHELL +- exec /bin/sh "./configure" $ac_configure_extra_args --no-create --no-recursion ++ exec /bin/bash "/home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/configure" '--build=x86_64-linux-gnu' '--host=i586-linux' '--target=i586-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/sbin' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-debug' '--enable-ipv6' '--with-libiconv-prefix=/home/wbx/alix1c/openadk/cross_i586/target/usr' '--with-openssl=/home/wbx/alix1c/openadk/cross_i586/target/usr' '--with-ncurses=/home/wbx/alix1c/openadk/cross_i586/target' 'build_alias=x86_64-linux-gnu' 'host_alias=i586-linux' 'target_alias=i586-linux' 'CC=/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc' 'CFLAGS=-fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib' 'CPPFLAGS=-I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG' $ac_configure_extra_args --no-create --no-recursion + fi + + exec 5>>config.log +@@ -414,7 +414,7 @@ _ASBOX + # + # INIT-COMMANDS + # +-AMDEP_TRUE="" ac_aux_dir="." ++AMDEP_TRUE="#" ac_aux_dir="." + + + # Handling of arguments. +@@ -484,7 +484,7 @@ if test -n "$CONFIG_FILES"; then + + cat >"$tmp/subs-1.sed" <<\CEOF + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s,@SHELL@,|#_!!_#|/bin/sh,g ++s,@SHELL@,|#_!!_#|/bin/bash,g + s,@PATH_SEPARATOR@,|#_!!_#|:,g + s,@PACKAGE_NAME@,|#_!!_#|,g + s,@PACKAGE_TARNAME@,|#_!!_#|,g +@@ -492,16 +492,16 @@ s,@PACKAGE_VERSION@,|#_!!_#|,g + s,@PACKAGE_STRING@,|#_!!_#|,g + s,@PACKAGE_BUGREPORT@,|#_!!_#|,g + s,@exec_prefix@,|#_!!_#|${prefix},g +-s,@prefix@,|#_!!_#|/usr/local,g +-s,@program_transform_name@,|#_!!_#|s\,x\,x\,,g ++s,@prefix@,|#_!!_#|/usr,g ++s,@program_transform_name@,|#_!!_#|s\&$$\&\&;s\&^\&\&,g + s,@bindir@,|#_!!_#|${exec_prefix}/bin,g + s,@sbindir@,|#_!!_#|${exec_prefix}/sbin,g +-s,@libexecdir@,|#_!!_#|${exec_prefix}/libexec,g ++s,@libexecdir@,|#_!!_#|/usr/sbin,g + s,@datarootdir@,|#_!!_#|${prefix}/share,g +-s,@datadir@,|#_!!_#|${datarootdir},g +-s,@sysconfdir@,|#_!!_#|${prefix}/etc,g ++s,@datadir@,|#_!!_#|/usr/share,g ++s,@sysconfdir@,|#_!!_#|/etc,g + s,@sharedstatedir@,|#_!!_#|${prefix}/com,g +-s,@localstatedir@,|#_!!_#|${prefix}/var,g ++s,@localstatedir@,|#_!!_#|/var,g + s,@includedir@,|#_!!_#|${prefix}/include,g + s,@oldincludedir@,|#_!!_#|/usr/include,g + s,@docdir@,|#_!!_#|${datarootdir}/doc/${PACKAGE},g +@@ -512,15 +512,15 @@ s,@pdfdir@,|#_!!_#|${docdir},g + s,@psdir@,|#_!!_#|${docdir},g + s,@libdir@,|#_!!_#|${exec_prefix}/lib,g + s,@localedir@,|#_!!_#|${datarootdir}/locale,g +-s,@mandir@,|#_!!_#|${datarootdir}/man,g ++s,@mandir@,|#_!!_#|/usr/share/man,g + s,@DEFS@,|#_!!_#|-DHAVE_CONFIG_H,g + s,@ECHO_C@,|#_!!_#|,g + s,@ECHO_N@,|#_!!_#|-n,g + s,@ECHO_T@,|#_!!_#|,g + s,@LIBS@,|#_!!_#|,g +-s,@build_alias@,|#_!!_#|,g +-s,@host_alias@,|#_!!_#|,g +-s,@target_alias@,|#_!!_#|,g ++s,@build_alias@,|#_!!_#|x86_64-linux-gnu,g ++s,@host_alias@,|#_!!_#|i586-linux,g ++s,@target_alias@,|#_!!_#|i586-linux,g + s,@tmsnc_VERSION@,|#_!!_#|0.3.2,g + s,@INSTALL_PROGRAM@,|#_!!_#|${INSTALL},g + s,@INSTALL_SCRIPT@,|#_!!_#|${INSTALL},g +@@ -528,56 +528,56 @@ s,@INSTALL_DATA@,|#_!!_#|${INSTALL} -m 6 + s,@CYGPATH_W@,|#_!!_#|echo,g + s,@PACKAGE@,|#_!!_#|tmsnc,g + s,@VERSION@,|#_!!_#|0.3.2,g +-s,@ACLOCAL@,|#_!!_#|${SHELL} /home/jonas/tmsnc/missing --run aclocal-1.9,g +-s,@AUTOCONF@,|#_!!_#|${SHELL} /home/jonas/tmsnc/missing --run autoconf,g +-s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/jonas/tmsnc/missing --run automake-1.9,g +-s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/jonas/tmsnc/missing --run autoheader,g +-s,@MAKEINFO@,|#_!!_#|${SHELL} /home/jonas/tmsnc/missing --run makeinfo,g +-s,@install_sh@,|#_!!_#|/home/jonas/tmsnc/install-sh,g +-s,@STRIP@,|#_!!_#|,g ++s,@ACLOCAL@,|#_!!_#|${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run aclocal-1.9,g ++s,@AUTOCONF@,|#_!!_#|${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run autoconf,g ++s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run automake-1.9,g ++s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run autoheader,g ++s,@MAKEINFO@,|#_!!_#|${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run makeinfo,g ++s,@install_sh@,|#_!!_#|/home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/install-sh,g ++s,@STRIP@,|#_!!_#|i586-linux-strip,g + s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|${SHELL} $(install_sh) -c -s,g + s,@mkdir_p@,|#_!!_#|mkdir -p --,g +-s,@AWK@,|#_!!_#|mawk,g ++s,@AWK@,|#_!!_#|gawk,g + s,@SET_MAKE@,|#_!!_#|,g + s,@am__leading_dot@,|#_!!_#|.,g +-s,@AMTAR@,|#_!!_#|${SHELL} /home/jonas/tmsnc/missing --run tar,g ++s,@AMTAR@,|#_!!_#|${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run tar,g + s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g + s,@am__untar@,|#_!!_#|${AMTAR} xf -,g +-s,@CC@,|#_!!_#|gcc,g +-s,@CFLAGS@,|#_!!_#|-g -O2,g +-s,@LDFLAGS@,|#_!!_#|,g +-s,@CPPFLAGS@,|#_!!_#|,g +-s,@ac_ct_CC@,|#_!!_#|gcc,g ++s,@CC@,|#_!!_#|/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc,g ++s,@CFLAGS@,|#_!!_#|-fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all,g ++s,@LDFLAGS@,|#_!!_#|-Wl\,-O2 -Wl\,-rpath -Wl\,/usr/lib -Wl\,-rpath-link -Wl\,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib,g ++s,@CPPFLAGS@,|#_!!_#|-I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG,g ++s,@ac_ct_CC@,|#_!!_#|,g + s,@EXEEXT@,|#_!!_#|,g + s,@OBJEXT@,|#_!!_#|o,g + s,@DEPDIR@,|#_!!_#|.deps,g + s,@am__include@,|#_!!_#|include,g + s,@am__quote@,|#_!!_#|,g +-s,@AMDEP_TRUE@,|#_!!_#|,g +-s,@AMDEP_FALSE@,|#_!!_#|#,g +-s,@AMDEPBACKSLASH@,|#_!!_#|\\,g +-s,@CCDEPMODE@,|#_!!_#|depmode=gcc3,g +-s,@am__fastdepCC_TRUE@,|#_!!_#|,g +-s,@am__fastdepCC_FALSE@,|#_!!_#|#,g +-s,@CPP@,|#_!!_#|gcc -E,g ++s,@AMDEP_TRUE@,|#_!!_#|#,g ++s,@AMDEP_FALSE@,|#_!!_#|,g ++s,@AMDEPBACKSLASH@,|#_!!_#|,g ++s,@CCDEPMODE@,|#_!!_#|depmode=none,g ++s,@am__fastdepCC_TRUE@,|#_!!_#|#,g ++s,@am__fastdepCC_FALSE@,|#_!!_#|,g ++s,@CPP@,|#_!!_#|/home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E,g + s,@GREP@,|#_!!_#|/bin/grep,g + s,@EGREP@,|#_!!_#|/bin/grep -E,g +-s,@CURSES_LIBS@,|#_!!_#|-lncurses -lpanel -lform,g +-s,@CURSES_INCLUDEDIR@,|#_!!_#|,g +-s,@build@,|#_!!_#|i686-pc-linux-gnu,g +-s,@build_cpu@,|#_!!_#|i686,g ++s,@CURSES_LIBS@,|#_!!_#| -L/home/wbx/alix1c/openadk/cross_i586/target/lib -lncurses -lpanel -lform,g ++s,@CURSES_INCLUDEDIR@,|#_!!_#|-I/home/wbx/alix1c/openadk/cross_i586/target/include -DRENAMED_NCURSES,g ++s,@build@,|#_!!_#|x86_64-pc-linux-gnu,g ++s,@build_cpu@,|#_!!_#|x86_64,g + s,@build_vendor@,|#_!!_#|pc,g + s,@build_os@,|#_!!_#|linux-gnu,g +-s,@host@,|#_!!_#|i686-pc-linux-gnu,g +-s,@host_cpu@,|#_!!_#|i686,g ++s,@host@,|#_!!_#|i586-pc-linux-gnu,g ++s,@host_cpu@,|#_!!_#|i586,g + s,@host_vendor@,|#_!!_#|pc,g + s,@host_os@,|#_!!_#|linux-gnu,g +-s,@LIBICONV@,|#_!!_#|,g +-s,@LTLIBICONV@,|#_!!_#|,g ++s,@LIBICONV@,|#_!!_#|/home/wbx/alix1c/openadk/cross_i586/target/usr/lib/libiconv.so -Wl\,-rpath -Wl\,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib,g ++s,@LTLIBICONV@,|#_!!_#|-L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -liconv -R/home/wbx/alix1c/openadk/cross_i586/target/usr/lib,g + s,@OPENSSL_TRUE@,|#_!!_#|,g + s,@OPENSSL_FALSE@,|#_!!_#|#,g +-s,@SSLINC@,|#_!!_#|,g +-s,@SSLLIB@,|#_!!_#|-lssl -lcrypto,g ++s,@SSLINC@,|#_!!_#|-I/home/wbx/alix1c/openadk/cross_i586/target/usr/include,g ++s,@SSLLIB@,|#_!!_#|-L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -lssl -lcrypto,g + s,@TALKFILTERS_TRUE@,|#_!!_#|#,g + s,@TALKFILTERS_FALSE@,|#_!!_#|,g + s,@TFLIB@,|#_!!_#|,g +@@ -781,11 +781,11 @@ case `sed -n '/datarootdir/ { + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + ac_datarootdir_hack=' +- s&@datadir@&${datarootdir}&g ++ s&@datadir@&/usr/share&g + s&@docdir@&${datarootdir}/doc/${PACKAGE}&g + s&@infodir@&${datarootdir}/info&g + s&@localedir@&${datarootdir}/locale&g +- s&@mandir@&${datarootdir}/man&g ++ s&@mandir@&/usr/share/man&g + s&\${datarootdir}&${prefix}/share&g' ;; + esac + sed "/^[ ]*VPATH[ ]*=/{ +@@ -855,8 +855,8 @@ s,^\([ #]*\)[^ ]*\([ ]*HAVE_INTTYPES_ + s,^\([ #]*\)[^ ]*\([ ]*HAVE_STDINT_H\)[ (].*,\1define\2 1 , + s,^\([ #]*\)[^ ]*\([ ]*HAVE_UNISTD_H\)[ (].*,\1define\2 1 , + s,^\([ #]*\)[^ ]*\([ ]*TIME_WITH_SYS_TIME\)[ (].*,\1define\2 1 , +-s,^\([ #]*\)[^ ]*\([ ]*HAS_CURSES\)[ (].*,\1define\2 1 , + s,^\([ #]*\)[^ ]*\([ ]*USE_NCURSES\)[ (].*,\1define\2 1 , ++s,^\([ #]*\)[^ ]*\([ ]*HAS_CURSES\)[ (].*,\1define\2 1 , + s,^\([ #]*\)[^ ]*\([ ]*HAVE_USE_DEFAULT_COLORS\)[ (].*,\1define\2 1 , + s,^\([ #]*\)[^ ]*\([ ]*HAVE_RESIZETERM\)[ (].*,\1define\2 1 , + s,^\([ #]*\)[^ ]*\([ ]*HAVE_RESIZE_TERM\)[ (].*,\1define\2 1 , diff --git a/package/tmsnc/patches/patch-doc_Makefile b/package/tmsnc/patches/patch-doc_Makefile new file mode 100644 index 000000000..6e072edeb --- /dev/null +++ b/package/tmsnc/patches/patch-doc_Makefile @@ -0,0 +1,149 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- tmsnc-0.3.2.orig/doc/Makefile 2006-10-17 13:14:22.000000000 +0200 ++++ tmsnc-0.3.2/doc/Makefile 2009-06-02 01:13:54.000000000 +0200 +@@ -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 +@@ -52,21 +52,21 @@ am__installdirs = "$(DESTDIR)$(man1dir)" + NROFF = nroff + MANS = $(man_MANS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /home/jonas/tmsnc/missing --run aclocal-1.9 +-AMDEP_FALSE = # +-AMDEP_TRUE = +-AMTAR = ${SHELL} /home/jonas/tmsnc/missing --run tar +-AUTOCONF = ${SHELL} /home/jonas/tmsnc/missing --run autoconf +-AUTOHEADER = ${SHELL} /home/jonas/tmsnc/missing --run autoheader +-AUTOMAKE = ${SHELL} /home/jonas/tmsnc/missing --run automake-1.9 +-AWK = mawk +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CPP = gcc -E +-CPPFLAGS = +-CURSES_INCLUDEDIR = +-CURSES_LIBS = -lncurses -lpanel -lform ++ACLOCAL = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run aclocal-1.9 ++AMDEP_FALSE = ++AMDEP_TRUE = # ++AMTAR = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run tar ++AUTOCONF = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run autoconf ++AUTOHEADER = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run autoheader ++AUTOMAKE = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run automake-1.9 ++AWK = gawk ++CC = /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc ++CCDEPMODE = depmode=none ++CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all ++CPP = /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E ++CPPFLAGS = -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG ++CURSES_INCLUDEDIR = -I/home/wbx/alix1c/openadk/cross_i586/target/include -DRENAMED_NCURSES ++CURSES_LIBS = -L/home/wbx/alix1c/openadk/cross_i586/target/lib -lncurses -lpanel -lform + CYGPATH_W = echo + DEFS = -DHAVE_CONFIG_H + DEPDIR = .deps +@@ -80,13 +80,13 @@ INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_PROGRAM = ${INSTALL} + INSTALL_SCRIPT = ${INSTALL} + INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +-LDFLAGS = +-LIBICONV = ++LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib ++LIBICONV = /home/wbx/alix1c/openadk/cross_i586/target/usr/lib/libiconv.so -Wl,-rpath -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib + LIBOBJS = + LIBS = +-LTLIBICONV = ++LTLIBICONV = -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -liconv -R/home/wbx/alix1c/openadk/cross_i586/target/usr/lib + LTLIBOBJS = +-MAKEINFO = ${SHELL} /home/jonas/tmsnc/missing --run makeinfo ++MAKEINFO = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run makeinfo + OBJEXT = o + OPENSSL_FALSE = # + OPENSSL_TRUE = +@@ -98,57 +98,57 @@ PACKAGE_TARNAME = + PACKAGE_VERSION = + PATH_SEPARATOR = : + SET_MAKE = +-SHELL = /bin/sh +-SSLINC = +-SSLLIB = -lssl -lcrypto +-STRIP = ++SHELL = /bin/bash ++SSLINC = -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include ++SSLLIB = -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -lssl -lcrypto ++STRIP = i586-linux-strip + TALKFILTERS_FALSE = + TALKFILTERS_TRUE = # + TFLIB = + VERSION = 0.3.2 +-ac_ct_CC = gcc +-am__fastdepCC_FALSE = # +-am__fastdepCC_TRUE = ++ac_ct_CC = ++am__fastdepCC_FALSE = ++am__fastdepCC_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 = ${datarootdir} ++datadir = /usr/share + datarootdir = ${prefix}/share + docdir = ${datarootdir}/doc/${PACKAGE} + dvidir = ${docdir} + 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 + htmldir = ${docdir} + includedir = ${prefix}/include + infodir = ${datarootdir}/info +-install_sh = /home/jonas/tmsnc/install-sh ++install_sh = /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/install-sh + libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec ++libexecdir = /usr/sbin + localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man ++localstatedir = /var ++mandir = /usr/share/man + mkdir_p = mkdir -p -- + oldincludedir = /usr/include + pdfdir = ${docdir} +-prefix = /usr/local +-program_transform_name = s,x,x, ++prefix = /usr ++program_transform_name = s&$$&&;s&^&& + psdir = ${docdir} + sbindir = ${exec_prefix}/sbin + sharedstatedir = ${prefix}/com +-sysconfdir = ${prefix}/etc +-target_alias = ++sysconfdir = /etc ++target_alias = i586-linux + tmsnc_VERSION = 0.3.2 + man_MANS = tmsnc.1 + EXTRA_DIST = tmsnc.1 diff --git a/package/tmsnc/patches/patch-src_Makefile b/package/tmsnc/patches/patch-src_Makefile new file mode 100644 index 000000000..f6ac328e1 --- /dev/null +++ b/package/tmsnc/patches/patch-src_Makefile @@ -0,0 +1,219 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- tmsnc-0.3.2.orig/src/Makefile 2006-10-17 13:14:22.000000000 +0200 ++++ tmsnc-0.3.2/src/Makefile 2009-06-02 01:13:54.000000000 +0200 +@@ -35,8 +35,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 + bin_PROGRAMS = tmsnc$(EXEEXT) + subdir = src + DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ +@@ -74,21 +74,21 @@ HEADERS = $(noinst_HEADERS) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /home/jonas/tmsnc/missing --run aclocal-1.9 +-AMDEP_FALSE = # +-AMDEP_TRUE = +-AMTAR = ${SHELL} /home/jonas/tmsnc/missing --run tar +-AUTOCONF = ${SHELL} /home/jonas/tmsnc/missing --run autoconf +-AUTOHEADER = ${SHELL} /home/jonas/tmsnc/missing --run autoheader +-AUTOMAKE = ${SHELL} /home/jonas/tmsnc/missing --run automake-1.9 +-AWK = mawk +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CPP = gcc -E +-CPPFLAGS = +-CURSES_INCLUDEDIR = +-CURSES_LIBS = -lncurses -lpanel -lform ++ACLOCAL = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run aclocal-1.9 ++AMDEP_FALSE = ++AMDEP_TRUE = # ++AMTAR = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run tar ++AUTOCONF = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run autoconf ++AUTOHEADER = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run autoheader ++AUTOMAKE = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run automake-1.9 ++AWK = gawk ++CC = /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc ++CCDEPMODE = depmode=none ++CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all ++CPP = /home/wbx/alix1c/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E ++CPPFLAGS = -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -DNDEBUG ++CURSES_INCLUDEDIR = -I/home/wbx/alix1c/openadk/cross_i586/target/include -DRENAMED_NCURSES ++CURSES_LIBS = -L/home/wbx/alix1c/openadk/cross_i586/target/lib -lncurses -lpanel -lform + CYGPATH_W = echo + DEFS = -DHAVE_CONFIG_H + DEPDIR = .deps +@@ -102,13 +102,13 @@ INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_PROGRAM = ${INSTALL} + INSTALL_SCRIPT = ${INSTALL} + INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +-LDFLAGS = +-LIBICONV = ++LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib ++LIBICONV = /home/wbx/alix1c/openadk/cross_i586/target/usr/lib/libiconv.so -Wl,-rpath -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib + LIBOBJS = + LIBS = +-LTLIBICONV = ++LTLIBICONV = -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -liconv -R/home/wbx/alix1c/openadk/cross_i586/target/usr/lib + LTLIBOBJS = +-MAKEINFO = ${SHELL} /home/jonas/tmsnc/missing --run makeinfo ++MAKEINFO = ${SHELL} /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/missing --run makeinfo + OBJEXT = o + OPENSSL_FALSE = # + OPENSSL_TRUE = +@@ -120,60 +120,60 @@ PACKAGE_TARNAME = + PACKAGE_VERSION = + PATH_SEPARATOR = : + SET_MAKE = +-SHELL = /bin/sh +-SSLINC = +-SSLLIB = -lssl -lcrypto +-STRIP = ++SHELL = /bin/bash ++SSLINC = -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include ++SSLLIB = -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -lssl -lcrypto ++STRIP = i586-linux-strip + TALKFILTERS_FALSE = + TALKFILTERS_TRUE = # + TFLIB = + VERSION = 0.3.2 +-ac_ct_CC = gcc +-am__fastdepCC_FALSE = # +-am__fastdepCC_TRUE = ++ac_ct_CC = ++am__fastdepCC_FALSE = ++am__fastdepCC_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 = ${datarootdir} ++datadir = /usr/share + datarootdir = ${prefix}/share + docdir = ${datarootdir}/doc/${PACKAGE} + dvidir = ${docdir} + 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 + htmldir = ${docdir} + includedir = ${prefix}/include + infodir = ${datarootdir}/info +-install_sh = /home/jonas/tmsnc/install-sh ++install_sh = /home/wbx/alix1c/openadk/build_i586/w-tmsnc-0.3.2-1/tmsnc-0.3.2/install-sh + libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec ++libexecdir = /usr/sbin + localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man ++localstatedir = /var ++mandir = /usr/share/man + mkdir_p = mkdir -p -- + oldincludedir = /usr/include + pdfdir = ${docdir} +-prefix = /usr/local +-program_transform_name = s,x,x, ++prefix = /usr ++program_transform_name = s&$$&&;s&^&& + psdir = ${docdir} + sbindir = ${exec_prefix}/sbin + sharedstatedir = ${prefix}/com +-sysconfdir = ${prefix}/etc +-target_alias = ++sysconfdir = /etc ++target_alias = i586-linux + tmsnc_VERSION = 0.3.2 +-LDADD = -lssl -lcrypto -lncurses -lpanel -lform +-INCLUDES = ++LDADD = -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -lssl -lcrypto -L/home/wbx/alix1c/openadk/cross_i586/target/lib -lncurses -lpanel -lform /home/wbx/alix1c/openadk/cross_i586/target/usr/lib/libiconv.so -Wl,-rpath -Wl,/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -L/home/wbx/alix1c/openadk/cross_i586/target/usr/lib -liconv -R/home/wbx/alix1c/openadk/cross_i586/target/usr/lib ++INCLUDES = -I/home/wbx/alix1c/openadk/cross_i586/target/usr/include -I/home/wbx/alix1c/openadk/cross_i586/target/include -DRENAMED_NCURSES + AM_CFLAGS = -Wall + tmsnc_SOURCES = misc.c main.c conf.c login.c sig.c menu.c ui.c list.c charset.c core_misc.c core_net.c core_ssl.c core_p2p.c dialog.c filters.c event.c debug.c + noinst_HEADERS = misc.h main.h conf.h login.h sig.h menu.h ui.h list.h charset.h core_misc.h core_net.h core_ssl.h core_p2p.h core.h dialog.h filters.h event.h +@@ -261,37 +261,37 @@ mostlyclean-compile: + distclean-compile: + -rm -f *.tab.c + +-include ./$(DEPDIR)/charset.Po +-include ./$(DEPDIR)/conf.Po +-include ./$(DEPDIR)/core_misc.Po +-include ./$(DEPDIR)/core_net.Po +-include ./$(DEPDIR)/core_p2p.Po +-include ./$(DEPDIR)/core_ssl.Po +-include ./$(DEPDIR)/debug.Po +-include ./$(DEPDIR)/dialog.Po +-include ./$(DEPDIR)/event.Po +-include ./$(DEPDIR)/filters.Po +-include ./$(DEPDIR)/list.Po +-include ./$(DEPDIR)/login.Po +-include ./$(DEPDIR)/main.Po +-include ./$(DEPDIR)/menu.Po +-include ./$(DEPDIR)/misc.Po +-include ./$(DEPDIR)/sig.Po +-include ./$(DEPDIR)/ui.Po ++#include ./$(DEPDIR)/charset.Po ++#include ./$(DEPDIR)/conf.Po ++#include ./$(DEPDIR)/core_misc.Po ++#include ./$(DEPDIR)/core_net.Po ++#include ./$(DEPDIR)/core_p2p.Po ++#include ./$(DEPDIR)/core_ssl.Po ++#include ./$(DEPDIR)/debug.Po ++#include ./$(DEPDIR)/dialog.Po ++#include ./$(DEPDIR)/event.Po ++#include ./$(DEPDIR)/filters.Po ++#include ./$(DEPDIR)/list.Po ++#include ./$(DEPDIR)/login.Po ++#include ./$(DEPDIR)/main.Po ++#include ./$(DEPDIR)/menu.Po ++#include ./$(DEPDIR)/misc.Po ++#include ./$(DEPDIR)/sig.Po ++#include ./$(DEPDIR)/ui.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) '$<'` + uninstall-info-am: + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) diff --git a/package/tmsnc/patches/patch-src_core_h b/package/tmsnc/patches/patch-src_core_h new file mode 100644 index 000000000..d694f3884 --- /dev/null +++ b/package/tmsnc/patches/patch-src_core_h @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- tmsnc-0.3.2.orig/src/core.h 2006-10-17 13:09:56.000000000 +0200 ++++ tmsnc-0.3.2/src/core.h 2009-06-02 01:17:44.000000000 +0200 +@@ -108,7 +108,7 @@ unsigned int swapInt(unsigned int); + unsigned long long swapLongLong(unsigned long long); + int wait_for_input(int, unsigned int); + char *split(char *, char, int); +-int getline(char *, int, int); ++int getline2(char *, int, int); + + /* ssl.c */ + int https_auth(char *, int, char *, char *, char *, char *, char *, int, diff --git a/package/tmsnc/patches/patch-src_core_misc_c b/package/tmsnc/patches/patch-src_core_misc_c new file mode 100644 index 000000000..6665c901c --- /dev/null +++ b/package/tmsnc/patches/patch-src_core_misc_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- tmsnc-0.3.2.orig/src/core_misc.c 2006-10-17 13:09:56.000000000 +0200 ++++ tmsnc-0.3.2/src/core_misc.c 2009-06-02 01:16:59.000000000 +0200 +@@ -246,7 +246,7 @@ MSN_free_contact(contact) + * require a (FILE *) pointer + */ + int +-getline(str, size, sd) ++getline2(str, size, sd) + char *str; + int size; + int sd; diff --git a/package/tmsnc/patches/patch-src_core_net_c b/package/tmsnc/patches/patch-src_core_net_c new file mode 100644 index 000000000..ed4fe1adb --- /dev/null +++ b/package/tmsnc/patches/patch-src_core_net_c @@ -0,0 +1,48 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- tmsnc-0.3.2.orig/src/core_net.c 2006-10-17 13:09:56.000000000 +0200 ++++ tmsnc-0.3.2/src/core_net.c 2009-06-02 01:17:33.000000000 +0200 +@@ -240,7 +240,7 @@ MSN_conversation_handle(sd, num_ppl, mes + #endif + + memset(buf, 0x0, sizeof(buf)); +- if (getline(buf, sizeof(buf) - 1, sd) > 0) { ++ if (getline2(buf, sizeof(buf) - 1, sd) > 0) { + #ifdef DEBUG + debug_log("sb %d: %s", sd, buf); + #endif +@@ -278,7 +278,7 @@ MSN_conversation_handle(sd, num_ppl, mes + + header_len = 0; + +- while ((i = getline(buf, sizeof(buf) - 1, sd)) > 0) { ++ while ((i = getline2(buf, sizeof(buf) - 1, sd)) > 0) { + header_len += i; + #ifdef DEBUG + debug_log("sb %d: %s", sd, buf); +@@ -745,7 +745,7 @@ MSN_server_handle(session, message, mess + return -1; + timestamp = tm; + } +- while (getline(buf, sizeof(buf) - 1, session->sd) > 0) { ++ while (getline2(buf, sizeof(buf) - 1, session->sd) > 0) { + #ifdef HAVE_ICONV + strncpy(tr_buf, buf, sizeof(tr_buf) - 1); + convert_from_utf8(tr_buf, sizeof(tr_buf), buf, sizeof(buf)); +@@ -1161,7 +1161,7 @@ MSN_load_userlist(session, cb) + if (send(session->sd, buf, strlen(buf), 0) == 0) + return -1; + +- if (getline(buf, sizeof(buf) - 1, session->sd) < 0) ++ if (getline2(buf, sizeof(buf) - 1, session->sd) < 0) + return -1; + + if ((ptr = split(buf, ' ', 4)) == NULL) +@@ -1191,7 +1191,7 @@ MSN_load_userlist(session, cb) + + i = 0; + while (i < session->num_contacts) { +- if (getline(buf, sizeof(buf) - 1, session->sd) < 0) ++ if (getline2(buf, sizeof(buf) - 1, session->sd) < 0) + return -1; + + /* diff --git a/package/tmsnc/patches/patch-src_misc_c b/package/tmsnc/patches/patch-src_misc_c new file mode 100644 index 000000000..c3789a5a9 --- /dev/null +++ b/package/tmsnc/patches/patch-src_misc_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- tmsnc-0.3.2.orig/src/misc.c 2006-10-17 13:09:56.000000000 +0200 ++++ tmsnc-0.3.2/src/misc.c 2009-06-02 01:16:30.000000000 +0200 +@@ -126,7 +126,7 @@ UI_check_for_updates(void) + "Host: tmsnc.sourceforge.net\r\n\r\n", 59, 0) < 0) + UI_err_exit("Couldn't send HTTP request"); + +- while (getline(buf, sizeof(buf) - 1, sd) > 0) { ++ while (getline2(buf, sizeof(buf) - 1, sd) > 0) { + buf[strlen(buf) - 1] = 0x0; + if (strncmp(buf, "Version", 7) == 0) { + if (strcmp(&buf[9], VERSION) == 0) { diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index 59c45ed5c..1358e58e6 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/tor/Makefile b/package/tor/Makefile index 62d13315e..cf952da0d 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile index ce84a3661..d0d0dde3a 100644 --- a/package/trafshow/Makefile +++ b/package/trafshow/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ttcp/Makefile b/package/ttcp/Makefile index 6eec264c6..81f8daae2 100644 --- a/package/ttcp/Makefile +++ b/package/ttcp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index 59a87ba5d..d2691a9a4 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index 707d62b4a..5fc4bab62 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/udev/Makefile b/package/udev/Makefile index 4a8a94800..dd7a8c2fe 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile index cc2366dd2..cae0bb095 100644 --- a/package/udp-broadcast-relay/Makefile +++ b/package/udp-broadcast-relay/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index f57d35499..25da8ecdd 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile index 50c925241..cd8d7c0c4 100644 --- a/package/updatedd/Makefile +++ b/package/updatedd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index d9d058733..8e032cc0e 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile index 2c656732a..c62f5a885 100644 --- a/package/ussp-push/Makefile +++ b/package/ussp-push/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/ustl/Makefile b/package/ustl/Makefile index b560b57d2..8f9266c4b 100644 --- a/package/ustl/Makefile +++ b/package/ustl/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 570203887..ccf9e2677 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 5b84b7d9b..7c87147ed 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/valgrind/patches/patch-configure b/package/valgrind/patches/patch-configure new file mode 100644 index 000000000..07bea76d5 --- /dev/null +++ b/package/valgrind/patches/patch-configure @@ -0,0 +1,49 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- valgrind-3.3.1.orig/configure 2008-06-01 03:44:42.000000000 +0200 ++++ valgrind-3.3.1/configure 2009-06-02 01:32:59.000000000 +0200 +@@ -4637,6 +4637,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& + fi + rm -f conftest* + ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include <features.h> ++#ifdef __GNU_LIBRARY__ ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 10) ++ GLIBC_210 ++ #endif ++#endif ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "GLIBC_210" >/dev/null 2>&1; then ++ libc="2.10" ++fi ++rm -f conftest* ++ + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -4742,6 +4763,17 @@ _ACEOF + DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + ;; ++ 2.10) ++ echo "$as_me:$LINENO: result: 2.10 family" >&5 ++echo "${ECHO_T}2.10 family" >&6 ++ ++cat >>confdefs.h <<\_ACEOF ++#define GLIBC_2_10 1 ++_ACEOF ++ ++ DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ ;; + aix5) + echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5 + echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6 diff --git a/package/vgp/Makefile b/package/vgp/Makefile index db0d7e227..2b8651130 100755 --- a/package/vgp/Makefile +++ b/package/vgp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/videoproto/Makefile b/package/videoproto/Makefile index bae4b12ad..f85cc43d2 100644 --- a/package/videoproto/Makefile +++ b/package/videoproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile index 8bfcb84cd..f96ca2103 100644 --- a/package/vilistextum/Makefile +++ b/package/vilistextum/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/vim/Makefile b/package/vim/Makefile index 323b1acad..8aa47d59a 100644 --- a/package/vim/Makefile +++ b/package/vim/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile index eadbd309b..0e7bbd9be 100644 --- a/package/vnc-reflector/Makefile +++ b/package/vnc-reflector/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile index da4ef4a14..f273378dc 100644 --- a/package/vnstat/Makefile +++ b/package/vnstat/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile index dea887dd8..f38d055df 100644 --- a/package/vpnc/Makefile +++ b/package/vpnc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile index 863fc1012..e6b557eb5 100644 --- a/package/vrrpd/Makefile +++ b/package/vrrpd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 9cf34f1a7..2975d938d 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/vtun/Makefile b/package/vtun/Makefile index 215615074..513d6ccdc 100644 --- a/package/vtun/Makefile +++ b/package/vtun/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index 3c2d61a4c..1424b29fd 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile index 143545bf2..3997829ee 100644 --- a/package/wccpd/Makefile +++ b/package/wccpd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile index 5818e3b5c..744770fa1 100644 --- a/package/wdfs/Makefile +++ b/package/wdfs/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/weechat/Makefile b/package/weechat/Makefile index 9b2fef088..59529b51e 100644 --- a/package/weechat/Makefile +++ b/package/weechat/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile index e12bf91e5..1f318704f 100644 --- a/package/wifidog/Makefile +++ b/package/wifidog/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/wireless-firmware/Makefile b/package/wireless-firmware/Makefile index 5b719dd71..3d0999637 100644 --- a/package/wireless-firmware/Makefile +++ b/package/wireless-firmware/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/wol/Makefile b/package/wol/Makefile index 858e0cdfa..9279ba9e0 100644 --- a/package/wol/Makefile +++ b/package/wol/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile index fe0479e81..870e0ab61 100644 --- a/package/wondershaper/Makefile +++ b/package/wondershaper/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 0d079fa32..d1f8fd190 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/wput/Makefile b/package/wput/Makefile index e6d6aa7c4..cb25e10ae 100644 --- a/package/wput/Makefile +++ b/package/wput/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/xcmiscproto/Makefile b/package/xcmiscproto/Makefile index c31f476e8..e2d03147c 100644 --- a/package/xcmiscproto/Makefile +++ b/package/xcmiscproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile index 4a2dca0fd..2b64e48c6 100644 --- a/package/xextproto/Makefile +++ b/package/xextproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/xf86-video-geode/Config.in b/package/xf86-video-geode/Config.in index 1505d48f1..d809a8570 100644 --- a/package/xf86-video-geode/Config.in +++ b/package/xf86-video-geode/Config.in @@ -2,5 +2,6 @@ config ADK_PACKAGE_XF86_VIDEO_GEODE prompt "xf86-video-geode........................... X11 driver for AMD Geode" tristate default n + select ADK_PACKAGE_XORG_SERVER help http://www.x.org diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index 0c57d851f..bc5d87473 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -1,27 +1,28 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. include $(TOPDIR)/rules.mk PKG_NAME:= xf86-video-geode -PKG_VERSION:= 2.11.2 -PKG_RELEASE:= 1 -PKG_MD5SUM:= dc9cbe88f38f82e27dbfb66f9f99fc98 -MASTER_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ +PKG_VERSION:= 2.10.1 +PKG_RELEASE:= 2 +PKG_MD5SUM:= 4e331f6f608f23b64f0a5354908af09a +PKG_DESCR:= X11 driver for AMD Geode VGA chip +PKG_SECTION:= x11 +PKG_DEPENDS:= xorg-server +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers - ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \ + ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/geode_drv.so \ ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86-video-geode/ipkg/xf86-video-geode.control b/package/xf86-video-geode/ipkg/xf86-video-geode.control deleted file mode 100644 index 4c3537a0b..000000000 --- a/package/xf86-video-geode/ipkg/xf86-video-geode.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: xf86-video-geode -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/xf86dga/Makefile b/package/xf86dga/Makefile index 7ef8e58e7..cdb417476 100644 --- a/package/xf86dga/Makefile +++ b/package/xf86dga/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/xf86dgaproto/Makefile b/package/xf86dgaproto/Makefile index 78f2e5275..d3187b0ac 100644 --- a/package/xf86dgaproto/Makefile +++ b/package/xf86dgaproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 8350c5af6..bdb09fe91 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile index 2e92a4e7e..7f43eb508 100644 --- a/package/xinetd/Makefile +++ b/package/xinetd/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/xkbcomp/Config.in b/package/xkbcomp/Config.in new file mode 100644 index 000000000..f71cf8268 --- /dev/null +++ b/package/xkbcomp/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_XKBCOMP + prompt "xkbcomp........................... X11 keyboard compiler" + tristate + default n + help + http://www.x.org diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile new file mode 100644 index 000000000..ca3b8a9e2 --- /dev/null +++ b/package/xkbcomp/Makefile @@ -0,0 +1,26 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xkbcomp +PKG_VERSION:= 1.0.5 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 10e6661a35aa994a9aa73ded0cf70259 +PKG_DESCR:= x11 keyboard compiler +PKG_SECTION:= x11 +PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/everything/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XKBCOMP,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_XKBCOMP}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/xkbcomp ${IDIR_XKBCOMP}/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xkeyboard-config/Config.in b/package/xkeyboard-config/Config.in new file mode 100644 index 000000000..2abb16055 --- /dev/null +++ b/package/xkeyboard-config/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_XKEYBOARD_CONFIG + prompt "xkeyboard-config............................ X keyboard config" + tristate + default n + help + http://www.x.org diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile new file mode 100644 index 000000000..41f4fa786 --- /dev/null +++ b/package/xkeyboard-config/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xkeyboard-config +PKG_VERSION:= 1.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 889e6e10eb7449bf33a5423c40369da5 +PKG_DESCR:= X keyboard config +PKG_SECTION:= x11 +PKG_SITES:= http://xlibs.freedesktop.org/xkbdesc/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XKEYBOARD_CONFIG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE= gnu +BUILD_STYLE= auto +INSTALL_STYLE= auto + +post-install: + ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb + ${CP} ${WRKINST}/usr/share/X11/xkb/* ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb + rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.lst + rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.xml + rm -rf ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/symbols/sun_vndr + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/Config.in b/package/xorg-server/Config.in index b3dc66880..23dfc56a8 100644 --- a/package/xorg-server/Config.in +++ b/package/xorg-server/Config.in @@ -2,6 +2,10 @@ config ADK_PACKAGE_XORG_SERVER prompt "xorg-server............................... X server" tristate default n + select ADK_PACKAGE_XKBCOMP + select ADK_PACKAGE_LIBXV + select ADK_PACKAGE_XKEYBOARD_CONFIG + select ADK_PACKAGE_LIBOPENSSL select ADK_PACKAGE_LIBXKBFILE select ADK_PACKAGE_LIBX11 select ADK_PACKAGE_LIBICE @@ -17,5 +21,6 @@ config ADK_PACKAGE_XORG_SERVER select ADK_PACKAGE_LIBXT select ADK_PACKAGE_PIXMAN select ADK_PACKAGE_XF86DGA + select ADK_PACKAGE_LIBXXF86DGA help http://www.x.org diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 9dd2ed8ec..935195bdb 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -11,28 +9,52 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7aca5d0dc8b824d3dff6140e381e03df PKG_DESCR:= Xorg server PKG_SECTION:= x11 +PKG_DEPENDS:= libopenssl PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --disable-xinerama \ +CONFIGURE_ARGS+= \ + --enable-builtin-fonts \ + --enable-dga \ + --enable-xorg \ + --enable-xv \ + --disable-afb \ --disable-aiglx \ - --disable-dga \ + --disable-cfb \ + --disable-config-hal \ + --disable-cup \ + --disable-evi \ + --disable-dpms \ --disable-dri \ + --disable-dri2 \ + --disable-freetype \ --disable-glx \ - --disable-xnest \ - --disable-config-hal \ - --disable-xvfb \ + --disable-kdrive-vesa \ --disable-mfb \ - --disable-cfb \ - --disable-afb \ + --disable-xace \ --disable-xephyr \ + --disable-xevie \ + --disable-xf86bigfont \ + --disable-xf86misc \ + --disable-xf86vidmode \ + --disable-xfake \ + --disable-xfbdev \ + --disable-xinerama \ + --disable-xnest \ + --disable-xprint \ --disable-xsdl \ - --enable-builtin-fonts + --disable-xselinux \ + --disable-xcsecurity \ + --disable-xvfb \ + --disable-xvmc \ + --with-xkb-output=/tmp \ + --with-os-vendor=OpenADK \ + --with-vendor-web="http://www.openadk.org" BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/xproto/Makefile b/package/xproto/Makefile index 1b635568a..08ff2e22c 100644 --- a/package/xproto/Makefile +++ b/package/xproto/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile index 4e18b6c2f..7c9da8b86 100644 --- a/package/xtrans/Makefile +++ b/package/xtrans/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 4e3cc79cb..b67959549 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/package/zsh/Makefile b/package/zsh/Makefile index 258841595..89d977b91 100644 --- a/package/zsh/Makefile +++ b/package/zsh/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/scripts/create-image.sh b/scripts/create-image.sh index 13f7cacd5..fda269990 100755 --- a/scripts/create-image.sh +++ b/scripts/create-image.sh @@ -1,5 +1,4 @@ #!/bin/bash -# $Id$ grubinstall=1 @@ -77,11 +76,11 @@ fi printf "Generate qemu image\n" -$qimg create -f raw $1 200M +$qimg create -f raw $1 300M printf "Create partition and filesystem\n" $parted -s $1 mklabel msdos -$parted -s $1 mkpart primary ext2 0 200 +$parted -s $1 mkpart primary ext2 0 300 $parted -s $1 set 1 boot on $parted -s $1 mkfs 1 ext2 diff --git a/scripts/install.sh b/scripts/install.sh index 8f374e6b2..9baf4f428 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,29 +1,13 @@ #!/bin/sh -# $Id$ if [ $(id -u) -ne 0 ];then printf "Installation is only possible as root\n" exit 1 fi -cfgfs=1 -while getopts "n" option -do - case $option in - n) - cfgfs=0 - ;; - *) - printf "Option not recognized\n" - exit 1 - ;; - esac -done -shift $(($OPTIND - 1)) - printf "Checking if grub is installed" grub=$(which grub) -if [ -x $grub ];then +if [ ! -z $grub -a -x $grub ];then printf "...okay\n" else printf "...failed\n" @@ -33,7 +17,7 @@ fi printf "Checking if sfdisk is installed" sfdisk=$(which sfdisk) -if [ -x $sfdisk ];then +if [ ! -z $sfdisk -a -x $sfdisk ];then printf "...okay\n" else printf "...failed\n" @@ -43,7 +27,7 @@ fi printf "Checking if parted is installed" parted=$(which parted) -if [ -x $parted ];then +if [ ! -z $parted -a -x $parted ];then printf "...okay\n" else printf "...failed\n" @@ -53,7 +37,7 @@ fi printf "Checking if mke2fs is installed" mke2fs=$(which mke2fs) -if [ -x $mke2fs ];then +if [ ! -z $mke2fs -a -x $mke2fs ];then printf "...okay\n" else printf "...failed\n" @@ -63,15 +47,31 @@ fi printf "Checking if tune2fs is installed" tune2fs=$(which tune2fs) -if [ -x $tune2fs ];then +if [ ! -z $tune2fs -a -x $tune2fs ];then printf "...okay\n" else printf "...failed\n" exit 1 fi +cfgfs=1 +while getopts "n" option +do + case $option in + n) + cfgfs=0 + ;; + *) + printf "Option not recognized\n" + exit 1 + ;; + esac +done +shift $(($OPTIND - 1)) + + if [ -z $1 ];then - printf "Please give your compact flash device node as first parameter\n" + printf "Please give your compact flash or USB device as first parameter\n" exit 1 else if [ -z $2 ];then @@ -85,7 +85,7 @@ else exit 1 fi if [ -b $1 ];then - printf "Using $1 as CF disk for installation\n" + printf "Using $1 as CF/USB disk for installation\n" printf "This will destroy all data on $1, are you sure?\n" printf "Type "y" to continue\n" read y @@ -119,6 +119,7 @@ if [ $($sfdisk -l $1 2>/dev/null|grep Empty|wc -l) -ne 4 ];then read y if [ $y = "y" ];then printf "Wiping existing partitions\n" + dd if=/dev/zero of=$1 bs=512 count=1 else printf "Exiting.\n" exit 1 @@ -138,14 +139,16 @@ EOF $mke2fs ${1}1 else +$parted -s $1 mklabel msdos +sleep 2 declare -i maxsize maxsize=$(parted $1 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') let rootsize=$maxsize-1 -$parted -s $1 mklabel msdos $parted -s $1 unit cyl mkpartfs primary ext2 0 $rootsize -$parted -s $1 unit cyl mkpart primary ext2 $rootsize $maxsize +$parted -s $1 unit cyl mkpart primary fat32 $rootsize $maxsize $parted -s $1 set 1 boot on +$sfdisk --change-id $1 2 88 fi if [ $? -eq 0 ];then diff --git a/scripts/make b/scripts/make index c8807be94..e8e518653 100755 --- a/scripts/make +++ b/scripts/make @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/scripts/md5sum b/scripts/md5sum index b76ca4ee3..6a95a4707 100644 --- a/scripts/md5sum +++ b/scripts/md5sum @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# $Id: md5sum 185 2008-10-28 12:24:05Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index 272460be0..d897c0ef3 100644 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -1,5 +1,3 @@ -# $Id: rstrip.sh 440 2009-05-13 16:09:54Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index c40f7c43d..9ac3c2d4a 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -1,8 +1,5 @@ -# $Id: scan-pkgs.sh 431 2009-05-09 01:01:40Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -#- # Scan host-tool prerequisites of certain packages before building. if test -z "$BASH_VERSION"; then @@ -25,7 +22,6 @@ out=0 . $topdir/.config -#-- start adding dependencies here -- if [[ -n $ADK_PACKAGE_ALSA_UTILS ]]; then NEED_XMLTO="$NEED_XMLTO alsa-utils" fi @@ -48,7 +44,6 @@ if [[ -n $ADK_PACKAGE_GLIB2 ]]; then NEED_PKGCONFIG="$NEED_PKGCONFIG glib2" fi -#-- start checking dependencies here -- if [[ -n $NEED_GETTEXT ]]; then if ! which xgettext >/dev/null 2>&1; then @@ -107,5 +102,4 @@ fi # out=1 #fi -#-- end of dependency checks exit $out diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 11dc4c059..57df8b4c7 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -1,5 +1,3 @@ -# $Id: scan-tools.sh 436 2009-05-10 18:15:31Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/scripts/sed b/scripts/sed index 2b8a81f17..36cfdbfa7 100755 --- a/scripts/sed +++ b/scripts/sed @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh index 9b043424e..4331709a5 100644 --- a/scripts/split-cfg.sh +++ b/scripts/split-cfg.sh @@ -1,8 +1,5 @@ -# $Id: split-cfg.sh 280 2008-12-25 20:54:25Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -#- # Note: this is slow, but it's not the "progress stuff" which cau- # ses the slow-down. diff --git a/scripts/strip-script.sh b/scripts/strip-script.sh index 3f9a54605..355df0e73 100644 --- a/scripts/strip-script.sh +++ b/scripts/strip-script.sh @@ -1,5 +1,3 @@ -# $Id: strip-script.sh 30 2008-09-04 13:31:09Z wbx $ -#- # Copyright (c) 2007 # Thorsten Glaser <tg@mirbsd.de> # @@ -26,7 +24,6 @@ # of dealing in the work, even if advised of the possibility of such # damage or existence of a defect, except proven that it results out # of said person's immediate fault when using the work as intended. -#- # Shell script to strip down a shell script (filter). shopt -s extglob diff --git a/scripts/tar b/scripts/tar index 625b11588..60c5057da 100755 --- a/scripts/tar +++ b/scripts/tar @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/scripts/update-patches b/scripts/update-patches index 4c695f0cc..2c3f57278 100644 --- a/scripts/update-patches +++ b/scripts/update-patches @@ -1,7 +1,4 @@ #!/usr/bin/env bash -# $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -# $MirOS: ports/infrastructure/scripts/update-patches,v 1.5 2006/06/15 19:18:43 tg Exp $ -#- # Copyright (c) 2006 # Thorsten Glaser <tg@freewrt.org> # @@ -157,9 +154,7 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do # Build a sensible name for the new patch file patchname=patch-$(echo "$file" | sed -e 's#[/. ]#_#g') echo "No patch-* found for $file, creating $patchname" >&2 - ( echo '$Id: update-patches 24 2008-08-31 14:56:13Z wbx $'; \ - cd $D_BASE && do_diff "$file" "$D_SUB.orig" "$D_SUB" \ - ) >$patchname + ( cd $D_BASE && do_diff "$file" "$D_SUB.orig" "$D_SUB" ) >$patchname edit="$edit $patchname" accounted="$accounted $patchname" done diff --git a/target/Config.in b/target/Config.in index 7cffc9fd5..b005bae1f 100644 --- a/target/Config.in +++ b/target/Config.in @@ -1,5 +1,3 @@ -# $Id: Config.in 446 2009-05-16 23:47:24Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -109,6 +107,7 @@ config ADK_LINUX_X86_ALIX1C select ADK_KERNEL_EXT2_FS select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_MII select BUSYBOX_HWCLOCK @@ -408,10 +407,12 @@ config ADK_IPV6 Enable basic IPv6 support (kmod-ipv6) and make the IPv6 support options in packages visible. -config ADK_XORG +config ADK_X11 bool "Enable X.org/X11 support" default n help - Enable Xorg/X11 server and applications + Enable Xorg/X11 server and applications in menu. + Try to compile other packages with X11 support. + (f.e. mplayer) endmenu diff --git a/target/Makefile b/target/Makefile index ee2ef34b6..73887ca5c 100644 --- a/target/Makefile +++ b/target/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 400 2009-05-01 20:13:27Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index f3944ceb7..f71ab293d 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/alix1c/files/etc/mdev.conf b/target/alix1c/files/etc/mdev.conf index 74864bf2f..69d9c0079 100644 --- a/target/alix1c/files/etc/mdev.conf +++ b/target/alix1c/files/etc/mdev.conf @@ -14,4 +14,5 @@ timer root:audio 660 >snd/timer controlC0 root:audio 660 >snd/controlC0 pcmC0D0c root:audio 660 >snd/pcmC0D0c pcmC0D0p root:audio 660 >snd/pcmC0D0p +msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr) .* 0:0 644 @/lib/mdev/init diff --git a/target/alix1c/kernel.config b/target/alix1c/kernel.config index cd532a6e8..33167be9d 100644 --- a/target/alix1c/kernel.config +++ b/target/alix1c/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.28 -# Fri Feb 20 15:03:25 2009 +# Linux kernel version: 2.6.29.1 +# Sun May 31 01:11:31 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -61,17 +61,27 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_CLASSIC_RCU=y +# CONFIG_TREE_RCU is not set +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_CGROUPS is not set CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_GROUP_SCHED is not set +# CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set # CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -81,10 +91,8 @@ CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_ELF_CORE is not set # CONFIG_PCSPKR_PLATFORM is not set -CONFIG_COMPAT_BRK=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y -CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y @@ -93,11 +101,11 @@ CONFIG_SHMEM=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_PCI_QUIRKS is not set +# CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y @@ -107,7 +115,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y -# CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set @@ -115,11 +122,9 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y CONFIG_BLOCK=y # CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_LSF is not set # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set @@ -135,7 +140,6 @@ CONFIG_IOSCHED_NOOP=y # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_NOOP=y CONFIG_DEFAULT_IOSCHED="noop" -CONFIG_CLASSIC_RCU=y # CONFIG_FREEZER is not set # @@ -151,7 +155,7 @@ CONFIG_X86_PC=y # CONFIG_X86_GENERICARCH is not set # CONFIG_X86_VSMP is not set # CONFIG_X86_RDC321X is not set -CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_PARAVIRT_GUEST is not set # CONFIG_MEMTEST is not set # CONFIG_M386 is not set @@ -179,16 +183,15 @@ CONFIG_MGEODE_LX=y # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set # CONFIG_GENERIC_CPU is not set -CONFIG_X86_GENERIC=y +# CONFIG_X86_GENERIC is not set CONFIG_X86_CPU=y CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_L1_CACHE_SHIFT=5 CONFIG_X86_XADD=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_USE_3DNOW=y CONFIG_X86_TSC=y @@ -202,21 +205,24 @@ CONFIG_CPU_SUP_AMD=y # CONFIG_CPU_SUP_TRANSMETA_32 is not set # CONFIG_CPU_SUP_UMC_32 is not set # CONFIG_X86_DS is not set +# CONFIG_X86_PTRACE_BTS is not set # CONFIG_HPET_TIMER is not set # CONFIG_DMI is not set # CONFIG_IOMMU_HELPER is not set +# CONFIG_IOMMU_API is not set +CONFIG_NR_CPUS=1 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set # CONFIG_X86_UP_APIC is not set # CONFIG_X86_MCE is not set -# CONFIG_VM86 is not set +CONFIG_VM86=y # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set # CONFIG_X86_REBOOTFIXUPS is not set # CONFIG_MICROCODE is not set -# CONFIG_X86_MSR is not set -# CONFIG_X86_CPUID is not set +CONFIG_X86_MSR=y +CONFIG_X86_CPUID=y CONFIG_NOHIGHMEM=y # CONFIG_HIGHMEM4G is not set # CONFIG_HIGHMEM64G is not set @@ -240,7 +246,6 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPARSEMEM_STATIC=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_RESOURCES_64BIT is not set # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y @@ -293,6 +298,7 @@ CONFIG_PCI_DOMAINS=y # CONFIG_PCIEPORTBUS is not set # CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_PCI_LEGACY is not set +# CONFIG_PCI_STUB is not set CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set @@ -306,7 +312,6 @@ CONFIG_ISA_DMA_API=y # Executable file formats / Emulations # CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_HAVE_AOUT=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set @@ -316,6 +321,7 @@ CONFIG_NET=y # # Networking options # +CONFIG_COMPAT_NET_DEV_OPS=y CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y @@ -362,6 +368,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set # # Network testing @@ -374,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_AF_RXRPC is not set # CONFIG_PHONET is not set # CONFIG_WIRELESS is not set +# CONFIG_WIMAX is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -534,6 +542,7 @@ CONFIG_NETDEVICES=y # CONFIG_VETH is not set # CONFIG_ARCNET is not set CONFIG_PHYLIB=y +# CONFIG_SWCONFIG is not set # # MII PHY device drivers @@ -548,6 +557,9 @@ CONFIG_PHYLIB=y # CONFIG_BROADCOM_PHY is not set # CONFIG_ICPLUS_PHY is not set # CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set # CONFIG_FIXED_PHY is not set # CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y @@ -556,6 +568,7 @@ CONFIG_MII=y # CONFIG_SUNGEM is not set # CONFIG_CASSINI is not set # CONFIG_NET_VENDOR_3COM is not set +# CONFIG_DNET is not set # CONFIG_NET_TULIP is not set # CONFIG_HP100 is not set # CONFIG_IBM_NEW_EMAC_ZMII is not set @@ -571,7 +584,6 @@ CONFIG_NET_PCI=y # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set -# CONFIG_EEPRO100 is not set # CONFIG_E100 is not set # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set @@ -581,6 +593,7 @@ CONFIG_NET_PCI=y # CONFIG_R6040 is not set # CONFIG_SIS900 is not set # CONFIG_EPIC100 is not set +# CONFIG_SMSC9420 is not set # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set CONFIG_VIA_RHINE=y @@ -597,6 +610,10 @@ CONFIG_VIA_RHINE_MMIO=y # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set # CONFIG_IWLWIFI_LEDS is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set @@ -686,6 +703,7 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set @@ -804,9 +822,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set -# CONFIG_FB_I810 is not set # CONFIG_FB_LE80578 is not set -# CONFIG_FB_INTEL is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON is not set # CONFIG_FB_ATY128 is not set @@ -880,6 +896,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; # # CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# # CONFIG_UWB is not set # CONFIG_MMC is not set # CONFIG_MEMSTICK is not set @@ -927,6 +947,7 @@ CONFIG_RTC_DRV_CMOS=y # CONFIG_DMADEVICES is not set # CONFIG_UIO is not set # CONFIG_STAGING is not set +CONFIG_X86_PLATFORM_DEVICES=y # # Firmware Drivers @@ -951,6 +972,7 @@ CONFIG_EXT2_FS=y CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY is not set # CONFIG_QUOTA is not set @@ -984,10 +1006,7 @@ CONFIG_TMPFS=y # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set - -# -# Miscellaneous filesystems -# +CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set @@ -1053,10 +1072,15 @@ CONFIG_FRAME_WARN=1024 # CONFIG_DEBUG_KERNEL is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_MEMORY_INIT is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_LATENCYTOP is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y @@ -1073,6 +1097,7 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_EARLY_PRINTK is not set # CONFIG_4KSTACKS is not set # CONFIG_DOUBLEFAULT is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 @@ -1106,6 +1131,7 @@ CONFIG_HAVE_KVM=y CONFIG_BITREVERSE=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_FIND_LAST_BIT=y # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set # CONFIG_CRC_T10DIF is not set diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile index 1db02a2c9..5a7c98c42 100644 --- a/target/foxboard/Makefile +++ b/target/foxboard/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/foxboard/tools/boot_linux b/target/foxboard/tools/boot_linux index e7d5807f5..f7da261e2 100755 --- a/target/foxboard/tools/boot_linux +++ b/target/foxboard/tools/boot_linux @@ -94,7 +94,6 @@ #!---------------------------------------------------------------------------- #! (C) Copyright 2001, Axis Communications AB, LUND, SWEDEN #!**************************************************************************** -# $Id: boot_linux,v 1.16 2004/11/01 16:32:27 starvik Exp $ #****************** INCLUDE FILES SECTION ************************************ diff --git a/target/foxboard/tools/e100boot/Makefile b/target/foxboard/tools/e100boot/Makefile index a6eba9dad..d807f2349 100644 --- a/target/foxboard/tools/e100boot/Makefile +++ b/target/foxboard/tools/e100boot/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/foxboard/tools/rules.mk b/target/foxboard/tools/rules.mk index 8d03c031a..a6a3684ac 100644 --- a/target/foxboard/tools/rules.mk +++ b/target/foxboard/tools/rules.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/foxboard/tools/squashfs/Makefile b/target/foxboard/tools/squashfs/Makefile index 0887afc22..a55181f88 100644 --- a/target/foxboard/tools/squashfs/Makefile +++ b/target/foxboard/tools/squashfs/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/ibm-x40/Makefile b/target/ibm-x40/Makefile index 9e5ccb25b..5ea9d04c0 100644 --- a/target/ibm-x40/Makefile +++ b/target/ibm-x40/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/lemote/Makefile b/target/lemote/Makefile index 4802513f0..3c473aee1 100644 --- a/target/lemote/Makefile +++ b/target/lemote/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/native/Makefile b/target/native/Makefile index 9e5ccb25b..5ea9d04c0 100644 --- a/target/native/Makefile +++ b/target/native/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/qemu-cris/Makefile b/target/qemu-cris/Makefile index e8cdf1bb1..8152e7645 100644 --- a/target/qemu-cris/Makefile +++ b/target/qemu-cris/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/qemu-cris/tools/rules.mk b/target/qemu-cris/tools/rules.mk index 8d03c031a..a6a3684ac 100644 --- a/target/qemu-cris/tools/rules.mk +++ b/target/qemu-cris/tools/rules.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/qemu-mips/Makefile b/target/qemu-mips/Makefile index a66bb5d17..4bbc03c8f 100644 --- a/target/qemu-mips/Makefile +++ b/target/qemu-mips/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/qemu-mips64/Makefile b/target/qemu-mips64/Makefile index a2d09610d..5e606d7eb 100644 --- a/target/qemu-mips64/Makefile +++ b/target/qemu-mips64/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/qemu-mips64el/Makefile b/target/qemu-mips64el/Makefile index 5a286dffd..af8997a8f 100644 --- a/target/qemu-mips64el/Makefile +++ b/target/qemu-mips64el/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile index ac4a70d91..0ffcfe6fe 100644 --- a/target/qemu-mipsel/Makefile +++ b/target/qemu-mipsel/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile index ee5627218..19f49f673 100644 --- a/target/qemu-x86/Makefile +++ b/target/qemu-x86/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/rb411/Makefile b/target/rb411/Makefile index efb664bb5..17f2a4feb 100644 --- a/target/rb411/Makefile +++ b/target/rb411/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/rb433/Makefile b/target/rb433/Makefile index efb664bb5..17f2a4feb 100644 --- a/target/rb433/Makefile +++ b/target/rb433/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/rb532/Makefile b/target/rb532/Makefile index 38cd40841..9fd876291 100644 --- a/target/rb532/Makefile +++ b/target/rb532/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/rescue-x86/Makefile b/target/rescue-x86/Makefile index 9e5ccb25b..5ea9d04c0 100644 --- a/target/rescue-x86/Makefile +++ b/target/rescue-x86/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/rescue-x86_64/Makefile b/target/rescue-x86_64/Makefile index 9e5ccb25b..5ea9d04c0 100644 --- a/target/rescue-x86_64/Makefile +++ b/target/rescue-x86_64/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/zaurus/Makefile b/target/zaurus/Makefile index 89172ce8a..faa28095f 100644 --- a/target/zaurus/Makefile +++ b/target/zaurus/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/Makefile b/toolchain/Makefile index de1c19024..c492ef339 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index b7791eaca..8cdf93580 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index 709ed6a71..b5a9e3542 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index f5150a226..e573d922e 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -91,7 +89,6 @@ $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR2)/.configured $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install - echo $(GCC_VERSION) > $(STAGING_TOOLS)/gcc_version # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_TOOLS); \ diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 66e0954b6..9b771706f 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/gcc/patches/no-lib64.patch b/toolchain/gcc/patches/no-lib64.patch index efa4099ee..a46e0aa67 100644 --- a/toolchain/gcc/patches/no-lib64.patch +++ b/toolchain/gcc/patches/no-lib64.patch @@ -1,6 +1,42 @@ +diff -Nur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h +--- gcc-4.4.0.orig/gcc/config/i386/linux64.h 2009-04-10 01:23:07.000000000 +0200 ++++ gcc-4.4.0/gcc/config/i386/linux64.h 2009-06-02 22:38:29.054028385 +0200 +@@ -59,7 +59,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" + + #undef ASM_SPEC + #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ +diff -Nur gcc-4.4.0.orig/gcc/config/i386/t-linux64 gcc-4.4.0/gcc/config/i386/t-linux64 +--- gcc-4.4.0.orig/gcc/config/i386/t-linux64 2008-07-02 17:59:19.000000000 +0200 ++++ gcc-4.4.0/gcc/config/i386/t-linux64 2009-06-02 22:40:00.800873792 +0200 +@@ -7,7 +7,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib +diff -Nur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h +--- gcc-4.4.0.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100 ++++ gcc-4.4.0/gcc/config/mips/linux64.h 2009-06-02 22:40:46.756972667 +0200 +@@ -36,7 +36,7 @@ + %{profile:-lc_p} %{!profile:-lc}}" + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define LINUX_DYNAMIC_LINKERN32 \ diff -Nur gcc-4.4.0.orig/gcc/config/mips/t-linux64 gcc-4.4.0/gcc/config/mips/t-linux64 --- gcc-4.4.0.orig/gcc/config/mips/t-linux64 2006-06-06 14:51:24.000000000 +0200 -+++ gcc-4.4.0/gcc/config/mips/t-linux64 2009-05-28 18:13:45.000000000 +0200 ++++ gcc-4.4.0/gcc/config/mips/t-linux64 2009-06-02 22:35:11.634464615 +0200 @@ -1,6 +1,6 @@ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 MULTILIB_DIRNAMES = n32 32 64 diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index 32e059334..4eed496c0 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc index 106ca30b8..112b62f6f 100644 --- a/toolchain/gdb/Makefile.inc +++ b/toolchain/gdb/Makefile.inc @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 19aee9952..89e6b02cb 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 083e3041b..3e5d8b475 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -7,4 +5,4 @@ PKG_NAME:= glibc PKG_VERSION:= 2.10.90 PKG_RELEASE:= 1 PKG_MD5SUM:= f1d6d30f762e0be537a1f84d26fa0403 -MASTER_SITES:= http://www.openadk.org/distfiles +PKG_SITES:= http://www.openadk.org/distfiles diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index 937f1b411..cff400736 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/gmp/Makefile.inc b/toolchain/gmp/Makefile.inc index f06ebdafd..ea02b2d0e 100644 --- a/toolchain/gmp/Makefile.inc +++ b/toolchain/gmp/Makefile.inc @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index add626b94..400141524 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile index 8009c3acf..38ceed749 100644 --- a/toolchain/mpfr/Makefile +++ b/toolchain/mpfr/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/mpfr/Makefile.inc b/toolchain/mpfr/Makefile.inc index 265647544..665796739 100644 --- a/toolchain/mpfr/Makefile.inc +++ b/toolchain/mpfr/Makefile.inc @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/rules.mk b/toolchain/rules.mk index bfe168d17..fa8be6bd3 100644 --- a/toolchain/rules.mk +++ b/toolchain/rules.mk @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 8a77a6022..23b1afa2f 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/toolchain/uClibc/Makefile.inc b/toolchain/uClibc/Makefile.inc index c34fe8dff..5fdeb5a17 100644 --- a/toolchain/uClibc/Makefile.inc +++ b/toolchain/uClibc/Makefile.inc @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. |