From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- TODO | 13 +- mk/buildhlp.mk | 2 +- mk/fetch.mk | 2 +- mk/linux.mk | 2 +- mk/package.mk | 20 +- mk/pkg-bottom.mk | 2 +- package/6tunnel/Makefile | 7 +- package/6tunnel/ipkg/6tunnel.control | 4 - package/Config.in | 5 +- package/Depends.mk | 4 +- package/Makefile | 7 +- package/aiccu/Makefile | 9 +- package/aiccu/files/aiccu.conffiles | 1 + package/aiccu/files/aiccu.init | 3 +- package/aiccu/files/aiccu.postinst | 3 + package/aiccu/ipkg/aiccu.conffiles | 1 - package/aiccu/ipkg/aiccu.control | 5 - package/aiccu/ipkg/aiccu.postinst | 3 - package/aircrack-ng/Makefile | 8 +- package/aircrack-ng/ipkg/aircrack-ng.control | 5 - package/alsa-lib/Makefile | 11 +- package/alsa-lib/files/alsa-lib.postinst | 4 + package/alsa-lib/ipkg/alsa-lib.control | 4 - package/alsa-lib/ipkg/alsa-lib.postinst | 4 - package/alsa-utils/Makefile | 12 +- package/alsa-utils/files/alsa-utils.postinst | 4 + package/alsa-utils/files/amixer.init | 3 +- package/alsa-utils/ipkg/alsa-utils.control | 4 - package/alsa-utils/ipkg/alsa-utils.postinst | 4 - package/apr-util/Makefile | 8 +- package/apr-util/ipkg/apr-util.control | 5 - package/apr/Makefile | 28 +- package/apr/ipkg/apr.control | 4 - package/arpd/Makefile | 9 +- package/arpd/ipkg/arpd.control | 5 - package/arpwatch/Makefile | 11 +- package/arpwatch/files/arpwatch.conffiles | 1 + package/arpwatch/ipkg/arpwatch.conffiles | 1 - package/arpwatch/ipkg/arpwatch.control | 5 - package/asterisk/Makefile | 34 +- .../files/asterisk-chan-bluetooth.conffiles | 1 + .../asterisk/files/asterisk-chan-h323.conffiles | 1 + .../asterisk/files/asterisk-chan-iax2.conffiles | 2 + .../asterisk/files/asterisk-chan-mgcp.conffiles | 1 + .../asterisk/files/asterisk-chan-skinny.conffiles | 1 + package/asterisk/files/asterisk-meetme.conffiles | 1 + .../asterisk/files/asterisk-pbx-dundi.conffiles | 1 + package/asterisk/files/asterisk-pgsql.conffiles | 1 + .../asterisk/files/asterisk-voicemail.conffiles | 1 + package/asterisk/files/asterisk.conffiles | 21 + package/asterisk/files/asterisk.init | 3 +- package/asterisk/files/asterisk.postinst | 3 + .../ipkg/asterisk-chan-bluetooth.conffiles | 1 - .../asterisk/ipkg/asterisk-chan-bluetooth.control | 5 - package/asterisk/ipkg/asterisk-chan-h323.conffiles | 1 - package/asterisk/ipkg/asterisk-chan-h323.control | 5 - package/asterisk/ipkg/asterisk-chan-iax2.conffiles | 2 - package/asterisk/ipkg/asterisk-chan-iax2.control | 5 - package/asterisk/ipkg/asterisk-chan-mgcp.conffiles | 1 - package/asterisk/ipkg/asterisk-chan-mgcp.control | 5 - package/asterisk/ipkg/asterisk-chan-misdn.control | 5 - .../asterisk/ipkg/asterisk-chan-skinny.conffiles | 1 - package/asterisk/ipkg/asterisk-chan-skinny.control | 5 - package/asterisk/ipkg/asterisk-codec-gsm.control | 5 - package/asterisk/ipkg/asterisk-codec-speex.control | 5 - package/asterisk/ipkg/asterisk-meetme.conffiles | 1 - package/asterisk/ipkg/asterisk-meetme.control | 5 - package/asterisk/ipkg/asterisk-pbx-dundi.conffiles | 1 - package/asterisk/ipkg/asterisk-pbx-dundi.control | 5 - package/asterisk/ipkg/asterisk-pgsql.conffiles | 1 - package/asterisk/ipkg/asterisk-pgsql.control | 5 - package/asterisk/ipkg/asterisk-res-agi.control | 5 - package/asterisk/ipkg/asterisk-sounds.control | 5 - package/asterisk/ipkg/asterisk-sqlite.control | 5 - package/asterisk/ipkg/asterisk-voicemail.conffiles | 1 - package/asterisk/ipkg/asterisk-voicemail.control | 5 - package/asterisk/ipkg/asterisk.conffiles | 21 - package/asterisk/ipkg/asterisk.control | 5 - package/asterisk/ipkg/asterisk.postinst | 3 - package/atftp/Makefile | 11 +- package/atftp/ipkg/atftp.control | 5 - package/atftp/ipkg/atftpd.control | 5 - package/autossh/Makefile | 23 +- package/autossh/ipkg/autossh.control | 5 - package/avahi/Makefile | 31 +- package/avahi/files/avahi-daemon.conffiles | 3 + package/avahi/files/avahi-daemon.init | 3 +- package/avahi/files/avahi-daemon.postinst | 6 + package/avahi/ipkg/avahi-daemon.conffiles | 3 - package/avahi/ipkg/avahi-daemon.control | 5 - package/avahi/ipkg/avahi-daemon.postinst | 6 - package/avahi/ipkg/avahi-dnsconfd.control | 5 - package/avahi/ipkg/libavahi.control | 4 - package/axtls/Makefile | 23 +- package/axtls/files/axhttpd.init | 3 +- package/axtls/files/axhttpd.postinst | 3 + package/axtls/files/config | 34 +- package/axtls/ipkg/axhttpd.control | 5 - package/axtls/ipkg/axhttpd.postinst | 3 - package/axtls/ipkg/libaxtls.control | 5 - package/axtls/patches/patch-httpd_main_c | 21 - package/base-files/Makefile | 12 +- package/base-files/files/base-files.conffiles | 13 + package/base-files/files/etc/init.d/boot | 2 +- package/base-files/files/etc/init.d/done | 2 +- package/base-files/files/etc/init.d/rcK | 2 +- package/base-files/files/etc/init.d/rcS | 2 +- package/base-files/ipkg/base-files.conffiles | 13 - package/base-files/ipkg/base-files.control | 3 - package/bash/Makefile | 7 +- package/bash/ipkg/bash.control | 4 - package/bc/Makefile | 9 +- package/bc/ipkg/bc.control | 4 - package/bc/ipkg/dc.control | 4 - package/bigreqsproto/Makefile | 2 +- package/bigreqsproto/ipkg/bigreqsproto.control | 4 - package/bind/Config.in | 43 +- package/bind/Makefile | 59 +- package/bind/files/bind-server.conffiles | 6 + package/bind/files/bind-server.postinst | 3 + package/bind/files/named.init | 3 +- package/bind/ipkg/bind-check.control | 5 - package/bind/ipkg/bind-client.control | 5 - package/bind/ipkg/bind-dig.control | 5 - package/bind/ipkg/bind-dnssec.control | 5 - package/bind/ipkg/bind-host.control | 6 - package/bind/ipkg/bind-rndc.control | 5 - package/bind/ipkg/bind-server.conffiles | 6 - package/bind/ipkg/bind-server.control | 6 - package/bind/ipkg/bind-server.postinst | 3 - package/bind/ipkg/bind-tools.control | 5 - package/bind/ipkg/libbind.control | 4 - package/binutils/Makefile | 8 +- package/binutils/ipkg/binutils.control | 4 - package/bitlbee/Makefile | 14 +- package/bitlbee/files/bitlbee.conffiles | 2 + package/bitlbee/files/bitlbee.init | 3 +- package/bitlbee/files/bitlbee.postinst | 3 + package/bitlbee/ipkg/bitlbee.conffiles | 2 - package/bitlbee/ipkg/bitlbee.control | 5 - package/bitlbee/ipkg/bitlbee.postinst | 3 - package/bluez-firmware/Makefile | 8 +- package/bluez-firmware/ipkg/bluez-firmware.control | 5 - package/bluez/Makefile | 15 +- package/bluez/files/bluez.init | 3 +- package/bluez/ipkg/bluez.control | 5 - package/bogofilter/Makefile | 35 +- package/bogofilter/ipkg/bogofilter.control | 4 - package/bogofilter/patches/patch-config_in | 14 - package/bogofilter/patches/patch-configure | 281 - package/bogofilter/patches/patch-configure_ac | 53 + package/bridge-utils/Makefile | 13 +- package/bridge-utils/ipkg/bridge-utils.control | 4 - package/busybox/Makefile | 19 +- package/busybox/files/busybox.postinst | 6 + package/busybox/files/crond.init | 3 +- package/busybox/files/inetd.init | 3 +- package/busybox/files/network.init | 3 +- package/busybox/files/syslog.init | 3 +- package/busybox/ipkg/busybox.control | 4 - package/busybox/ipkg/busybox.postinst | 6 - package/bwm/Makefile | 7 +- package/bwm/ipkg/bwm.control | 4 - package/cbtt/Makefile | 22 +- package/cbtt/ipkg/cbtt-mysql.control | 5 - package/cbtt/ipkg/cbtt.control | 5 - package/cfgfs/Makefile | 5 +- package/cfgfs/ipkg/cfgfs.control | 5 - package/cgilib/Makefile | 7 +- package/cgilib/ipkg/cgilib.control | 7 - package/chillispot/Makefile | 11 +- package/chillispot/files/chillispot.conffiles | 1 + package/chillispot/files/chillispot.init | 3 +- package/chillispot/files/chillispot.postinst | 3 + package/chillispot/ipkg/chillispot.conffiles | 1 - package/chillispot/ipkg/chillispot.control | 5 - package/chillispot/ipkg/chillispot.postinst | 3 - package/collectd/Makefile | 26 +- package/collectd/files/collectd.init | 3 +- package/collectd/files/collectd.postinst | 3 + package/collectd/ipkg/collectd.control | 5 - package/collectd/ipkg/collectd.postinst | 3 - package/collectd/patches/patch-src_Makefile_in | 12 - package/comgt/Makefile | 11 +- package/comgt/ipkg/comgt.control | 4 - package/compositeproto/Makefile | 2 +- package/cryptsetup/Makefile | 12 +- package/cryptsetup/ipkg/cryptsetup.control | 5 - package/ctorrent/Makefile | 13 +- package/ctorrent/ipkg/ctorrent.control | 4 - package/cups/Makefile | 14 +- package/cups/files/cups.conffiles | 4 + package/cups/files/cups.postinst | 6 + package/cups/files/cupsd.init | 3 +- package/cups/ipkg/cups.conffiles | 4 - package/cups/ipkg/cups.control | 5 - package/cups/ipkg/cups.postinst | 6 - package/curl/Makefile | 17 +- package/curl/ipkg/curl.control | 5 - package/curl/ipkg/libcurl.control | 5 - package/cutter/Makefile | 10 +- package/cutter/ipkg/cutter.control | 5 - package/cxxtools/Makefile | 17 +- package/cxxtools/ipkg/cxxtools.control | 4 - package/cyrus-sasl/Makefile | 7 +- package/cyrus-sasl/ipkg/libsasl2.control | 4 - package/damageproto/Makefile | 2 +- package/davfs2/Makefile | 24 +- package/davfs2/files/davfs2.conffiles | 2 + package/davfs2/files/davfs2.postinst | 5 + package/davfs2/ipkg/davfs2.conffiles | 2 - package/davfs2/ipkg/davfs2.control | 4 - package/davfs2/ipkg/davfs2.postinst | 5 - package/dbus/Makefile | 21 +- package/dbus/files/dbus.init | 3 +- package/dbus/files/dbus.postinst | 6 + package/dbus/ipkg/dbus.control | 5 - package/dbus/ipkg/dbus.postinst | 6 - package/deco/Makefile | 11 +- package/deco/ipkg/deco.control | 5 - package/device-mapper/Makefile | 18 +- package/device-mapper/ipkg/device-mapper.control | 4 - package/dhcp-forwarder/Makefile | 20 +- .../dhcp-forwarder/files/dhcp-forwarder.conffiles | 1 + .../dhcp-forwarder/files/dhcp-forwarder.postinst | 3 + package/dhcp-forwarder/files/dhcp-fwd.init | 3 +- .../dhcp-forwarder/ipkg/dhcp-forwarder.conffiles | 1 - package/dhcp-forwarder/ipkg/dhcp-forwarder.control | 4 - .../dhcp-forwarder/ipkg/dhcp-forwarder.postinst | 3 - package/dhcp-forwarder/patches/00-big_endian.patch | 11 - .../patches/01-getpwnmam_getgrnam.patch | 35 - package/dhcp/Config.in | 6 - package/dhcp/Makefile | 16 +- package/dhcp/files/dhcp-server.postinst | 3 + package/dhcp/files/dhcpd.init | 3 +- package/dhcp/ipkg/dhcp-relay.control | 4 - package/dhcp/ipkg/dhcp-server.control | 4 - package/dhcp/ipkg/dhcp-server.postinst | 3 - package/dhcp6/Config.in | 12 - package/dhcp6/Makefile | 32 - package/dhcp6/ipkg/dhcp6.control | 5 - package/dhcp6/ipkg/files/conffiles | 4 - package/dhcp6/patches/patch-client_Makefile | 58 - package/dhcp6/patches/patch-client_clilib_c | 22 - package/dhcp6/patches/patch-client_macros_h | 10 - package/dhcp6/patches/patch-client_solicit_c | 12 - package/dhcp6/patches/patch-server_Makefile | 38 - package/dhcp6/patches/patch-server_macros_h | 10 - package/dhcp6/patches/patch-server_reply_c | 21 - package/dhcpv6/Config.in | 15 + package/dhcpv6/Makefile | 29 + package/dhcpv6/ipkg/files/conffiles | 4 + package/dhcpv6/patches/patch-configure | 26 + package/dhcpv6/patches/patch-configure.orig | 25 + package/dhcpv6/patches/patch-configure_ac | 21 + package/dhcpv6/patches/patch-configure_ac.orig | 21 + package/dhcpv6/patches/patch-src_relay6_socket_c | 48 + package/digitemp/Makefile | 8 +- package/digitemp/ipkg/digitemp.control | 5 - package/dnsmasq/Makefile | 10 +- package/dnsmasq/files/dnsmasq.conffiles | 1 + package/dnsmasq/files/dnsmasq.init | 13 +- package/dnsmasq/files/dnsmasq.postinst | 7 + package/dnsmasq/ipkg/dnsmasq.conffiles | 1 - package/dnsmasq/ipkg/dnsmasq.control | 4 - package/dnsmasq/ipkg/dnsmasq.postinst | 7 - package/dosfstools/Makefile | 7 +- package/dosfstools/ipkg/dosfstools.control | 4 - package/dovecot/Makefile | 7 +- package/dovecot/ipkg/dovecot.control | 4 - package/dropbear/Makefile | 14 +- package/dropbear/files/dropbear.init | 3 +- package/dropbear/files/dropbear.postinst | 3 + package/dropbear/ipkg/dropbear.control | 4 - package/dropbear/ipkg/dropbear.postinst | 3 - package/dropbear/ipkg/dropbearconvert.control | 4 - package/dsniff/Makefile | 12 +- package/dsniff/ipkg/dsniff.control | 5 - package/e2fsprogs/Makefile | 23 +- package/e2fsprogs/ipkg/e2fsprogs.control | 4 - package/e2fsprogs/ipkg/libcom-err.control | 4 - package/e2fsprogs/ipkg/libuuid.control | 4 - package/elinks/Makefile | 8 +- package/elinks/ipkg/elinks.control | 5 - package/em28xx/Makefile | 2 +- package/em28xx/ipkg/kmod-em28xx.control | 4 - package/esound/Makefile | 19 +- package/esound/files/esd.init | 3 +- package/esound/files/esound.postinst | 3 + package/esound/ipkg/esound.control | 6 - package/esound/ipkg/esound.postinst | 3 - package/ether-wake/Makefile | 5 +- package/ether-wake/ipkg/ether-wake.control | 5 - package/ethtool/Makefile | 6 +- package/ethtool/ipkg/ethtool.control | 4 - package/evieext/Makefile | 2 +- package/exmap/Makefile | 10 +- package/exmap/ipkg/exmap.control | 4 - package/exmap/ipkg/exmapd.control | 4 - package/exmap/ipkg/exmapserver.control | 4 - package/exmap/ipkg/kmod-exmap.control | 4 - package/expat/Makefile | 12 +- package/expat/ipkg/libexpat.control | 4 - package/expat/patches/001-destdir.patch | 44 - package/ez-ipupdate/Makefile | 16 +- package/ez-ipupdate/files/ez-ipupdate.conffiles | 1 + package/ez-ipupdate/files/ez-ipupdate.init | 3 +- package/ez-ipupdate/files/ez-ipupdate.postinst | 3 + package/ez-ipupdate/ipkg/ez-ipupdate.conffiles | 1 - package/ez-ipupdate/ipkg/ez-ipupdate.control | 4 - package/ez-ipupdate/ipkg/ez-ipupdate.postinst | 3 - package/faad2/Makefile | 24 +- package/faad2/ipkg/libfaad2.control | 4 - .../faad2/patches/patch-common_mp4ff_Makefile_am | 16 - package/faad2/patches/patch-common_mp4ff_mp4ff_h | 12 - package/faad2/patches/patch-configure_in | 11 - package/faad2/patches/patch-frontend_Makefile_am | 12 - package/fakeidentd/Makefile | 13 +- package/fakeidentd/files/fakeidentd.init | 3 +- package/fakeidentd/files/fakeidentd.postinst | 4 + package/fakeidentd/ipkg/fakeidentd.control | 4 - package/fakeidentd/ipkg/fakeidentd.postinst | 4 - package/fbset/Makefile | 7 +- package/fbset/ipkg/fbset.control | 4 - package/fetchmail/Makefile | 19 +- package/fetchmail/ipkg/fetchmail.control | 4 - package/ffmpeg/Makefile | 8 +- package/ffmpeg/ipkg/ffmpeg.control | 4 - package/file/Makefile | 19 +- package/file/ipkg/file.control | 4 - package/fixesproto/Makefile | 2 +- package/flac/Makefile | 7 +- package/flac/ipkg/libflac.control | 4 - package/fontcacheproto/Makefile | 2 +- package/fontsproto/Makefile | 2 +- package/fping/Makefile | 12 +- package/fping/ipkg/fping.control | 4 - package/fprobe-ulog/Makefile | 8 +- package/fprobe-ulog/ipkg/fprobe-ulog.control | 8 - package/fprobe/Makefile | 8 +- package/fprobe/ipkg/fprobe.control | 7 - package/freeradius/Makefile | 54 +- .../freeradius/files/freeradius-mod-eap.conffiles | 1 + .../files/freeradius-mod-files.conffiles | 3 + .../freeradius/files/freeradius-mod-ldap.conffiles | 1 + .../files/freeradius-mod-preprocess.conffiles | 2 + .../files/freeradius-mod-realm.conffiles | 1 + .../freeradius/files/freeradius-mod-sql.conffiles | 1 + package/freeradius/files/freeradius.conffiles | 2 + package/freeradius/files/freeradius.postinst | 6 + package/freeradius/files/radiusd.init | 3 +- .../freeradius/ipkg/freeradius-democerts.control | 5 - .../freeradius/ipkg/freeradius-mod-chap.control | 5 - .../freeradius/ipkg/freeradius-mod-detail.control | 5 - .../freeradius/ipkg/freeradius-mod-digest.control | 5 - .../freeradius/ipkg/freeradius-mod-eap-gtc.control | 5 - .../freeradius/ipkg/freeradius-mod-eap-md5.control | 5 - .../ipkg/freeradius-mod-eap-mschapv2.control | 5 - .../ipkg/freeradius-mod-eap-peap.control | 5 - .../freeradius/ipkg/freeradius-mod-eap-tls.control | 5 - .../ipkg/freeradius-mod-eap-ttls.control | 5 - .../freeradius/ipkg/freeradius-mod-eap.conffiles | 1 - package/freeradius/ipkg/freeradius-mod-eap.control | 5 - .../freeradius/ipkg/freeradius-mod-files.conffiles | 3 - .../freeradius/ipkg/freeradius-mod-files.control | 5 - .../freeradius/ipkg/freeradius-mod-ldap.conffiles | 1 - .../freeradius/ipkg/freeradius-mod-ldap.control | 5 - .../freeradius/ipkg/freeradius-mod-mschap.control | 5 - package/freeradius/ipkg/freeradius-mod-pap.control | 5 - .../ipkg/freeradius-mod-preprocess.conffiles | 2 - .../ipkg/freeradius-mod-preprocess.control | 5 - .../freeradius/ipkg/freeradius-mod-realm.conffiles | 1 - .../freeradius/ipkg/freeradius-mod-realm.control | 5 - .../ipkg/freeradius-mod-sql-mysql.control | 5 - .../ipkg/freeradius-mod-sql-pgsql.control | 5 - .../freeradius/ipkg/freeradius-mod-sql.conffiles | 1 - package/freeradius/ipkg/freeradius-mod-sql.control | 5 - package/freeradius/ipkg/freeradius-utils.control | 5 - package/freeradius/ipkg/freeradius.conffiles | 2 - package/freeradius/ipkg/freeradius.control | 5 - package/freeradius/ipkg/freeradius.postinst | 6 - package/freetype/Makefile | 13 +- package/freetype/ipkg/libfreetype.control | 16 - package/frickin/Makefile | 9 +- package/frickin/files/frickin.init | 3 +- package/frickin/files/frickin.postinst | 4 + package/frickin/ipkg/frickin.control | 4 - package/frickin/ipkg/frickin.postinst | 4 - package/fuse/Makefile | 10 +- package/fuse/ipkg/fuse-utils.control | 5 - package/fuse/ipkg/libfuse.control | 5 - package/gatling/Makefile | 12 +- package/gatling/ipkg/gatling.control | 5 - package/gatling/patches/patch-gatling_c | 73 - package/gcc/Makefile | 8 +- package/gcc/ipkg/gcc.control | 5 - package/gdb/Makefile | 9 +- package/gdb/ipkg/gdb.control | 5 - package/gdbserver/Makefile | 6 +- package/gdbserver/ipkg/gdbserver.control | 5 - package/gettext/Makefile | 9 +- package/gettext/ipkg/gettext.control | 5 - package/gkrellmd/Config.in | 2 +- package/gkrellmd/Makefile | 29 +- package/gkrellmd/files/gkrellmd.init | 3 +- package/gkrellmd/files/gkrellmd.postinst | 3 + package/gkrellmd/ipkg/gkrellmd.control | 5 - package/gkrellmd/ipkg/gkrellmd.postinst | 3 - package/glib/Makefile | 4 +- package/glib/ipkg/glib1.control | 5 - package/glib2/Makefile | 17 +- package/glib2/ipkg/glib2.control | 5 - package/glibc/Makefile | 4 +- package/glibc/ipkg/glibc.control | 4 - package/gmediaserver/Makefile | 11 +- package/gmediaserver/files/gmediaserver.init | 3 +- package/gmediaserver/files/gmediaserver.postinst | 4 + package/gmediaserver/ipkg/gmediaserver.control | 5 - package/gmediaserver/ipkg/gmediaserver.postinst | 4 - package/gmp/Makefile | 7 +- package/gmp/ipkg/libgmp.control | 4 - package/gnutls/Makefile | 21 +- package/gnutls/ipkg/gnutls-utils.control | 5 - package/gnutls/ipkg/libgnutls-extra.control | 5 - package/gnutls/ipkg/libgnutls-openssl.control | 5 - package/gnutls/ipkg/libgnutls.control | 5 - package/gnutls/ipkg/libgnutlsxx.control | 5 - package/gpg/Makefile | 8 +- package/gpg/ipkg/gpg.control | 5 - package/gpm/Makefile | 10 +- package/gpm/ipkg/gpm.control | 4 - package/gpsd/Makefile | 11 +- package/gpsd/ipkg/gpsd-clients.control | 5 - package/gpsd/ipkg/gpsd.control | 5 - package/gsm/Makefile | 12 +- package/gsm/ipkg/gsm-utils.control | 4 - package/gsm/ipkg/libgsm.control | 4 - package/haserl/Makefile | 7 +- package/haserl/ipkg/haserl.control | 4 - package/hdparm/Makefile | 11 +- package/hdparm/ipkg/hdparm.control | 4 - package/heimdal/Makefile | 32 +- package/heimdal/files/heimdal-server.postinst | 8 + package/heimdal/files/heimdal.init | 3 +- package/heimdal/ipkg/heimdal-client-libs.control | 5 - package/heimdal/ipkg/heimdal-libs.control | 5 - package/heimdal/ipkg/heimdal-server.control | 4 - package/heimdal/ipkg/heimdal-server.postinst | 8 - package/heyu/Makefile | 13 +- package/heyu/files/files/heyu.conffiles | 1 + package/heyu/ipkg/files/heyu.conffiles | 1 - package/heyu/ipkg/heyu.control | 6 - package/heyu/patches/patch-tty_c | 8 +- package/heyu/patches/patch-x10state_c | 12 + package/hostapd/Makefile | 11 +- package/hostapd/files/hostapd.conffiles | 1 + package/hostapd/ipkg/hostapd-utils.control | 5 - package/hostapd/ipkg/hostapd.conffiles | 1 - package/hostapd/ipkg/hostapd.control | 6 - package/htpdate/Makefile | 16 +- package/htpdate/files/htpdate.init | 5 +- package/htpdate/files/htpdate.postinst | 4 + package/htpdate/ipkg/htpdate.control | 4 - package/htpdate/ipkg/htpdate.postinst | 4 - package/htpdate/patches/patch-Makefile | 12 +- package/htpdate/patches/patch-htpdate_c | 55 + package/httping/Config.in | 10 - package/httping/Makefile | 24 +- package/httping/ipkg/httping.control | 4 - package/httptunnel/Makefile | 7 +- package/httptunnel/ipkg/httptunnel.control | 4 - package/icecast/Makefile | 8 +- package/icecast/files/icecast.conffiles | 1 + package/icecast/ipkg/icecast.conffiles | 1 - package/icecast/ipkg/icecast.control | 5 - package/id3lib/Makefile | 13 +- package/id3lib/ipkg/id3lib.control | 4 - package/iftop/Makefile | 8 +- package/iftop/ipkg/iftop.control | 5 - package/igmpproxy/Makefile | 27 +- package/igmpproxy/ipkg/igmpproxy.control | 4 - package/inputproto/Makefile | 2 +- package/ipcad/Makefile | 11 +- package/ipcad/files/ipcad.conffiles | 1 + package/ipcad/ipkg/ipcad.conffiles | 1 - package/ipcad/ipkg/ipcad.control | 6 - package/iperf/Makefile | 14 +- package/iperf/ipkg/iperf.control | 5 - package/iproute2/Makefile | 17 +- package/iproute2/ipkg/ip.control | 4 - package/iproute2/ipkg/tc.control | 5 - package/ipsec-tools/Config.in | 1 - package/ipsec-tools/Makefile | 14 +- package/ipsec-tools/files/ipsec-tools.conffiles | 1 + package/ipsec-tools/ipkg/ipsec-tools.conffiles | 1 - package/ipsec-tools/ipkg/ipsec-tools.control | 5 - package/ipsec-tools/patches/patch-configure | 24 +- package/ipsec-tools/patches/patch-configure_ac | 12 - .../patches/patch-src_racoon_algorithm_c | 44 + .../ipsec-tools/patches/patch-src_racoon_cftoken_c | 2026 ++ .../ipsec-tools/patches/patch-src_racoon_cftoken_l | 9 +- .../patches/patch-src_racoon_crypto_openssl_c | 54 +- .../ipsec-tools/patches/patch-src_racoon_eaytest_c | 27 + .../patches/patch-src_racoon_isakmp_xauth_c | 12 + .../ipsec-tools/patches/patch-src_racoon_pfkey_c | 18 + .../ipsec-tools/patches/patch-src_racoon_privsep_c | 93 + .../patches/patch-src_racoon_racoonctl_c | 12 + .../ipsec-tools/patches/patch-src_setkey_token_c | 707 + .../ipsec-tools/patches/patch-src_setkey_token_l | 13 +- package/ipset/Makefile | 8 +- package/ipset/ipkg/ipset.control | 5 - package/iptables-snmp/Config.in | 10 - package/iptables-snmp/Makefile | 27 - package/iptables-snmp/ipkg/iptables-snmp.control | 5 - package/iptables/Makefile | 12 +- package/iptables/files/iptables.postinst | 7 + package/iptables/ipkg/ip6tables.control | 5 - package/iptables/ipkg/iptables-extra.control | 5 - .../iptables/ipkg/iptables-mod-conntrack.control | 5 - package/iptables/ipkg/iptables-mod-extra.control | 5 - package/iptables/ipkg/iptables-mod-filter.control | 5 - package/iptables/ipkg/iptables-mod-imq.control | 5 - package/iptables/ipkg/iptables-mod-ipopt.control | 5 - package/iptables/ipkg/iptables-mod-ipsec.control | 5 - package/iptables/ipkg/iptables-mod-nat.control | 5 - package/iptables/ipkg/iptables-mod-ulog.control | 5 - package/iptables/ipkg/iptables-utils.control | 5 - package/iptables/ipkg/iptables.control | 4 - package/iptables/ipkg/iptables.postinst | 7 - package/iptraf/Makefile | 8 +- package/iptraf/ipkg/iptraf.control | 5 - package/irssi/Makefile | 20 +- package/irssi/ipkg/irssi.control | 4 - package/iw/Makefile | 10 +- package/iw/ipkg/iw.control | 4 - package/jamvm/Makefile | 12 +- package/jamvm/ipkg/jamvm.control | 5 - package/jpeg/Makefile | 8 +- package/jpeg/ipkg/libjpeg.control | 6 - package/kbproto/Makefile | 2 +- package/kismet/Makefile | 10 +- package/kismet/files/kismet-client.conffiles | 4 + package/kismet/files/kismet-drone.conffiles | 1 + package/kismet/files/kismet-server.conffiles | 3 + package/kismet/ipkg/kismet-client.conffiles | 4 - package/kismet/ipkg/kismet-client.control | 9 - package/kismet/ipkg/kismet-drone.conffiles | 1 - package/kismet/ipkg/kismet-drone.control | 9 - package/kismet/ipkg/kismet-server.conffiles | 3 - package/kismet/ipkg/kismet-server.control | 9 - package/kismet/ipkg/kismet.control | 9 - package/knock/Makefile | 12 +- package/knock/files/knockd.conffiles | 1 + package/knock/ipkg/knock.control | 5 - package/knock/ipkg/knockd.conffiles | 1 - package/knock/ipkg/knockd.control | 5 - package/knock/patches/patch-src_knockd_c | 12 + package/krb5/Makefile | 18 +- package/krb5/files/krb5-server.postinst | 8 + package/krb5/files/krb5.init | 3 +- package/krb5/ipkg/krb5-libs.control | 5 - package/krb5/ipkg/krb5-server.control | 4 - package/krb5/ipkg/krb5-server.postinst | 8 - package/l2tpns/Makefile | 14 +- package/l2tpns/files/l2tpns.conffiles | 3 + package/l2tpns/ipkg/l2tpns.conffiles | 3 - package/l2tpns/ipkg/l2tpns.control | 4 - .../01-honor_includes_remove_backtrace.patch | 128 - package/l2tpns/patches/patch-Makefile | 37 + package/l2tpns/patches/patch-l2tpns_c | 35 + package/lame/Makefile | 13 +- package/lame/ipkg/lame.control | 5 - package/lame/ipkg/liblame.control | 4 - package/less/Makefile | 13 +- package/less/ipkg/less.control | 5 - package/libICE/Makefile | 6 +- package/libICE/ipkg/libice.control | 4 - package/libSM/Makefile | 7 +- package/libSM/ipkg/libsm.control | 4 - package/libX11/Makefile | 6 +- package/libX11/ipkg/libx11.control | 4 - package/libXau/Makefile | 6 +- package/libXau/ipkg/libxau.control | 4 - package/libXaw/Makefile | 6 +- package/libXaw/ipkg/libxaw.control | 4 - package/libXdmcp/Makefile | 6 +- package/libXdmcp/ipkg/libxdmcp.control | 4 - package/libXext/Makefile | 6 +- package/libXext/ipkg/libxext.control | 4 - package/libXfont/Makefile | 6 +- package/libXfont/ipkg/libxfont.control | 4 - package/libXmu/Makefile | 6 +- package/libXmu/ipkg/libxmu.control | 4 - package/libXpm/Makefile | 8 +- package/libXpm/ipkg/libxpm.control | 4 - package/libXt/Makefile | 6 +- package/libXt/ipkg/libxt.control | 4 - package/libXxf86dga/Makefile | 6 +- package/libXxf86dga/ipkg/libxxf86dga.control | 4 - package/libao/Makefile | 13 +- package/libao/ipkg/libao.control | 4 - package/libart/Makefile | 7 +- package/libart/ipkg/libart.control | 9 - package/libaudiofile/Makefile | 7 +- package/libaudiofile/ipkg/libaudiofile.control | 4 - package/libc/Makefile | 2 +- package/libc/ipkg/libc.control | 4 - package/libcli/Makefile | 12 +- package/libcli/ipkg/libcli.control | 5 - package/libcli/patches/patch-Makefile | 20 +- package/libdaemon/Makefile | 6 +- package/libdaemon/ipkg/libdaemon.control | 4 - package/libdb/Makefile | 17 +- package/libdb/ipkg/libdb.control | 4 - package/libdnet/Makefile | 8 +- package/libdnet/ipkg/libdnet.control | 4 - package/libelf/Makefile | 4 +- package/libelf/ipkg/libelf.control | 4 - package/libevent/Makefile | 7 +- package/libevent/ipkg/libevent.control | 4 - package/libffi/Makefile | 11 +- package/libffi/ipkg/libffi.control | 4 - package/libfontenc/Makefile | 6 +- package/libfontenc/ipkg/libfontenc.control | 4 - package/libgcrypt/Makefile | 8 +- package/libgcrypt/ipkg/libgcrypt.control | 6 - package/libgd/Makefile | 8 +- package/libgd/ipkg/libgd.control | 5 - package/libgdbm/Makefile | 8 +- package/libgdbm/ipkg/libgdbm.control | 4 - package/libgpg-error/Makefile | 10 +- package/libgpg-error/ipkg/libgpg-error.control | 4 - package/libgssglue/Makefile | 6 +- package/libgssglue/ipkg/libgssglue.control | 4 - package/libiconv/Makefile | 8 +- package/libiconv/ipkg/libiconv.control | 4 - package/libid3tag/Makefile | 7 +- package/libid3tag/ipkg/libid3tag.control | 5 - package/liblzo/Makefile | 12 +- package/liblzo/ipkg/liblzo.control | 4 - package/libmad/Makefile | 8 +- package/libmad/ipkg/libmad.control | 4 - package/libnet/Makefile | 10 +- package/libnet/ipkg/libnet.control | 5 - package/libnfsidmap/Makefile | 7 +- package/libnfsidmap/ipkg/libnfsidmap.control | 4 - package/libnids/Makefile | 6 +- package/libnids/ipkg/libnids.control | 5 - package/libnl/Makefile | 7 +- package/libnl/ipkg/libnl.control | 4 - .../libnl/patches/patch-include_netlink-local_h | 12 + package/libnl/patches/patch-lib_object_c | 12 + package/libogg/Makefile | 7 +- package/libogg/ipkg/libogg.control | 4 - package/libol/Makefile | 7 +- package/libol/ipkg/libol.control | 4 - package/libosip2/Makefile | 12 +- package/libosip2/ipkg/libosip2.control | 5 - package/libowfat/Makefile | 17 +- package/libp11/Makefile | 12 +- package/libp11/ipkg/libp11.control | 5 - package/libpcap/Makefile | 7 +- package/libpcap/ipkg/libpcap.control | 4 - package/libpciaccess/Makefile | 6 +- package/libpciaccess/ipkg/libpciaccess.control | 4 - package/libpng/Makefile | 12 +- package/libpng/ipkg/libpng.control | 5 - package/libpri/Makefile | 7 +- package/libpri/ipkg/libpri.control | 5 - package/libpthread/Makefile | 4 +- package/libpthread/ipkg/libpthread.control | 4 - package/librpcsecgss/Makefile | 7 +- package/librpcsecgss/ipkg/librpcsecgss.control | 4 - package/libshout/Makefile | 8 +- package/libshout/ipkg/libshout.control | 5 - package/libsigc++/Makefile | 9 +- package/libsigc++/ipkg/libsigc++.control | 5 - package/libstdcxx/Makefile | 4 +- package/libstdcxx/ipkg/libstdcxx.control | 5 - package/libtasn1/Makefile | 7 +- package/libtasn1/ipkg/libtasn1.control | 4 - package/libthread_db/Makefile | 4 +- package/libthread_db/ipkg/libthread-db.control | 4 - package/libtiff/Makefile | 8 +- package/libtiff/ipkg/libtiff.control | 4 - package/libtirpc/Makefile | 14 +- package/libtirpc/ipkg/libtirpc.control | 4 - package/libtirpc/patches/patch-INSTALL | 255 + package/libtirpc/patches/patch-Makefile_am | 10 - package/libtirpc/patches/patch-Makefile_in | 94 + package/libtirpc/patches/patch-aclocal_m4 | 10821 ++++++ package/libtirpc/patches/patch-config_guess | 208 + package/libtirpc/patches/patch-config_h_in | 14 + package/libtirpc/patches/patch-config_sub | 181 + package/libtirpc/patches/patch-configure | 17637 ++++++++++ package/libtirpc/patches/patch-doc_Makefile_in | 87 + package/libtirpc/patches/patch-ltmain_sh | 10637 ++++++ package/libtirpc/patches/patch-man_Makefile_in | 109 + package/libtirpc/patches/patch-src_Makefile_am | 13 +- package/libtirpc/patches/patch-src_Makefile_in | 96 + package/libtirpc/patches/patch-src_rpc_soc_c | 41 - package/libtool/Makefile | 7 +- package/libtool/ipkg/libltdl.control | 4 - package/libtorrent/Makefile | 8 +- package/libtorrent/ipkg/libtorrent.control | 5 - package/libupnp/Makefile | 9 +- package/libupnp/ipkg/libupnp.control | 5 - package/libusb/Makefile | 14 +- package/libusb/ipkg/libusb.control | 4 - package/libusb/patches/no-libusbpp.patch | 114 - package/libvorbis/Makefile | 9 +- package/libvorbis/ipkg/libvorbis.control | 4 - package/libvorbis/ipkg/libvorbisenc.control | 4 - package/libvorbisidec/Makefile | 7 +- package/libvorbisidec/ipkg/libvorbisidec.control | 4 - package/libxkbfile/Makefile | 6 +- package/libxkbfile/ipkg/libxkbfile.control | 4 - package/libxml2/Makefile | 12 +- package/libxml2/ipkg/libxml2.control | 5 - package/libxslt/Makefile | 8 +- package/libxslt/ipkg/libxslt.control | 5 - package/lighttpd/Makefile | 54 +- package/lighttpd/files/lighttpd.conffiles | 1 + package/lighttpd/files/lighttpd.init | 4 +- package/lighttpd/files/lighttpd.postinst | 4 + .../lighttpd/ipkg/lighttpd-mod-accesslog.control | 5 - package/lighttpd/ipkg/lighttpd-mod-alias.control | 5 - package/lighttpd/ipkg/lighttpd-mod-auth.control | 5 - package/lighttpd/ipkg/lighttpd-mod-cgi.control | 5 - package/lighttpd/ipkg/lighttpd-mod-evasive.control | 5 - package/lighttpd/ipkg/lighttpd-mod-expire.control | 5 - package/lighttpd/ipkg/lighttpd-mod-fastcgi.control | 5 - package/lighttpd/ipkg/lighttpd-mod-proxy.control | 5 - .../lighttpd/ipkg/lighttpd-mod-redirect.control | 5 - package/lighttpd/ipkg/lighttpd-mod-rewrite.control | 5 - package/lighttpd/ipkg/lighttpd-mod-setenv.control | 5 - .../ipkg/lighttpd-mod-simple-vhost.control | 5 - package/lighttpd/ipkg/lighttpd-mod-ssi.control | 5 - package/lighttpd/ipkg/lighttpd-mod-status.control | 5 - .../lighttpd/ipkg/lighttpd-mod-usertrack.control | 5 - package/lighttpd/ipkg/lighttpd-mod-webdav.control | 5 - package/lighttpd/ipkg/lighttpd.conffiles | 1 - package/lighttpd/ipkg/lighttpd.control | 5 - package/lighttpd/ipkg/lighttpd.postinst | 4 - package/links/Makefile | 8 +- package/links/ipkg/links.control | 4 - package/linux-atm/Makefile | 16 +- package/linux-atm/ipkg/br2684ctl.control | 4 - package/linux-atm/ipkg/linux-atm.control | 4 - package/linux-atm/patches/000-debian_16.patch | 35073 ------------------- .../linux-atm/patches/010-header_stupidity.patch | 13 - package/linux-atm/patches/100-br2684.patch | 488 - package/linux-atm/patches/200-no_libfl.patch | 193 - package/linux-atm/patches/300-no_autotools.patch | 22686 ------------ .../linux-atm/patches/patch-src_qgen_Makefile_in | 33 + package/linux-atm/patches/patch-src_qgen_ql_l_c | 12 + .../linux-atm/patches/patch-src_sigd_Makefile_in | 12 + package/linux-atm/patches/patch-src_sigd_cfg_l_c | 12 + package/linux-atm/patches/patch-src_switch_cfg_l_c | 12 + .../patches/patch-src_switch_debug_Makefile_in | 12 + .../patches/patch-src_switch_tcp_Makefile_in | 12 + .../linux-atm/patches/patch-src_test_Makefile_in | 12 + package/linux-atm/patches/patch-src_test_ispl_l_c | 12 + package/linux-atm/patches/patch-src_test_ttcp_c | 21 + package/logrotate/Makefile | 10 +- package/logrotate/ipkg/logrotate.control | 6 - package/lrzsz/Makefile | 7 +- package/lrzsz/ipkg/lrzsz.control | 5 - package/ltp/Config.in | 16 - package/ltp/Makefile | 30 - package/ltp/ipkg/ltp.control | 4 - package/ltp/patches/patch-Makefile | 20 - package/ltp/patches/patch-runltp | 22 - .../patch-testcases_kernel_syscalls_Makefile | 13 - .../ltp/patches/patch-testcases_misc_math_Makefile | 10 - .../patch-testcases_misc_math_float_Makefile | 18 - package/lua/Makefile | 42 +- package/lua/ipkg/liblua.control | 4 - package/lua/ipkg/lua-examples.control | 5 - package/lua/ipkg/lua.control | 5 - package/lua/ipkg/luac.control | 5 - package/lua/patches/lua-5.0.2-config.patch | 31 - package/lua/patches/lua-5.0.2-soname.patch | 14 - package/lua/patches/patch-src_Makefile | 16 + package/lvm/Makefile | 9 +- package/lvm/ipkg/lvm.control | 4 - package/lynx/Makefile | 11 +- package/lynx/ipkg/lynx.control | 5 - package/mac80211/Makefile | 17 +- package/mac80211/ipkg/kmod-mac80211-ath5k.control | 4 - package/mac80211/ipkg/kmod-mac80211-rt61.control | 4 - package/mac80211/ipkg/kmod-mac80211.control | 4 - package/macchanger/Makefile | 7 +- package/macchanger/ipkg/macchanger.control | 6 - package/madplay/Makefile | 8 +- package/madplay/ipkg/madplay.control | 6 - package/maradns/Makefile | 15 +- package/maradns/files/maradns.conffiles | 1 + package/maradns/files/maradns.init | 4 +- package/maradns/files/maradns.postinst | 3 + package/maradns/ipkg/maradns.conffiles | 1 - package/maradns/ipkg/maradns.control | 8 - package/maradns/ipkg/maradns.postinst | 3 - package/mc/Makefile | 9 +- package/mc/ipkg/mc.control | 5 - package/mgetty/Makefile | 27 +- package/mgetty/ipkg/mgetty.control | 4 - package/miau/Makefile | 19 +- package/miau/files/miau.conffiles | 1 + package/miau/files/miau.init | 4 +- package/miau/files/miau.postinst | 4 + package/miau/ipkg/miau.conffiles | 1 - package/miau/ipkg/miau.control | 6 - package/miau/ipkg/miau.postinst | 4 - package/miax/Makefile | 9 +- package/miax/ipkg/miax.control | 5 - package/microperl/Makefile | 12 +- package/microperl/ipkg/microperl.control | 4 - package/microperl/patches/patch-Makefile_micro | 15 + package/mini_httpd/Makefile | 25 +- .../files/mini-httpd-matrixssl.conffiles | 2 + .../mini_httpd/files/mini-httpd-matrixssl.postinst | 3 + .../mini_httpd/files/mini-httpd-openssl.conffiles | 2 + .../mini_httpd/files/mini-httpd-openssl.postinst | 3 + package/mini_httpd/files/mini-httpd.conffiles | 1 + package/mini_httpd/files/mini-httpd.postinst | 3 + package/mini_httpd/files/mini_httpd.init | 4 +- .../mini_httpd/ipkg/mini-httpd-htpasswd.control | 4 - .../mini_httpd/ipkg/mini-httpd-matrixssl.conffiles | 2 - .../mini_httpd/ipkg/mini-httpd-matrixssl.control | 5 - .../mini_httpd/ipkg/mini-httpd-matrixssl.postinst | 3 - .../mini_httpd/ipkg/mini-httpd-openssl.conffiles | 2 - package/mini_httpd/ipkg/mini-httpd-openssl.control | 5 - .../mini_httpd/ipkg/mini-httpd-openssl.postinst | 3 - package/mini_httpd/ipkg/mini-httpd.conffiles | 1 - package/mini_httpd/ipkg/mini-httpd.control | 5 - package/mini_httpd/ipkg/mini-httpd.postinst | 3 - package/mini_sendmail/Makefile | 8 +- package/mini_sendmail/ipkg/mini-sendmail.control | 4 - package/miredo/Makefile | 10 +- package/miredo/files/miredo-server.init | 4 +- package/miredo/files/miredo-server.postinst | 3 + package/miredo/files/miredo.conffiles | 1 + package/miredo/files/miredo.init | 4 +- package/miredo/files/miredo.postinst | 3 + package/miredo/ipkg/miredo-server.control | 5 - package/miredo/ipkg/miredo-server.postinst | 3 - package/miredo/ipkg/miredo.conffiles | 1 - package/miredo/ipkg/miredo.control | 5 - package/miredo/ipkg/miredo.postinst | 3 - package/mksh/Makefile | 16 +- package/mksh/files/mksh.conffiles | 1 + package/mksh/ipkg/mksh.conffiles | 1 - package/mksh/ipkg/mksh.control | 4 - package/mksh/patches/patch-dot_mkshrc | 27 +- package/moc/Makefile | 8 +- package/moc/ipkg/moc.control | 5 - package/monit/Makefile | 20 +- package/monit/files/monit-nossl.conffiles | 1 + package/monit/files/monit.conffiles | 1 + package/monit/files/monit.init | 5 +- package/monit/ipkg/monit-nossl.conffiles | 1 - package/monit/ipkg/monit-nossl.control | 5 - package/monit/ipkg/monit.conffiles | 1 - package/monit/ipkg/monit.control | 4 - package/motion/Makefile | 13 +- package/motion/ipkg/motion.control | 5 - package/motion/patches/01-ffmpeg.patch | 38 - package/motion/patches/02-honor_cppflags.patch | 20 - package/motion/patches/patch-track_c | 21 + package/mpd/Makefile | 69 +- package/mpd/files/mpd.conffiles | 1 + package/mpd/files/mpd.init | 4 +- package/mpd/files/mpd.postinst | 6 + package/mpd/ipkg/mpd.conffiles | 1 - package/mpd/ipkg/mpd.control | 5 - package/mpd/ipkg/mpd.postinst | 6 - package/mpfr/Makefile | 7 +- package/mpfr/ipkg/mpfr.control | 4 - package/mplayer/Makefile | 10 +- package/mplayer/ipkg/mplayer.control | 5 - package/mrd6/Makefile | 20 +- package/mrd6/files/mrd6.init | 4 +- package/mrd6/files/mrd6.postinst | 3 + package/mrd6/ipkg/mrd6.control | 6 - package/mrd6/ipkg/mrd6.postinst | 3 - package/mt-daapd/Makefile | 14 +- package/mt-daapd/files/mt-daapd.conffiles | 2 + package/mt-daapd/files/mt-daapd.init | 4 +- package/mt-daapd/files/mt-daapd.postinst | 3 + package/mt-daapd/ipkg/mt-daapd.conffiles | 2 - package/mt-daapd/ipkg/mt-daapd.control | 5 - package/mt-daapd/ipkg/mt-daapd.postinst | 3 - package/mtr/Makefile | 8 +- package/mtr/ipkg/mtr.control | 15 - package/mutt/Makefile | 12 +- package/mutt/ipkg/mutt.control | 5 - package/mysql/Makefile | 8 +- package/mysql/ipkg/libmysqlclient.control | 5 - package/nano/Makefile | 12 +- package/nano/files/nano.conffiles | 1 + package/nano/ipkg/nano.conffiles | 1 - package/nano/ipkg/nano.control | 5 - package/ncurses/Makefile | 7 +- package/ncurses/ipkg/libncurses.control | 4 - package/ndisc/Makefile | 13 +- package/ndisc/ipkg/ndisc6.control | 4 - package/ndisc/ipkg/rdisc6.control | 4 - package/ndisc/ipkg/tcptraceroute6.control | 4 - package/neon/Makefile | 8 +- package/neon/ipkg/neon.control | 5 - package/net-snmp/Makefile | 26 +- package/net-snmp/files/snmpd.conffiles | 1 + package/net-snmp/files/snmpd.init | 4 +- package/net-snmp/files/snmpd.postinst | 3 + package/net-snmp/ipkg/libnetsnmp.control | 4 - package/net-snmp/ipkg/snmp-utils.control | 5 - package/net-snmp/ipkg/snmpd.conffiles | 1 - package/net-snmp/ipkg/snmpd.control | 5 - package/net-snmp/ipkg/snmpd.postinst | 3 - package/netperf/Makefile | 30 +- package/netperf/files/netperf.postinst | 3 + package/netperf/files/netserver.init | 4 +- package/netperf/ipkg/netperf.control | 4 - package/netperf/ipkg/netperf.postinst | 3 - .../patches/01-netperf-2.3pl1-openwrt.patch | 39 - package/netstat-nat/Makefile | 7 +- package/netstat-nat/ipkg/netstat-nat.control | 7 - package/nfs-utils/Makefile | 28 +- package/nfs-utils/files/nfs-utils.postinst | 9 + package/nfs-utils/files/nfsd.init | 4 +- package/nfs-utils/ipkg/nfs-utils.control | 4 - package/nfs-utils/ipkg/nfs-utils.postinst | 9 - package/nmap/Makefile | 18 +- package/nmap/ipkg/nmap.control | 4 - package/nocatsplash/Config.in | 12 - package/nocatsplash/Makefile | 30 - package/nocatsplash/ipkg/nocatsplash.conffiles | 1 - package/nocatsplash/ipkg/nocatsplash.control | 10 - package/nocatsplash/patches/openwrt-firewall.patch | 19 - package/ntfs-3g/Config.in | 5 +- package/ntfs-3g/Makefile | 25 +- package/ntfs-3g/ipkg/kmod-fs-ntfs-3g.control | 4 - package/ntpclient/Makefile | 8 +- package/ntpclient/ipkg/ntpclient.control | 4 - package/nut/Makefile | 34 +- package/nut/files/nut.conffiles | 2 + package/nut/files/nut.postinst | 4 + package/nut/files/upsd.init | 4 +- package/nut/ipkg/nut.conffiles | 2 - package/nut/ipkg/nut.control | 4 - package/nut/ipkg/nut.postinst | 4 - package/obexftp/Makefile | 20 +- package/obexftp/ipkg/obexftp.control | 5 - package/olsrd/Makefile | 20 +- package/olsrd/files/olsrd-mod-secure.conffiles | 1 + package/olsrd/files/olsrd.conffiles | 1 + package/olsrd/files/olsrd.init | 4 +- package/olsrd/files/olsrd.postinst | 3 + package/olsrd/ipkg/olsrd-mod-dot-draw.control | 5 - package/olsrd/ipkg/olsrd-mod-dyn-gw.control | 5 - package/olsrd/ipkg/olsrd-mod-httpinfo.control | 5 - package/olsrd/ipkg/olsrd-mod-nameservice.control | 5 - package/olsrd/ipkg/olsrd-mod-power.control | 5 - package/olsrd/ipkg/olsrd-mod-secure.conffiles | 1 - package/olsrd/ipkg/olsrd-mod-secure.control | 5 - package/olsrd/ipkg/olsrd-mod-tas.control | 5 - package/olsrd/ipkg/olsrd.conffiles | 1 - package/olsrd/ipkg/olsrd.control | 8 - package/olsrd/ipkg/olsrd.postinst | 3 - package/opencdk/Makefile | 10 +- package/opencdk/ipkg/libopencdk.control | 5 - package/openct/Makefile | 18 +- package/openct/ipkg/openct.control | 5 - package/openldap/Makefile | 31 +- package/openldap/files/libopenldap.conffiles | 1 + package/openldap/files/openldap-slapd.postinst | 5 + package/openldap/files/slapd.init | 4 +- package/openldap/ipkg/libopenldap.conffiles | 1 - package/openldap/ipkg/libopenldap.control | 5 - package/openldap/ipkg/openldap-slapd.control | 5 - package/openldap/ipkg/openldap-slapd.postinst | 5 - package/openldap/ipkg/openldap-utils.control | 5 - package/openntpd/Makefile | 10 +- package/openntpd/files/ntpd.init | 4 +- package/openntpd/files/openntpd.conffiles | 1 + package/openntpd/files/openntpd.postinst | 7 + package/openntpd/ipkg/openntpd.conffiles | 1 - package/openntpd/ipkg/openntpd.control | 7 - package/openntpd/ipkg/openntpd.postinst | 7 - package/openobex/Makefile | 13 +- package/openobex/ipkg/openobex.control | 4 - package/openobex/patches/patch-configure | 64 + package/opensc/Makefile | 11 +- package/opensc/ipkg/opensc.control | 4 - package/opensips/Makefile | 62 +- package/opensips/files/opensips.conffiles | 1 + package/opensips/files/opensips.init | 4 +- package/opensips/files/opensips.postinst | 3 + package/opensips/ipkg/opensips-mod-acc.control | 5 - package/opensips/ipkg/opensips-mod-auth-db.control | 5 - .../opensips/ipkg/opensips-mod-auth-radius.control | 5 - package/opensips/ipkg/opensips-mod-auth.control | 5 - .../opensips/ipkg/opensips-mod-avp-radius.control | 5 - .../opensips/ipkg/opensips-mod-avp_radius.control | 5 - package/opensips/ipkg/opensips-mod-avpops.control | 5 - .../opensips/ipkg/opensips-mod-dispatcher.control | 5 - .../opensips/ipkg/opensips-mod-diversion.control | 5 - .../opensips/ipkg/opensips-mod-flatstore.control | 5 - package/opensips/ipkg/opensips-mod-gflags.control | 5 - .../ipkg/opensips-mod-group-radius.control | 5 - package/opensips/ipkg/opensips-mod-group.control | 5 - .../ipkg/opensips-mod-group_radius.control | 5 - package/opensips/ipkg/opensips-mod-lcr.control | 5 - .../opensips/ipkg/opensips-mod-mediaproxy.control | 5 - package/opensips/ipkg/opensips-mod-msilo.control | 5 - package/opensips/ipkg/opensips-mod-mysql.control | 5 - .../opensips/ipkg/opensips-mod-nathelper.control | 5 - package/opensips/ipkg/opensips-mod-options.control | 5 - package/opensips/ipkg/opensips-mod-pdt.control | 5 - .../opensips/ipkg/opensips-mod-permissions.control | 5 - package/opensips/ipkg/opensips-mod-pike.control | 5 - package/opensips/ipkg/opensips-mod-sms.control | 5 - .../opensips/ipkg/opensips-mod-speeddial.control | 5 - .../ipkg/opensips-mod-uac-redirect.control | 5 - package/opensips/ipkg/opensips-mod-uac.control | 5 - .../ipkg/opensips-mod-uac_redirect.control | 5 - package/opensips/ipkg/opensips-mod-uri-db.control | 5 - .../opensips/ipkg/opensips-mod-uri-radius.control | 5 - package/opensips/ipkg/opensips-mod-uri.control | 5 - package/opensips/ipkg/opensips-mod-uri_db.control | 5 - .../opensips/ipkg/opensips-mod-uri_radius.control | 5 - package/opensips/ipkg/opensips-mod-xlog.control | 5 - package/opensips/ipkg/opensips.conffiles | 1 - package/opensips/ipkg/opensips.control | 4 - package/opensips/ipkg/opensips.postinst | 3 - package/openssh/Makefile | 31 +- package/openssh/files/openssh-client.conffiles | 1 + package/openssh/files/openssh-server.conffiles | 1 + package/openssh/files/openssh-server.postinst | 5 + package/openssh/files/sshd.init | 4 +- package/openssh/ipkg/openssh-client-utils.control | 5 - package/openssh/ipkg/openssh-client.conffiles | 1 - package/openssh/ipkg/openssh-client.control | 5 - package/openssh/ipkg/openssh-server.conffiles | 1 - package/openssh/ipkg/openssh-server.control | 4 - package/openssh/ipkg/openssh-server.postinst | 5 - package/openssh/ipkg/openssh-sftp-client.control | 5 - package/openssh/ipkg/openssh-sftp-server.control | 5 - package/openssl-pkcs11/Makefile | 12 +- package/openssl-pkcs11/ipkg/openssl-pkcs11.control | 4 - package/openssl-pkcs11/patches/patch-configure | 60 - package/openssl/Makefile | 20 +- package/openssl/files/ca-certificates.conffiles | 1 + package/openssl/files/openssl-util.conffiles | 1 + package/openssl/ipkg/ca-certificates.conffiles | 1 - package/openssl/ipkg/ca-certificates.control | 4 - package/openssl/ipkg/libopenssl.control | 5 - package/openssl/ipkg/openssl-util.conffiles | 1 - package/openssl/ipkg/openssl-util.control | 5 - package/openswan/Makefile | 14 +- package/openswan/files/openswan.conffiles | 1 + package/openswan/files/openswan.init | 4 +- package/openswan/files/openswan.postinst | 3 + package/openswan/ipkg/openswan.conffiles | 1 - package/openswan/ipkg/openswan.control | 5 - package/openswan/ipkg/openswan.postinst | 3 - package/openvpn/Makefile | 42 +- package/openvpn/files/openvpn.init | 4 +- package/openvpn/files/openvpn.postinst | 3 + package/openvpn/ipkg/openvpn-easy-rsa.control | 5 - package/openvpn/ipkg/openvpn.control | 4 - package/openvpn/ipkg/openvpn.postinst | 3 - package/oprofile/Makefile | 8 +- package/oprofile/ipkg/oprofile.control | 5 - package/osiris/Makefile | 11 +- package/osiris/files/osirisd.init | 4 +- package/osiris/files/osirisd.postinst | 3 + package/osiris/ipkg/osirisd.control | 5 - package/osiris/ipkg/osirisd.postinst | 3 - package/owfs/Makefile | 11 +- package/owfs/ipkg/owfs.control | 5 - package/p910nd/Makefile | 11 +- package/p910nd/files/p910nd.init | 4 +- package/p910nd/files/p910nd.postinst | 4 + package/p910nd/ipkg/p910nd.control | 4 - package/p910nd/ipkg/p910nd.postinst | 4 - package/palantir/Makefile | 9 +- package/palantir/files/palantir.conffiles | 1 + package/palantir/ipkg/palantir.conffiles | 1 - package/palantir/ipkg/palantir.control | 5 - package/parprouted/Makefile | 17 +- package/parprouted/files/parprouted.init | 4 +- package/parprouted/files/parprouted.postinst | 4 + package/parprouted/ipkg/parprouted.control | 5 - package/parprouted/ipkg/parprouted.postinst | 4 - package/parprouted/patches/parprouted.patch | 33 - package/pciutils/Makefile | 7 +- package/pciutils/ipkg/pciutils.control | 4 - package/pcre/Makefile | 20 +- package/pcre/ipkg/libpcre.control | 4 - package/php/Makefile | 43 +- package/php/files/php-cgi.conffiles | 1 + package/php/files/php-cli.conffiles | 1 + package/php/files/php-fastcgi.conffiles | 1 + package/php/files/php-fastcgi.postinst | 4 + package/php/files/php.init | 4 +- package/php/ipkg/php-cgi.conffiles | 1 - package/php/ipkg/php-cgi.control | 6 - package/php/ipkg/php-cli.conffiles | 1 - package/php/ipkg/php-cli.control | 6 - package/php/ipkg/php-fastcgi.conffiles | 1 - package/php/ipkg/php-fastcgi.control | 6 - package/php/ipkg/php-fastcgi.postinst | 4 - package/php/ipkg/php-mod-curl.control | 5 - package/php/ipkg/php-mod-ftp.control | 5 - package/php/ipkg/php-mod-gd.control | 5 - package/php/ipkg/php-mod-gmp.control | 5 - package/php/ipkg/php-mod-ldap.control | 5 - package/php/ipkg/php-mod-mysql.control | 5 - package/php/ipkg/php-mod-openssl.control | 5 - package/php/ipkg/php-mod-pcre.control | 5 - package/php/ipkg/php-mod-pgsql.control | 5 - package/php/ipkg/php-mod-session.control | 5 - package/php/ipkg/php-mod-sockets.control | 5 - package/php/ipkg/php-mod-sqlite.control | 5 - package/php/ipkg/php-mod-xml.control | 5 - package/picocom/Makefile | 7 +- package/picocom/ipkg/picocom.control | 4 - package/pipacs/Makefile | 11 +- package/pipacs/ipkg/pipacs.control | 5 - package/pixman/Makefile | 6 +- package/pixman/ipkg/pixman.control | 4 - package/pmacct/Config.in | 191 +- package/pmacct/Makefile | 187 +- package/pmacct/files/nfacctd.conffiles | 1 + package/pmacct/files/nfacctd.init | 4 +- package/pmacct/files/nfacctd.postinst | 4 + package/pmacct/files/pmacctd.conffiles | 1 + package/pmacct/files/pmacctd.init | 4 +- package/pmacct/files/pmacctd.postinst | 4 + package/pmacct/ipkg/nfacctd-custom.control | 6 - package/pmacct/ipkg/nfacctd-mysql.control | 6 - package/pmacct/ipkg/nfacctd-pgsql.control | 6 - package/pmacct/ipkg/nfacctd-sqlite.control | 6 - package/pmacct/ipkg/nfacctd.conffiles | 1 - package/pmacct/ipkg/nfacctd.control | 6 - package/pmacct/ipkg/nfacctd.postinst | 4 - package/pmacct/ipkg/pmacct-client.control | 5 - package/pmacct/ipkg/pmacctd-custom.control | 6 - package/pmacct/ipkg/pmacctd-mysql.control | 6 - package/pmacct/ipkg/pmacctd-pgsql.control | 6 - package/pmacct/ipkg/pmacctd-sqlite.control | 6 - package/pmacct/ipkg/pmacctd.conffiles | 1 - package/pmacct/ipkg/pmacctd.control | 6 - package/pmacct/ipkg/pmacctd.postinst | 4 - .../patches/patch-src_nfprobe_plugin_netflow9_c | 45 + package/popt/Makefile | 7 +- package/popt/ipkg/libpopt.control | 4 - package/portmap/Makefile | 18 +- package/portmap/files/portmap.init | 4 +- package/portmap/files/portmap.postinst | 5 + package/portmap/ipkg/portmap.control | 4 - package/portmap/ipkg/portmap.postinst | 5 - package/portsentry/Makefile | 10 +- package/portsentry/files/portsentry.conffiles | 1 + package/portsentry/ipkg/portsentry.conffiles | 1 - package/portsentry/ipkg/portsentry.control | 4 - package/postgresql/Makefile | 8 +- package/postgresql/ipkg/libpq.control | 4 - package/postgresql/ipkg/pgsql-cli.control | 5 - package/ppp/Makefile | 22 +- package/ppp/files/ppp-mod-radius.conffiles | 10 + package/ppp/files/ppp.conffiles | 2 + package/ppp/ipkg/ppp-mod-chat.control | 5 - package/ppp/ipkg/ppp-mod-pppdump.control | 5 - package/ppp/ipkg/ppp-mod-pppoa.control | 5 - package/ppp/ipkg/ppp-mod-pppoe.control | 5 - package/ppp/ipkg/ppp-mod-pppstats.control | 5 - package/ppp/ipkg/ppp-mod-pppumts.control | 5 - package/ppp/ipkg/ppp-mod-radius.conffiles | 10 - package/ppp/ipkg/ppp-mod-radius.control | 5 - package/ppp/ipkg/ppp.conffiles | 2 - package/ppp/ipkg/ppp.control | 5 - package/pptp/Makefile | 7 +- package/pptp/files/pptp.conffiles | 1 + package/pptp/ipkg/pptp.conffiles | 1 - package/pptp/ipkg/pptp.control | 5 - package/pptpd/Makefile | 11 +- package/pptpd/files/pptpd.conffiles | 2 + package/pptpd/files/pptpd.init | 7 +- package/pptpd/files/pptpd.postinst | 3 + package/pptpd/ipkg/pptpd.conffiles | 2 - package/pptpd/ipkg/pptpd.control | 5 - package/pptpd/ipkg/pptpd.postinst | 3 - package/privoxy/Makefile | 9 +- package/privoxy/ipkg/privoxy.control | 5 - package/procmail/Makefile | 7 +- package/procmail/ipkg/procmail.control | 4 - package/procps/Makefile | 8 +- package/procps/ipkg/procps.control | 4 - package/ptunnel/Makefile | 8 +- package/ptunnel/ipkg/ptunnel.control | 5 - package/quagga/Makefile | 30 +- package/quagga/files/quagga.init | 4 +- package/quagga/files/quagga.postinst | 16 + package/quagga/ipkg/quagga-bgpd.control | 6 - package/quagga/ipkg/quagga-ospf6d.control | 6 - package/quagga/ipkg/quagga-ospfd.control | 6 - package/quagga/ipkg/quagga-ripd.control | 6 - package/quagga/ipkg/quagga-ripngd.control | 6 - package/quagga/ipkg/quagga-vtysh.control | 6 - package/quagga/ipkg/quagga.control | 6 - package/quagga/ipkg/quagga.postinst | 16 - package/raddump/Makefile | 14 +- package/raddump/ipkg/raddump.control | 6 - package/radiusclient-ng/Makefile | 9 +- .../ipkg/libradiusclient-ng.control | 4 - .../radiusclient-ng/ipkg/radiusclient-ng.control | 5 - package/radvd/Makefile | 33 +- package/radvd/files/radvd.conffiles | 1 + package/radvd/files/radvd.init | 4 +- package/radvd/files/radvd.postinst | 3 + package/radvd/ipkg/radvd.conffiles | 1 - package/radvd/ipkg/radvd.control | 5 - package/radvd/ipkg/radvd.postinst | 3 - package/radvd/patches/no-libfl.patch | 4 +- package/radvd/patches/patch-Makefile_in | 12 + package/randrproto/Makefile | 2 +- package/rarpd/Makefile | 16 +- package/rarpd/files/rarpd.init | 4 +- package/rarpd/files/rarpd.postinst | 4 + package/rarpd/ipkg/rarpd.control | 5 - package/rarpd/ipkg/rarpd.postinst | 4 - package/rdate/Makefile | 15 +- package/rdate/files/rdate.postinst | 4 + package/rdate/ipkg/rdate.control | 4 - package/rdate/ipkg/rdate.postinst | 4 - package/readline/Makefile | 7 +- package/readline/ipkg/libreadline.control | 5 - package/reaim/Makefile | 11 +- package/reaim/files/reaim.init | 4 +- package/reaim/files/reaim.postinst | 4 + package/reaim/ipkg/reaim.control | 5 - package/reaim/ipkg/reaim.postinst | 4 - package/renderproto/Makefile | 2 +- package/resourceproto/Makefile | 2 +- package/rp-pppoe/Makefile | 32 +- package/rp-pppoe/files/pppoe-client.conffiles | 1 + package/rp-pppoe/files/pppoe-client.init | 4 +- package/rp-pppoe/files/pppoe-client.postinst | 3 + package/rp-pppoe/files/pppoe-relay.init | 4 +- package/rp-pppoe/files/pppoe-relay.postinst | 5 + package/rp-pppoe/files/pppoe-server.conffiles | 1 + package/rp-pppoe/files/pppoe-server.init | 4 +- package/rp-pppoe/files/rules | 169 + package/rp-pppoe/files/version | 1 + package/rp-pppoe/ipkg/pppoe-client.conffiles | 1 - package/rp-pppoe/ipkg/pppoe-client.control | 5 - package/rp-pppoe/ipkg/pppoe-client.postinst | 3 - package/rp-pppoe/ipkg/pppoe-relay.control | 4 - package/rp-pppoe/ipkg/pppoe-relay.postinst | 5 - package/rp-pppoe/ipkg/pppoe-server.conffiles | 1 - package/rp-pppoe/ipkg/pppoe-server.control | 5 - package/rp-pppoe/ipkg/pppoe-sniff.control | 4 - package/rp-pppoe/ipkg/rules | 169 - package/rp-pppoe/ipkg/version | 1 - package/rrdcollect/Makefile | 12 +- .../rrdcollect/files/rrdcollect-example.conffiles | 2 + package/rrdcollect/files/rrdcollect.init | 4 +- package/rrdcollect/files/rrdcollect.postinst | 3 + .../rrdcollect/ipkg/rrdcollect-example.conffiles | 2 - package/rrdcollect/ipkg/rrdcollect-example.control | 10 - package/rrdcollect/ipkg/rrdcollect.control | 5 - package/rrdcollect/ipkg/rrdcollect.postinst | 3 - package/rrdtool/Makefile | 11 +- package/rrdtool/ipkg/librrd.control | 14 - package/rrdtool/ipkg/rrdcgi.control | 15 - package/rrdtool/ipkg/rrdtool.control | 14 - package/rrs/Makefile | 22 +- package/rrs/ipkg/rrs-nossl.control | 5 - package/rrs/ipkg/rrs.control | 5 - package/rsync/Makefile | 10 +- package/rsync/ipkg/rsync.control | 5 - package/rtorrent/Makefile | 10 +- package/rtorrent/ipkg/rtorrent.control | 5 - package/ruby/Makefile | 10 +- package/ruby/ipkg/ruby.control | 4 - package/samba/Makefile | 17 +- package/samba/files/samba.conffiles | 1 + package/samba/files/samba.init | 4 +- package/samba/files/samba.postinst | 3 + package/samba/files/swat.postinst | 6 + package/samba/ipkg/samba-client.control | 4 - package/samba/ipkg/samba-passwd.control | 4 - package/samba/ipkg/samba.conffiles | 1 - package/samba/ipkg/samba.control | 5 - package/samba/ipkg/samba.postinst | 3 - package/samba/ipkg/swat.control | 5 - package/samba/ipkg/swat.postinst | 6 - package/sane-backends/Makefile | 126 +- .../files/sane-backend-abaton.conffiles | 1 + .../files/sane-backend-abaton.postinst | 2 + .../files/sane-backend-agfafocus.conffiles | 1 + .../files/sane-backend-agfafocus.postinst | 2 + .../files/sane-backend-apple.conffiles | 1 + .../files/sane-backend-apple.postinst | 2 + .../files/sane-backend-artec-eplus48u.conffiles | 1 + .../files/sane-backend-artec-eplus48u.postinst | 2 + .../files/sane-backend-artec.conffiles | 1 + .../files/sane-backend-artec.postinst | 2 + .../sane-backends/files/sane-backend-as6e.postinst | 2 + .../files/sane-backend-avision.conffiles | 1 + .../files/sane-backend-avision.postinst | 2 + .../sane-backends/files/sane-backend-bh.conffiles | 1 + .../sane-backends/files/sane-backend-bh.postinst | 2 + .../files/sane-backend-canon.conffiles | 1 + .../files/sane-backend-canon.postinst | 2 + .../files/sane-backend-canon630u.conffiles | 1 + .../files/sane-backend-canon630u.postinst | 2 + .../files/sane-backend-coolscan.conffiles | 1 + .../files/sane-backend-coolscan.postinst | 2 + .../files/sane-backend-coolscan2.conffiles | 1 + .../files/sane-backend-coolscan2.postinst | 2 + .../files/sane-backend-dc25.conffiles | 1 + .../sane-backends/files/sane-backend-dc25.postinst | 2 + .../sane-backends/files/sane-backend-dmc.conffiles | 1 + .../sane-backends/files/sane-backend-dmc.postinst | 2 + .../files/sane-backend-epson.conffiles | 1 + .../files/sane-backend-epson.postinst | 2 + .../files/sane-backend-fujitsu.conffiles | 1 + .../files/sane-backend-fujitsu.postinst | 2 + .../files/sane-backend-genesys.conffiles | 1 + .../files/sane-backend-genesys.postinst | 2 + .../files/sane-backend-gt68xx.conffiles | 1 + .../files/sane-backend-gt68xx.postinst | 2 + .../sane-backends/files/sane-backend-hp.conffiles | 1 + .../sane-backends/files/sane-backend-hp.postinst | 2 + .../files/sane-backend-hp3500.postinst | 2 + .../files/sane-backend-hp4200.conffiles | 1 + .../files/sane-backend-hp4200.postinst | 2 + .../files/sane-backend-hp5400.conffiles | 1 + .../files/sane-backend-hp5400.postinst | 2 + .../sane-backends/files/sane-backend-ibm.conffiles | 1 + .../sane-backends/files/sane-backend-ibm.postinst | 2 + .../sane-backends/files/sane-backend-leo.conffiles | 1 + .../sane-backends/files/sane-backend-leo.postinst | 2 + .../files/sane-backend-lexmark.conffiles | 1 + .../files/sane-backend-lexmark.postinst | 2 + .../files/sane-backend-ma1509.conffiles | 1 + .../files/sane-backend-ma1509.postinst | 2 + .../files/sane-backend-matsushita.conffiles | 1 + .../files/sane-backend-matsushita.postinst | 2 + .../files/sane-backend-microtek.conffiles | 1 + .../files/sane-backend-microtek.postinst | 2 + .../files/sane-backend-microtek2.conffiles | 1 + .../files/sane-backend-microtek2.postinst | 2 + .../files/sane-backend-mustek-usb.conffiles | 1 + .../files/sane-backend-mustek-usb.postinst | 2 + .../files/sane-backend-mustek-usb2.postinst | 2 + .../files/sane-backend-mustek.conffiles | 1 + .../files/sane-backend-mustek.postinst | 2 + .../sane-backends/files/sane-backend-nec.conffiles | 1 + .../sane-backends/files/sane-backend-nec.postinst | 2 + .../sane-backends/files/sane-backend-net.conffiles | 1 + .../sane-backends/files/sane-backend-net.postinst | 2 + .../files/sane-backend-niash.postinst | 2 + .../sane-backends/files/sane-backend-pie.conffiles | 1 + .../sane-backends/files/sane-backend-pie.postinst | 2 + .../files/sane-backend-pixma.postinst | 2 + .../files/sane-backend-plustek-pp.conffiles | 1 + .../files/sane-backend-plustek-pp.postinst | 2 + .../files/sane-backend-plustek.conffiles | 1 + .../files/sane-backend-plustek.postinst | 2 + .../files/sane-backend-qcam.conffiles | 1 + .../sane-backends/files/sane-backend-qcam.postinst | 2 + .../files/sane-backend-ricoh.conffiles | 1 + .../files/sane-backend-ricoh.postinst | 2 + .../files/sane-backend-s9036.conffiles | 1 + .../files/sane-backend-s9036.postinst | 2 + .../files/sane-backend-sceptre.conffiles | 1 + .../files/sane-backend-sceptre.postinst | 2 + .../files/sane-backend-sharp.conffiles | 1 + .../files/sane-backend-sharp.postinst | 2 + .../files/sane-backend-sm3600.postinst | 2 + .../files/sane-backend-sm3840.conffiles | 1 + .../files/sane-backend-sm3840.postinst | 2 + .../files/sane-backend-snapscan.conffiles | 1 + .../files/sane-backend-snapscan.postinst | 2 + .../files/sane-backend-sp15c.conffiles | 1 + .../files/sane-backend-sp15c.postinst | 2 + .../files/sane-backend-st400.conffiles | 1 + .../files/sane-backend-st400.postinst | 2 + .../files/sane-backend-stv680.conffiles | 1 + .../files/sane-backend-stv680.postinst | 2 + .../files/sane-backend-tamarack.conffiles | 1 + .../files/sane-backend-tamarack.postinst | 2 + .../files/sane-backend-teco1.conffiles | 1 + .../files/sane-backend-teco1.postinst | 2 + .../files/sane-backend-teco2.conffiles | 1 + .../files/sane-backend-teco2.postinst | 2 + .../files/sane-backend-teco3.conffiles | 1 + .../files/sane-backend-teco3.postinst | 2 + .../files/sane-backend-test.conffiles | 1 + .../sane-backends/files/sane-backend-test.postinst | 2 + .../sane-backends/files/sane-backend-u12.conffiles | 1 + .../sane-backends/files/sane-backend-u12.postinst | 2 + .../files/sane-backend-umax-pp.conffiles | 1 + .../files/sane-backend-umax-pp.postinst | 2 + .../files/sane-backend-umax.conffiles | 1 + .../sane-backends/files/sane-backend-umax.postinst | 2 + .../files/sane-backend-umax1220u.conffiles | 1 + .../files/sane-backend-umax1220u.postinst | 2 + .../sane-backends/files/sane-backend-v4l.conffiles | 1 + .../sane-backends/files/sane-backend-v4l.postinst | 2 + .../sane-backends/files/sane-backends.conffiles | 2 + .../ipkg/sane-backend-abaton.conffiles | 1 - .../sane-backends/ipkg/sane-backend-abaton.control | 5 - .../ipkg/sane-backend-abaton.postinst | 2 - .../ipkg/sane-backend-agfafocus.conffiles | 1 - .../ipkg/sane-backend-agfafocus.control | 5 - .../ipkg/sane-backend-agfafocus.postinst | 2 - .../ipkg/sane-backend-apple.conffiles | 1 - .../sane-backends/ipkg/sane-backend-apple.control | 5 - .../sane-backends/ipkg/sane-backend-apple.postinst | 2 - .../ipkg/sane-backend-artec-eplus48u.conffiles | 1 - .../ipkg/sane-backend-artec-eplus48u.control | 5 - .../ipkg/sane-backend-artec-eplus48u.postinst | 2 - .../ipkg/sane-backend-artec.conffiles | 1 - .../sane-backends/ipkg/sane-backend-artec.control | 5 - .../sane-backends/ipkg/sane-backend-artec.postinst | 2 - .../sane-backends/ipkg/sane-backend-as6e.control | 5 - .../sane-backends/ipkg/sane-backend-as6e.postinst | 2 - .../ipkg/sane-backend-avision.conffiles | 1 - .../ipkg/sane-backend-avision.control | 5 - .../ipkg/sane-backend-avision.postinst | 2 - .../sane-backends/ipkg/sane-backend-bh.conffiles | 1 - package/sane-backends/ipkg/sane-backend-bh.control | 5 - .../sane-backends/ipkg/sane-backend-bh.postinst | 2 - .../ipkg/sane-backend-canon.conffiles | 1 - .../sane-backends/ipkg/sane-backend-canon.control | 5 - .../sane-backends/ipkg/sane-backend-canon.postinst | 2 - .../ipkg/sane-backend-canon630u.conffiles | 1 - .../ipkg/sane-backend-canon630u.control | 5 - .../ipkg/sane-backend-canon630u.postinst | 2 - .../ipkg/sane-backend-coolscan.conffiles | 1 - .../ipkg/sane-backend-coolscan.control | 5 - .../ipkg/sane-backend-coolscan.postinst | 2 - .../ipkg/sane-backend-coolscan2.conffiles | 1 - .../ipkg/sane-backend-coolscan2.control | 5 - .../ipkg/sane-backend-coolscan2.postinst | 2 - .../sane-backends/ipkg/sane-backend-dc25.conffiles | 1 - .../sane-backends/ipkg/sane-backend-dc25.control | 5 - .../sane-backends/ipkg/sane-backend-dc25.postinst | 2 - .../sane-backends/ipkg/sane-backend-dmc.conffiles | 1 - .../sane-backends/ipkg/sane-backend-dmc.control | 5 - .../sane-backends/ipkg/sane-backend-dmc.postinst | 2 - .../ipkg/sane-backend-epson.conffiles | 1 - .../sane-backends/ipkg/sane-backend-epson.control | 5 - .../sane-backends/ipkg/sane-backend-epson.postinst | 2 - .../ipkg/sane-backend-fujitsu.conffiles | 1 - .../ipkg/sane-backend-fujitsu.control | 5 - .../ipkg/sane-backend-fujitsu.postinst | 2 - .../ipkg/sane-backend-genesys.conffiles | 1 - .../ipkg/sane-backend-genesys.control | 5 - .../ipkg/sane-backend-genesys.postinst | 2 - .../ipkg/sane-backend-gt68xx.conffiles | 1 - .../sane-backends/ipkg/sane-backend-gt68xx.control | 5 - .../ipkg/sane-backend-gt68xx.postinst | 2 - .../sane-backends/ipkg/sane-backend-hp.conffiles | 1 - package/sane-backends/ipkg/sane-backend-hp.control | 5 - .../sane-backends/ipkg/sane-backend-hp.postinst | 2 - .../sane-backends/ipkg/sane-backend-hp3500.control | 5 - .../ipkg/sane-backend-hp3500.postinst | 2 - .../ipkg/sane-backend-hp4200.conffiles | 1 - .../sane-backends/ipkg/sane-backend-hp4200.control | 5 - .../ipkg/sane-backend-hp4200.postinst | 2 - .../ipkg/sane-backend-hp5400.conffiles | 1 - .../sane-backends/ipkg/sane-backend-hp5400.control | 5 - .../ipkg/sane-backend-hp5400.postinst | 2 - .../sane-backends/ipkg/sane-backend-ibm.conffiles | 1 - .../sane-backends/ipkg/sane-backend-ibm.control | 5 - .../sane-backends/ipkg/sane-backend-ibm.postinst | 2 - .../sane-backends/ipkg/sane-backend-leo.conffiles | 1 - .../sane-backends/ipkg/sane-backend-leo.control | 5 - .../sane-backends/ipkg/sane-backend-leo.postinst | 2 - .../ipkg/sane-backend-lexmark.conffiles | 1 - .../ipkg/sane-backend-lexmark.control | 5 - .../ipkg/sane-backend-lexmark.postinst | 2 - .../ipkg/sane-backend-ma1509.conffiles | 1 - .../sane-backends/ipkg/sane-backend-ma1509.control | 5 - .../ipkg/sane-backend-ma1509.postinst | 2 - .../ipkg/sane-backend-matsushita.conffiles | 1 - .../ipkg/sane-backend-matsushita.control | 5 - .../ipkg/sane-backend-matsushita.postinst | 2 - .../ipkg/sane-backend-microtek.conffiles | 1 - .../ipkg/sane-backend-microtek.control | 5 - .../ipkg/sane-backend-microtek.postinst | 2 - .../ipkg/sane-backend-microtek2.conffiles | 1 - .../ipkg/sane-backend-microtek2.control | 5 - .../ipkg/sane-backend-microtek2.postinst | 2 - .../ipkg/sane-backend-mustek-usb.conffiles | 1 - .../ipkg/sane-backend-mustek-usb.control | 5 - .../ipkg/sane-backend-mustek-usb.postinst | 2 - .../ipkg/sane-backend-mustek-usb2.control | 5 - .../ipkg/sane-backend-mustek-usb2.postinst | 2 - .../ipkg/sane-backend-mustek.conffiles | 1 - .../sane-backends/ipkg/sane-backend-mustek.control | 5 - .../ipkg/sane-backend-mustek.postinst | 2 - .../sane-backends/ipkg/sane-backend-nec.conffiles | 1 - .../sane-backends/ipkg/sane-backend-nec.control | 5 - .../sane-backends/ipkg/sane-backend-nec.postinst | 2 - .../sane-backends/ipkg/sane-backend-net.conffiles | 1 - .../sane-backends/ipkg/sane-backend-net.control | 5 - .../sane-backends/ipkg/sane-backend-net.postinst | 2 - .../sane-backends/ipkg/sane-backend-niash.control | 5 - .../sane-backends/ipkg/sane-backend-niash.postinst | 2 - .../sane-backends/ipkg/sane-backend-pie.conffiles | 1 - .../sane-backends/ipkg/sane-backend-pie.control | 5 - .../sane-backends/ipkg/sane-backend-pie.postinst | 2 - .../sane-backends/ipkg/sane-backend-pixma.control | 5 - .../sane-backends/ipkg/sane-backend-pixma.postinst | 2 - .../ipkg/sane-backend-plustek-pp.conffiles | 1 - .../ipkg/sane-backend-plustek-pp.control | 5 - .../ipkg/sane-backend-plustek-pp.postinst | 2 - .../ipkg/sane-backend-plustek.conffiles | 1 - .../ipkg/sane-backend-plustek.control | 5 - .../ipkg/sane-backend-plustek.postinst | 2 - .../sane-backends/ipkg/sane-backend-qcam.conffiles | 1 - .../sane-backends/ipkg/sane-backend-qcam.control | 5 - .../sane-backends/ipkg/sane-backend-qcam.postinst | 2 - .../ipkg/sane-backend-ricoh.conffiles | 1 - .../sane-backends/ipkg/sane-backend-ricoh.control | 5 - .../sane-backends/ipkg/sane-backend-ricoh.postinst | 2 - .../ipkg/sane-backend-s9036.conffiles | 1 - .../sane-backends/ipkg/sane-backend-s9036.control | 5 - .../sane-backends/ipkg/sane-backend-s9036.postinst | 2 - .../ipkg/sane-backend-sceptre.conffiles | 1 - .../ipkg/sane-backend-sceptre.control | 5 - .../ipkg/sane-backend-sceptre.postinst | 2 - .../ipkg/sane-backend-sharp.conffiles | 1 - .../sane-backends/ipkg/sane-backend-sharp.control | 5 - .../sane-backends/ipkg/sane-backend-sharp.postinst | 2 - .../sane-backends/ipkg/sane-backend-sm3600.control | 5 - .../ipkg/sane-backend-sm3600.postinst | 2 - .../ipkg/sane-backend-sm3840.conffiles | 1 - .../sane-backends/ipkg/sane-backend-sm3840.control | 5 - .../ipkg/sane-backend-sm3840.postinst | 2 - .../ipkg/sane-backend-snapscan.conffiles | 1 - .../ipkg/sane-backend-snapscan.control | 5 - .../ipkg/sane-backend-snapscan.postinst | 2 - .../ipkg/sane-backend-sp15c.conffiles | 1 - .../sane-backends/ipkg/sane-backend-sp15c.control | 5 - .../sane-backends/ipkg/sane-backend-sp15c.postinst | 2 - .../ipkg/sane-backend-st400.conffiles | 1 - .../sane-backends/ipkg/sane-backend-st400.control | 5 - .../sane-backends/ipkg/sane-backend-st400.postinst | 2 - .../ipkg/sane-backend-stv680.conffiles | 1 - .../sane-backends/ipkg/sane-backend-stv680.control | 5 - .../ipkg/sane-backend-stv680.postinst | 2 - .../ipkg/sane-backend-tamarack.conffiles | 1 - .../ipkg/sane-backend-tamarack.control | 5 - .../ipkg/sane-backend-tamarack.postinst | 2 - .../ipkg/sane-backend-teco1.conffiles | 1 - .../sane-backends/ipkg/sane-backend-teco1.control | 5 - .../sane-backends/ipkg/sane-backend-teco1.postinst | 2 - .../ipkg/sane-backend-teco2.conffiles | 1 - .../sane-backends/ipkg/sane-backend-teco2.control | 5 - .../sane-backends/ipkg/sane-backend-teco2.postinst | 2 - .../ipkg/sane-backend-teco3.conffiles | 1 - .../sane-backends/ipkg/sane-backend-teco3.control | 5 - .../sane-backends/ipkg/sane-backend-teco3.postinst | 2 - .../sane-backends/ipkg/sane-backend-test.conffiles | 1 - .../sane-backends/ipkg/sane-backend-test.control | 5 - .../sane-backends/ipkg/sane-backend-test.postinst | 2 - .../sane-backends/ipkg/sane-backend-u12.conffiles | 1 - .../sane-backends/ipkg/sane-backend-u12.control | 5 - .../sane-backends/ipkg/sane-backend-u12.postinst | 2 - .../ipkg/sane-backend-umax-pp.conffiles | 1 - .../ipkg/sane-backend-umax-pp.control | 5 - .../ipkg/sane-backend-umax-pp.postinst | 2 - .../sane-backends/ipkg/sane-backend-umax.conffiles | 1 - .../sane-backends/ipkg/sane-backend-umax.control | 5 - .../sane-backends/ipkg/sane-backend-umax.postinst | 2 - .../ipkg/sane-backend-umax1220u.conffiles | 1 - .../ipkg/sane-backend-umax1220u.control | 5 - .../ipkg/sane-backend-umax1220u.postinst | 2 - .../sane-backends/ipkg/sane-backend-v4l.conffiles | 1 - .../sane-backends/ipkg/sane-backend-v4l.control | 5 - .../sane-backends/ipkg/sane-backend-v4l.postinst | 2 - package/sane-backends/ipkg/sane-backends.conffiles | 2 - package/sane-backends/ipkg/sane-backends.control | 5 - package/scanlogd/Makefile | 11 +- package/scanlogd/files/scanlogd.init | 4 +- package/scanlogd/files/scanlogd.postinst | 36 + package/scanlogd/ipkg/scanlogd.control | 5 - package/scanlogd/ipkg/scanlogd.postinst | 36 - package/scdp/Makefile | 7 +- package/scdp/ipkg/scdp.control | 5 - package/screen/Makefile | 8 +- package/screen/ipkg/screen.control | 5 - package/scrnsaverproto/Makefile | 2 +- package/scsi-spin/Makefile | 8 +- package/scsi-spin/ipkg/scsi-spin.control | 4 - package/ser2net/Makefile | 9 +- package/ser2net/files/ser2net.conffiles | 1 + package/ser2net/ipkg/ser2net.conffiles | 1 - package/ser2net/ipkg/ser2net.control | 5 - package/serdisplib/Makefile | 10 +- package/serdisplib/ipkg/serdisplib.control | 4 - package/serdisplib/patches/patch-Makefile_in | 6 +- package/serdisplib/patches/patch-configure | 6 +- package/serdisplib/patches/patch-src_Makefile_in | 6 +- .../serdisplib/patches/patch-src_serdisp_control_c | 48 + package/setpwc/Makefile | 10 +- package/setpwc/ipkg/setpwc.control | 4 - package/setserial/Makefile | 6 +- package/setserial/ipkg/setserial.control | 4 - package/shat/Makefile | 6 +- package/shat/ipkg/shat.control | 4 - package/shorewall-common/Makefile | 14 +- .../files/shorewall-common.conffiles | 33 + .../files/shorewall-common.postinst | 6 + .../shorewall-common/files/shorewall-common.prerm | 8 + package/shorewall-common/files/shorewall.init | 4 +- .../ipkg/shorewall-common.conffiles | 33 - .../shorewall-common/ipkg/shorewall-common.control | 5 - .../ipkg/shorewall-common.postinst | 6 - .../shorewall-common/ipkg/shorewall-common.prerm | 8 - package/shorewall-shell/Makefile | 10 +- .../shorewall-shell/ipkg/shorewall-shell.control | 5 - package/siproxd/Makefile | 19 +- package/siproxd/files/siproxd.conffiles | 2 + package/siproxd/files/siproxd.init | 4 +- package/siproxd/files/siproxd.postinst | 3 + package/siproxd/ipkg/siproxd.conffiles | 2 - package/siproxd/ipkg/siproxd.control | 5 - package/siproxd/ipkg/siproxd.postinst | 3 - package/siproxd/patches/patch-configure | 18 - package/sipsak/Makefile | 9 +- package/sipsak/ipkg/sipsak.control | 5 - package/sispmctl/Makefile | 10 +- package/sispmctl/ipkg/sispmctl.control | 5 - package/slurm/Makefile | 8 +- package/slurm/ipkg/slurm.control | 6 - package/snort-wireless/Makefile | 12 +- .../snort-wireless/files/snort-wireless.conffiles | 2 + package/snort-wireless/files/snort-wireless.init | 4 +- .../snort-wireless/files/snort-wireless.postinst | 4 + .../snort-wireless/ipkg/snort-wireless.conffiles | 2 - package/snort-wireless/ipkg/snort-wireless.control | 6 - .../snort-wireless/ipkg/snort-wireless.postinst | 4 - package/snort/Makefile | 10 +- package/snort/files/snort.conffiles | 2 + package/snort/files/snort.init | 4 +- package/snort/files/snort.postinst | 4 + package/snort/ipkg/snort.conffiles | 2 - package/snort/ipkg/snort.control | 6 - package/snort/ipkg/snort.postinst | 4 - package/socat/Makefile | 8 +- package/socat/ipkg/socat.control | 11 - package/speex/Makefile | 7 +- package/speex/ipkg/libspeex.control | 4 - package/sqlite/Makefile | 11 +- package/sqlite/ipkg/libsqlite.control | 4 - package/sqlite/ipkg/sqlite-cli.control | 5 - package/squid/Makefile | 31 +- package/squid/files/squid.conffiles | 2 + .../ipkg/squid-mod-basic-auth-getpwnam.control | 5 - .../squid/ipkg/squid-mod-basic-auth-ncsa.control | 5 - .../squid/ipkg/squid-mod-basic-auth-smb.control | 5 - .../ipkg/squid-mod-basic-auth-winbind.control | 5 - .../ipkg/squid-mod-digest-auth-password.control | 5 - .../ipkg/squid-mod-external-acl-ip-user.control | 5 - .../ipkg/squid-mod-external-acl-unix-group.control | 5 - .../squid-mod-external-acl-winbind-group.control | 5 - .../ipkg/squid-mod-ntlm-auth-fakeauth.control | 5 - .../ipkg/squid-mod-ntlm-auth-smb-auth.control | 5 - .../ipkg/squid-mod-ntlm-auth-winbind-auth.control | 5 - package/squid/ipkg/squid.conffiles | 2 - package/squid/ipkg/squid.control | 5 - package/srelay/Makefile | 11 +- package/srelay/files/srelay.conffiles | 1 + package/srelay/files/srelay.init | 4 +- package/srelay/files/srelay.postinst | 4 + package/srelay/ipkg/srelay.conffiles | 1 - package/srelay/ipkg/srelay.control | 4 - package/srelay/ipkg/srelay.postinst | 4 - package/ssltunnel/Makefile | 7 +- package/ssltunnel/ipkg/ssltunnel.control | 5 - package/ssmtp/Makefile | 7 +- package/ssmtp/files/ssmtp.conffiles | 2 + package/ssmtp/ipkg/ssmtp.conffiles | 2 - package/ssmtp/ipkg/ssmtp.control | 4 - package/strace/Makefile | 7 +- package/strace/ipkg/strace.control | 4 - package/stress/Makefile | 6 +- package/stress/ipkg/stress.control | 4 - package/strongswan/Config.in | 10 - package/strongswan/Makefile | 28 - package/strongswan/files/strongswan.init | 26 - package/strongswan/ipkg/strongswan.control | 5 - package/subversion/Makefile | 17 +- package/subversion/files/subversion.postinst | 4 + package/subversion/files/svnserve.init | 16 +- package/subversion/ipkg/subversion.control | 4 - package/subversion/ipkg/subversion.postinst | 4 - package/swconfig/Makefile | 8 +- package/swconfig/ipkg/swconfig.control | 4 - package/syslog-ng/Makefile | 14 +- package/syslog-ng/files/syslog-ng.conffiles | 1 + package/syslog-ng/files/syslog-ng.init | 4 +- package/syslog-ng/files/syslog-ng.postinst | 3 + package/syslog-ng/ipkg/syslog-ng.conffiles | 1 - package/syslog-ng/ipkg/syslog-ng.control | 5 - package/syslog-ng/ipkg/syslog-ng.postinst | 3 - package/sysstat/Makefile | 6 +- package/sysstat/ipkg/sysstat.control | 4 - package/tar/Makefile | 10 +- package/tar/ipkg/tar.control | 4 - package/tcl/Makefile | 18 +- package/tcl/ipkg/tcl.control | 4 - package/tcp_wrappers/Makefile | 10 +- package/tcp_wrappers/ipkg/libwrap.control | 4 - package/tcpdump/Makefile | 8 +- package/tcpdump/ipkg/tcpdump.control | 5 - package/tinc/Makefile | 8 +- package/tinc/ipkg/tinc.control | 5 - package/tinyproxy/Makefile | 9 +- package/tinyproxy/files/tinyproxy.init | 4 +- package/tinyproxy/files/tinyproxy.postinst | 3 + package/tinyproxy/ipkg/tinyproxy.control | 5 - package/tinyproxy/ipkg/tinyproxy.postinst | 3 - package/tmsnc/Makefile | 9 +- package/tmsnc/ipkg/tmsnc.control | 8 - package/tntnet/Makefile | 27 +- package/tntnet/files/tntnet.conffiles | 3 + package/tntnet/files/tntnet.postinst | 6 + package/tntnet/ipkg/tntnet.conffiles | 3 - package/tntnet/ipkg/tntnet.control | 4 - package/tntnet/ipkg/tntnet.postinst | 6 - package/tor/Makefile | 14 +- package/tor/files/tor.conffiles | 1 + package/tor/files/tor.init | 4 +- package/tor/files/tor.postinst | 24 + package/tor/ipkg/tor.conffiles | 1 - package/tor/ipkg/tor.control | 5 - package/tor/ipkg/tor.postinst | 24 - package/trafshow/Makefile | 4 +- package/trafshow/ipkg/trafshow.control | 5 - package/ttcp/Makefile | 8 +- package/ttcp/ipkg/ttcp.control | 4 - package/uclibc++/Makefile | 7 +- package/uclibc++/ipkg/uclibc++.control | 4 - package/uclibc/Makefile | 5 +- package/uclibc/files/uclibc.conffiles | 1 + package/uclibc/ipkg/uclibc.conffiles | 1 - package/uclibc/ipkg/uclibc.control | 4 - package/udev/Makefile | 41 +- package/udev/files/udev.conffiles | 1 + package/udev/ipkg/udev.conffiles | 1 - package/udev/ipkg/udev.control | 4 - package/udev/patches/01-no_debug.patch | 21 - package/udp-broadcast-relay/Makefile | 10 +- .../ipkg/udp-broadcast-relay.control | 4 - package/ulogd/Makefile | 26 +- package/ulogd/files/ulogd.conffiles | 1 + package/ulogd/files/ulogd.init | 4 +- package/ulogd/files/ulogd.postinst | 3 + package/ulogd/ipkg/ulogd-mod-extra.control | 5 - package/ulogd/ipkg/ulogd-mod-mysql.control | 5 - package/ulogd/ipkg/ulogd-mod-pcap.control | 5 - package/ulogd/ipkg/ulogd-mod-pgsql.control | 5 - package/ulogd/ipkg/ulogd-mod-sqlite.control | 5 - package/ulogd/ipkg/ulogd.conffiles | 1 - package/ulogd/ipkg/ulogd.control | 4 - package/ulogd/ipkg/ulogd.postinst | 3 - package/updatedd/Makefile | 26 +- .../updatedd/ipkg/updatedd-mod-changeip.control | 4 - package/updatedd/ipkg/updatedd-mod-dyndns.control | 4 - .../updatedd/ipkg/updatedd-mod-eurodyndns.control | 4 - package/updatedd/ipkg/updatedd-mod-hn.control | 4 - package/updatedd/ipkg/updatedd-mod-noip.control | 4 - package/updatedd/ipkg/updatedd-mod-ods.control | 4 - package/updatedd/ipkg/updatedd-mod-ovh.control | 4 - package/updatedd/ipkg/updatedd-mod-regfish.control | 4 - package/updatedd/ipkg/updatedd-mod-tzo.control | 4 - package/updatedd/ipkg/updatedd.control | 4 - package/usbutils/Makefile | 8 +- package/usbutils/ipkg/lsusb.control | 5 - package/ussp-push/Makefile | 10 +- package/ussp-push/ipkg/ussp-push.control | 5 - package/ustl/Makefile | 6 +- package/ustl/ipkg/ustl.control | 4 - package/util-linux/Makefile | 17 +- package/util-linux/ipkg/fdisk.control | 5 - package/util-linux/ipkg/losetup.control | 5 - package/util-linux/ipkg/swap-utils.control | 5 - package/valgrind/Makefile | 8 +- package/valgrind/ipkg/valgrind.control | 4 - package/vgp/Makefile | 8 +- package/vgp/ipkg/vgp.control | 5 - package/videoproto/Makefile | 2 +- package/vilistextum/Makefile | 10 +- package/vilistextum/ipkg/vilistextum.control | 4 - package/vim/Makefile | 12 +- package/vim/ipkg/vim.control | 5 - package/vnc-reflector/Makefile | 8 +- package/vnc-reflector/ipkg/vnc-reflector.control | 5 - package/vnstat/Makefile | 9 +- package/vnstat/ipkg/vnstat.control | 4 - package/vpnc/Makefile | 10 +- package/vpnc/files/vpnc.conffiles | 4 + package/vpnc/ipkg/vpnc.conffiles | 4 - package/vpnc/ipkg/vpnc.control | 6 - package/vrrpd/Makefile | 10 +- package/vrrpd/files/vrrpd.init | 4 +- package/vrrpd/files/vrrpd.postinst | 4 + package/vrrpd/ipkg/vrrpd.control | 4 - package/vrrpd/ipkg/vrrpd.postinst | 4 - package/vsftpd/Makefile | 18 +- package/vsftpd/files/vsftpd.conffiles | 1 + package/vsftpd/files/vsftpd.init | 4 +- package/vsftpd/files/vsftpd.postinst | 3 + package/vsftpd/ipkg/vsftpd.conffiles | 1 - package/vsftpd/ipkg/vsftpd.control | 5 - package/vsftpd/ipkg/vsftpd.postinst | 3 - package/vtun/Makefile | 14 +- package/vtun/files/vtun.conffiles | 1 + package/vtun/ipkg/vtun.conffiles | 1 - package/vtun/ipkg/vtun.control | 5 - package/watchdog/Makefile | 12 +- package/watchdog/files/watchdog.conffiles | 1 + package/watchdog/files/watchdog.init | 3 +- package/watchdog/files/watchdog.postinst | 3 + package/watchdog/ipkg/watchdog.conffiles | 1 - package/watchdog/ipkg/watchdog.control | 4 - package/watchdog/ipkg/watchdog.postinst | 3 - package/wccpd/Makefile | 9 +- package/wccpd/ipkg/wccpd.control | 4 - package/wdfs/Makefile | 6 +- package/wdfs/ipkg/wdfs.control | 5 - package/weechat/Makefile | 25 +- package/weechat/ipkg/weechat.control | 4 - package/wifidog/Makefile | 16 +- package/wifidog/files/wifidog.conffiles | 1 + package/wifidog/files/wifidog.init | 4 +- package/wifidog/files/wifidog.postinst | 3 + package/wifidog/ipkg/wifidog.conffiles | 1 - package/wifidog/ipkg/wifidog.control | 8 - package/wifidog/ipkg/wifidog.postinst | 3 - package/wireless-firmware/Makefile | 7 +- .../ipkg/wireless-firmware-rt61.control | 4 - package/wireless-tools/Makefile | 4 +- package/wireless-tools/ipkg/wireless-tools.control | 4 - package/wol/Makefile | 13 +- package/wol/ipkg/wol.control | 4 - package/wondershaper/Makefile | 12 +- package/wondershaper/files/wondershaper.conffiles | 1 + package/wondershaper/files/wondershaper.init | 3 +- package/wondershaper/files/wondershaper.postinst | 3 + package/wondershaper/ipkg/wondershaper.conffiles | 1 - package/wondershaper/ipkg/wondershaper.control | 5 - package/wondershaper/ipkg/wondershaper.postinst | 3 - package/wpa_supplicant/Makefile | 7 +- package/wpa_supplicant/ipkg/wpa-supplicant.control | 5 - package/wput/Makefile | 9 +- package/wput/ipkg/wput.control | 4 - package/xcmiscproto/Makefile | 2 +- package/xcmiscproto/ipkg/xcmiscproto.control | 4 - package/xextproto/Makefile | 2 +- package/xf86dga/Makefile | 2 +- package/xf86dgaproto/Makefile | 2 +- package/xfsprogs/Makefile | 8 +- package/xfsprogs/ipkg/xfsprogs.control | 5 - package/xinetd/Makefile | 14 +- package/xinetd/files/xinetd.conffiles | 1 + package/xinetd/files/xinetd.init | 4 +- package/xinetd/files/xinetd.postinst | 3 + package/xinetd/ipkg/xinetd.conffiles | 1 - package/xinetd/ipkg/xinetd.control | 4 - package/xinetd/ipkg/xinetd.postinst | 3 - package/xorg-server/Makefile | 7 +- package/xorg-server/ipkg/xorg-server.control | 4 - package/xproto/Makefile | 2 +- package/xtrans/Makefile | 2 +- package/xtrans/ipkg/xtrans.control | 4 - package/zlib/Makefile | 10 +- package/zlib/ipkg/zlib.control | 4 - package/zsh/Makefile | 9 +- package/zsh/ipkg/zsh.control | 4 - scripts/ipkg-build | 2 +- scripts/make-ipkg-dir.sh | 6 +- scripts/rstrip.sh | 2 +- target/alix1c/kernel.config | 2 +- 1895 files changed, 48162 insertions(+), 66922 deletions(-) delete mode 100644 package/6tunnel/ipkg/6tunnel.control create mode 100644 package/aiccu/files/aiccu.conffiles create mode 100644 package/aiccu/files/aiccu.postinst delete mode 100644 package/aiccu/ipkg/aiccu.conffiles delete mode 100644 package/aiccu/ipkg/aiccu.control delete mode 100644 package/aiccu/ipkg/aiccu.postinst delete mode 100644 package/aircrack-ng/ipkg/aircrack-ng.control create mode 100644 package/alsa-lib/files/alsa-lib.postinst delete mode 100644 package/alsa-lib/ipkg/alsa-lib.control delete mode 100644 package/alsa-lib/ipkg/alsa-lib.postinst create mode 100644 package/alsa-utils/files/alsa-utils.postinst delete mode 100644 package/alsa-utils/ipkg/alsa-utils.control delete mode 100644 package/alsa-utils/ipkg/alsa-utils.postinst delete mode 100644 package/apr-util/ipkg/apr-util.control delete mode 100644 package/apr/ipkg/apr.control delete mode 100644 package/arpd/ipkg/arpd.control create mode 100644 package/arpwatch/files/arpwatch.conffiles delete mode 100644 package/arpwatch/ipkg/arpwatch.conffiles delete mode 100644 package/arpwatch/ipkg/arpwatch.control create mode 100644 package/asterisk/files/asterisk-chan-bluetooth.conffiles create mode 100644 package/asterisk/files/asterisk-chan-h323.conffiles create mode 100644 package/asterisk/files/asterisk-chan-iax2.conffiles create mode 100644 package/asterisk/files/asterisk-chan-mgcp.conffiles create mode 100644 package/asterisk/files/asterisk-chan-skinny.conffiles create mode 100644 package/asterisk/files/asterisk-meetme.conffiles create mode 100644 package/asterisk/files/asterisk-pbx-dundi.conffiles create mode 100644 package/asterisk/files/asterisk-pgsql.conffiles create mode 100644 package/asterisk/files/asterisk-voicemail.conffiles create mode 100644 package/asterisk/files/asterisk.conffiles create mode 100644 package/asterisk/files/asterisk.postinst delete mode 100644 package/asterisk/ipkg/asterisk-chan-bluetooth.conffiles delete mode 100644 package/asterisk/ipkg/asterisk-chan-bluetooth.control delete mode 100644 package/asterisk/ipkg/asterisk-chan-h323.conffiles delete mode 100644 package/asterisk/ipkg/asterisk-chan-h323.control delete mode 100644 package/asterisk/ipkg/asterisk-chan-iax2.conffiles delete mode 100644 package/asterisk/ipkg/asterisk-chan-iax2.control delete mode 100644 package/asterisk/ipkg/asterisk-chan-mgcp.conffiles delete mode 100644 package/asterisk/ipkg/asterisk-chan-mgcp.control delete mode 100644 package/asterisk/ipkg/asterisk-chan-misdn.control delete mode 100644 package/asterisk/ipkg/asterisk-chan-skinny.conffiles delete mode 100644 package/asterisk/ipkg/asterisk-chan-skinny.control delete mode 100644 package/asterisk/ipkg/asterisk-codec-gsm.control delete mode 100644 package/asterisk/ipkg/asterisk-codec-speex.control delete mode 100644 package/asterisk/ipkg/asterisk-meetme.conffiles delete mode 100644 package/asterisk/ipkg/asterisk-meetme.control delete mode 100644 package/asterisk/ipkg/asterisk-pbx-dundi.conffiles delete mode 100644 package/asterisk/ipkg/asterisk-pbx-dundi.control delete mode 100644 package/asterisk/ipkg/asterisk-pgsql.conffiles delete mode 100644 package/asterisk/ipkg/asterisk-pgsql.control delete mode 100644 package/asterisk/ipkg/asterisk-res-agi.control delete mode 100644 package/asterisk/ipkg/asterisk-sounds.control delete mode 100644 package/asterisk/ipkg/asterisk-sqlite.control delete mode 100644 package/asterisk/ipkg/asterisk-voicemail.conffiles delete mode 100644 package/asterisk/ipkg/asterisk-voicemail.control delete mode 100644 package/asterisk/ipkg/asterisk.conffiles delete mode 100644 package/asterisk/ipkg/asterisk.control delete mode 100644 package/asterisk/ipkg/asterisk.postinst delete mode 100644 package/atftp/ipkg/atftp.control delete mode 100644 package/atftp/ipkg/atftpd.control delete mode 100644 package/autossh/ipkg/autossh.control create mode 100644 package/avahi/files/avahi-daemon.conffiles create mode 100644 package/avahi/files/avahi-daemon.postinst delete mode 100644 package/avahi/ipkg/avahi-daemon.conffiles delete mode 100644 package/avahi/ipkg/avahi-daemon.control delete mode 100644 package/avahi/ipkg/avahi-daemon.postinst delete mode 100644 package/avahi/ipkg/avahi-dnsconfd.control delete mode 100644 package/avahi/ipkg/libavahi.control create mode 100644 package/axtls/files/axhttpd.postinst delete mode 100644 package/axtls/ipkg/axhttpd.control delete mode 100644 package/axtls/ipkg/axhttpd.postinst delete mode 100644 package/axtls/ipkg/libaxtls.control delete mode 100644 package/axtls/patches/patch-httpd_main_c create mode 100644 package/base-files/files/base-files.conffiles delete mode 100644 package/base-files/ipkg/base-files.conffiles delete mode 100644 package/base-files/ipkg/base-files.control delete mode 100644 package/bash/ipkg/bash.control delete mode 100644 package/bc/ipkg/bc.control delete mode 100644 package/bc/ipkg/dc.control delete mode 100644 package/bigreqsproto/ipkg/bigreqsproto.control create mode 100644 package/bind/files/bind-server.conffiles create mode 100644 package/bind/files/bind-server.postinst delete mode 100644 package/bind/ipkg/bind-check.control delete mode 100644 package/bind/ipkg/bind-client.control delete mode 100644 package/bind/ipkg/bind-dig.control delete mode 100644 package/bind/ipkg/bind-dnssec.control delete mode 100644 package/bind/ipkg/bind-host.control delete mode 100644 package/bind/ipkg/bind-rndc.control delete mode 100644 package/bind/ipkg/bind-server.conffiles delete mode 100644 package/bind/ipkg/bind-server.control delete mode 100644 package/bind/ipkg/bind-server.postinst delete mode 100644 package/bind/ipkg/bind-tools.control delete mode 100644 package/bind/ipkg/libbind.control delete mode 100644 package/binutils/ipkg/binutils.control create mode 100644 package/bitlbee/files/bitlbee.conffiles create mode 100644 package/bitlbee/files/bitlbee.postinst delete mode 100644 package/bitlbee/ipkg/bitlbee.conffiles delete mode 100644 package/bitlbee/ipkg/bitlbee.control delete mode 100644 package/bitlbee/ipkg/bitlbee.postinst delete mode 100644 package/bluez-firmware/ipkg/bluez-firmware.control delete mode 100644 package/bluez/ipkg/bluez.control delete mode 100644 package/bogofilter/ipkg/bogofilter.control delete mode 100644 package/bogofilter/patches/patch-config_in delete mode 100644 package/bogofilter/patches/patch-configure create mode 100644 package/bogofilter/patches/patch-configure_ac delete mode 100644 package/bridge-utils/ipkg/bridge-utils.control create mode 100644 package/busybox/files/busybox.postinst delete mode 100644 package/busybox/ipkg/busybox.control delete mode 100644 package/busybox/ipkg/busybox.postinst delete mode 100644 package/bwm/ipkg/bwm.control delete mode 100644 package/cbtt/ipkg/cbtt-mysql.control delete mode 100644 package/cbtt/ipkg/cbtt.control delete mode 100644 package/cfgfs/ipkg/cfgfs.control delete mode 100644 package/cgilib/ipkg/cgilib.control create mode 100644 package/chillispot/files/chillispot.conffiles create mode 100644 package/chillispot/files/chillispot.postinst delete mode 100644 package/chillispot/ipkg/chillispot.conffiles delete mode 100644 package/chillispot/ipkg/chillispot.control delete mode 100644 package/chillispot/ipkg/chillispot.postinst create mode 100644 package/collectd/files/collectd.postinst delete mode 100644 package/collectd/ipkg/collectd.control delete mode 100644 package/collectd/ipkg/collectd.postinst delete mode 100644 package/collectd/patches/patch-src_Makefile_in delete mode 100644 package/comgt/ipkg/comgt.control delete mode 100644 package/cryptsetup/ipkg/cryptsetup.control delete mode 100644 package/ctorrent/ipkg/ctorrent.control create mode 100644 package/cups/files/cups.conffiles create mode 100644 package/cups/files/cups.postinst delete mode 100644 package/cups/ipkg/cups.conffiles delete mode 100644 package/cups/ipkg/cups.control delete mode 100644 package/cups/ipkg/cups.postinst delete mode 100644 package/curl/ipkg/curl.control delete mode 100644 package/curl/ipkg/libcurl.control delete mode 100644 package/cutter/ipkg/cutter.control delete mode 100644 package/cxxtools/ipkg/cxxtools.control delete mode 100644 package/cyrus-sasl/ipkg/libsasl2.control create mode 100644 package/davfs2/files/davfs2.conffiles create mode 100644 package/davfs2/files/davfs2.postinst delete mode 100644 package/davfs2/ipkg/davfs2.conffiles delete mode 100644 package/davfs2/ipkg/davfs2.control delete mode 100644 package/davfs2/ipkg/davfs2.postinst create mode 100644 package/dbus/files/dbus.postinst delete mode 100644 package/dbus/ipkg/dbus.control delete mode 100644 package/dbus/ipkg/dbus.postinst delete mode 100644 package/deco/ipkg/deco.control delete mode 100644 package/device-mapper/ipkg/device-mapper.control create mode 100644 package/dhcp-forwarder/files/dhcp-forwarder.conffiles create mode 100644 package/dhcp-forwarder/files/dhcp-forwarder.postinst delete mode 100644 package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles delete mode 100644 package/dhcp-forwarder/ipkg/dhcp-forwarder.control delete mode 100644 package/dhcp-forwarder/ipkg/dhcp-forwarder.postinst delete mode 100644 package/dhcp-forwarder/patches/00-big_endian.patch delete mode 100644 package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch create mode 100644 package/dhcp/files/dhcp-server.postinst delete mode 100644 package/dhcp/ipkg/dhcp-relay.control delete mode 100644 package/dhcp/ipkg/dhcp-server.control delete mode 100644 package/dhcp/ipkg/dhcp-server.postinst delete mode 100644 package/dhcp6/Config.in delete mode 100644 package/dhcp6/Makefile delete mode 100755 package/dhcp6/ipkg/dhcp6.control delete mode 100644 package/dhcp6/ipkg/files/conffiles delete mode 100644 package/dhcp6/patches/patch-client_Makefile delete mode 100644 package/dhcp6/patches/patch-client_clilib_c delete mode 100644 package/dhcp6/patches/patch-client_macros_h delete mode 100644 package/dhcp6/patches/patch-client_solicit_c delete mode 100644 package/dhcp6/patches/patch-server_Makefile delete mode 100644 package/dhcp6/patches/patch-server_macros_h delete mode 100644 package/dhcp6/patches/patch-server_reply_c create mode 100644 package/dhcpv6/Config.in create mode 100644 package/dhcpv6/Makefile create mode 100644 package/dhcpv6/ipkg/files/conffiles create mode 100644 package/dhcpv6/patches/patch-configure create mode 100644 package/dhcpv6/patches/patch-configure.orig create mode 100644 package/dhcpv6/patches/patch-configure_ac create mode 100644 package/dhcpv6/patches/patch-configure_ac.orig create mode 100644 package/dhcpv6/patches/patch-src_relay6_socket_c delete mode 100644 package/digitemp/ipkg/digitemp.control create mode 100644 package/dnsmasq/files/dnsmasq.conffiles create mode 100644 package/dnsmasq/files/dnsmasq.postinst delete mode 100644 package/dnsmasq/ipkg/dnsmasq.conffiles delete mode 100644 package/dnsmasq/ipkg/dnsmasq.control delete mode 100644 package/dnsmasq/ipkg/dnsmasq.postinst delete mode 100644 package/dosfstools/ipkg/dosfstools.control delete mode 100644 package/dovecot/ipkg/dovecot.control create mode 100644 package/dropbear/files/dropbear.postinst delete mode 100644 package/dropbear/ipkg/dropbear.control delete mode 100644 package/dropbear/ipkg/dropbear.postinst delete mode 100644 package/dropbear/ipkg/dropbearconvert.control delete mode 100644 package/dsniff/ipkg/dsniff.control delete mode 100644 package/e2fsprogs/ipkg/e2fsprogs.control delete mode 100644 package/e2fsprogs/ipkg/libcom-err.control delete mode 100644 package/e2fsprogs/ipkg/libuuid.control delete mode 100644 package/elinks/ipkg/elinks.control delete mode 100644 package/em28xx/ipkg/kmod-em28xx.control create mode 100644 package/esound/files/esound.postinst delete mode 100644 package/esound/ipkg/esound.control delete mode 100644 package/esound/ipkg/esound.postinst delete mode 100644 package/ether-wake/ipkg/ether-wake.control delete mode 100644 package/ethtool/ipkg/ethtool.control delete mode 100644 package/exmap/ipkg/exmap.control delete mode 100644 package/exmap/ipkg/exmapd.control delete mode 100644 package/exmap/ipkg/exmapserver.control delete mode 100644 package/exmap/ipkg/kmod-exmap.control delete mode 100644 package/expat/ipkg/libexpat.control delete mode 100644 package/expat/patches/001-destdir.patch create mode 100644 package/ez-ipupdate/files/ez-ipupdate.conffiles create mode 100644 package/ez-ipupdate/files/ez-ipupdate.postinst delete mode 100644 package/ez-ipupdate/ipkg/ez-ipupdate.conffiles delete mode 100644 package/ez-ipupdate/ipkg/ez-ipupdate.control delete mode 100644 package/ez-ipupdate/ipkg/ez-ipupdate.postinst delete mode 100644 package/faad2/ipkg/libfaad2.control delete mode 100644 package/faad2/patches/patch-common_mp4ff_Makefile_am delete mode 100644 package/faad2/patches/patch-common_mp4ff_mp4ff_h delete mode 100644 package/faad2/patches/patch-configure_in delete mode 100644 package/faad2/patches/patch-frontend_Makefile_am create mode 100644 package/fakeidentd/files/fakeidentd.postinst delete mode 100644 package/fakeidentd/ipkg/fakeidentd.control delete mode 100644 package/fakeidentd/ipkg/fakeidentd.postinst delete mode 100644 package/fbset/ipkg/fbset.control delete mode 100644 package/fetchmail/ipkg/fetchmail.control delete mode 100644 package/ffmpeg/ipkg/ffmpeg.control delete mode 100644 package/file/ipkg/file.control delete mode 100644 package/flac/ipkg/libflac.control delete mode 100644 package/fping/ipkg/fping.control delete mode 100644 package/fprobe-ulog/ipkg/fprobe-ulog.control delete mode 100644 package/fprobe/ipkg/fprobe.control create mode 100644 package/freeradius/files/freeradius-mod-eap.conffiles create mode 100644 package/freeradius/files/freeradius-mod-files.conffiles create mode 100644 package/freeradius/files/freeradius-mod-ldap.conffiles create mode 100644 package/freeradius/files/freeradius-mod-preprocess.conffiles create mode 100644 package/freeradius/files/freeradius-mod-realm.conffiles create mode 100644 package/freeradius/files/freeradius-mod-sql.conffiles create mode 100644 package/freeradius/files/freeradius.conffiles create mode 100644 package/freeradius/files/freeradius.postinst delete mode 100644 package/freeradius/ipkg/freeradius-democerts.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-chap.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-detail.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-digest.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-eap-gtc.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-eap-md5.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-eap-mschapv2.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-eap-peap.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-eap-tls.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-eap-ttls.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-eap.conffiles delete mode 100644 package/freeradius/ipkg/freeradius-mod-eap.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-files.conffiles delete mode 100644 package/freeradius/ipkg/freeradius-mod-files.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-ldap.conffiles delete mode 100644 package/freeradius/ipkg/freeradius-mod-ldap.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-mschap.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-pap.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-preprocess.conffiles delete mode 100644 package/freeradius/ipkg/freeradius-mod-preprocess.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-realm.conffiles delete mode 100644 package/freeradius/ipkg/freeradius-mod-realm.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-sql-mysql.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-sql-pgsql.control delete mode 100644 package/freeradius/ipkg/freeradius-mod-sql.conffiles delete mode 100644 package/freeradius/ipkg/freeradius-mod-sql.control delete mode 100644 package/freeradius/ipkg/freeradius-utils.control delete mode 100644 package/freeradius/ipkg/freeradius.conffiles delete mode 100644 package/freeradius/ipkg/freeradius.control delete mode 100644 package/freeradius/ipkg/freeradius.postinst delete mode 100644 package/freetype/ipkg/libfreetype.control create mode 100644 package/frickin/files/frickin.postinst delete mode 100644 package/frickin/ipkg/frickin.control delete mode 100644 package/frickin/ipkg/frickin.postinst delete mode 100644 package/fuse/ipkg/fuse-utils.control delete mode 100644 package/fuse/ipkg/libfuse.control delete mode 100644 package/gatling/ipkg/gatling.control delete mode 100644 package/gatling/patches/patch-gatling_c delete mode 100644 package/gcc/ipkg/gcc.control delete mode 100644 package/gdb/ipkg/gdb.control delete mode 100644 package/gdbserver/ipkg/gdbserver.control delete mode 100644 package/gettext/ipkg/gettext.control create mode 100644 package/gkrellmd/files/gkrellmd.postinst delete mode 100644 package/gkrellmd/ipkg/gkrellmd.control delete mode 100644 package/gkrellmd/ipkg/gkrellmd.postinst delete mode 100644 package/glib/ipkg/glib1.control delete mode 100644 package/glib2/ipkg/glib2.control delete mode 100644 package/glibc/ipkg/glibc.control create mode 100644 package/gmediaserver/files/gmediaserver.postinst delete mode 100644 package/gmediaserver/ipkg/gmediaserver.control delete mode 100644 package/gmediaserver/ipkg/gmediaserver.postinst delete mode 100644 package/gmp/ipkg/libgmp.control delete mode 100644 package/gnutls/ipkg/gnutls-utils.control delete mode 100644 package/gnutls/ipkg/libgnutls-extra.control delete mode 100644 package/gnutls/ipkg/libgnutls-openssl.control delete mode 100644 package/gnutls/ipkg/libgnutls.control delete mode 100644 package/gnutls/ipkg/libgnutlsxx.control delete mode 100644 package/gpg/ipkg/gpg.control delete mode 100644 package/gpm/ipkg/gpm.control delete mode 100644 package/gpsd/ipkg/gpsd-clients.control delete mode 100644 package/gpsd/ipkg/gpsd.control delete mode 100644 package/gsm/ipkg/gsm-utils.control delete mode 100644 package/gsm/ipkg/libgsm.control delete mode 100644 package/haserl/ipkg/haserl.control delete mode 100644 package/hdparm/ipkg/hdparm.control create mode 100644 package/heimdal/files/heimdal-server.postinst delete mode 100644 package/heimdal/ipkg/heimdal-client-libs.control delete mode 100644 package/heimdal/ipkg/heimdal-libs.control delete mode 100644 package/heimdal/ipkg/heimdal-server.control delete mode 100644 package/heimdal/ipkg/heimdal-server.postinst create mode 100644 package/heyu/files/files/heyu.conffiles delete mode 100644 package/heyu/ipkg/files/heyu.conffiles delete mode 100644 package/heyu/ipkg/heyu.control create mode 100644 package/heyu/patches/patch-x10state_c create mode 100644 package/hostapd/files/hostapd.conffiles delete mode 100644 package/hostapd/ipkg/hostapd-utils.control delete mode 100644 package/hostapd/ipkg/hostapd.conffiles delete mode 100644 package/hostapd/ipkg/hostapd.control create mode 100644 package/htpdate/files/htpdate.postinst delete mode 100644 package/htpdate/ipkg/htpdate.control delete mode 100644 package/htpdate/ipkg/htpdate.postinst create mode 100644 package/htpdate/patches/patch-htpdate_c delete mode 100644 package/httping/ipkg/httping.control delete mode 100644 package/httptunnel/ipkg/httptunnel.control create mode 100644 package/icecast/files/icecast.conffiles delete mode 100644 package/icecast/ipkg/icecast.conffiles delete mode 100644 package/icecast/ipkg/icecast.control delete mode 100644 package/id3lib/ipkg/id3lib.control delete mode 100644 package/iftop/ipkg/iftop.control delete mode 100644 package/igmpproxy/ipkg/igmpproxy.control create mode 100644 package/ipcad/files/ipcad.conffiles delete mode 100644 package/ipcad/ipkg/ipcad.conffiles delete mode 100644 package/ipcad/ipkg/ipcad.control delete mode 100644 package/iperf/ipkg/iperf.control delete mode 100644 package/iproute2/ipkg/ip.control delete mode 100644 package/iproute2/ipkg/tc.control create mode 100644 package/ipsec-tools/files/ipsec-tools.conffiles delete mode 100644 package/ipsec-tools/ipkg/ipsec-tools.conffiles delete mode 100644 package/ipsec-tools/ipkg/ipsec-tools.control delete mode 100644 package/ipsec-tools/patches/patch-configure_ac create mode 100644 package/ipsec-tools/patches/patch-src_racoon_algorithm_c create mode 100644 package/ipsec-tools/patches/patch-src_racoon_cftoken_c create mode 100644 package/ipsec-tools/patches/patch-src_racoon_eaytest_c create mode 100644 package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c create mode 100644 package/ipsec-tools/patches/patch-src_racoon_pfkey_c create mode 100644 package/ipsec-tools/patches/patch-src_racoon_privsep_c create mode 100644 package/ipsec-tools/patches/patch-src_racoon_racoonctl_c create mode 100644 package/ipsec-tools/patches/patch-src_setkey_token_c delete mode 100644 package/ipset/ipkg/ipset.control delete mode 100644 package/iptables-snmp/Config.in delete mode 100644 package/iptables-snmp/Makefile delete mode 100644 package/iptables-snmp/ipkg/iptables-snmp.control create mode 100644 package/iptables/files/iptables.postinst delete mode 100644 package/iptables/ipkg/ip6tables.control delete mode 100644 package/iptables/ipkg/iptables-extra.control delete mode 100644 package/iptables/ipkg/iptables-mod-conntrack.control delete mode 100644 package/iptables/ipkg/iptables-mod-extra.control delete mode 100644 package/iptables/ipkg/iptables-mod-filter.control delete mode 100644 package/iptables/ipkg/iptables-mod-imq.control delete mode 100644 package/iptables/ipkg/iptables-mod-ipopt.control delete mode 100644 package/iptables/ipkg/iptables-mod-ipsec.control delete mode 100644 package/iptables/ipkg/iptables-mod-nat.control delete mode 100644 package/iptables/ipkg/iptables-mod-ulog.control delete mode 100644 package/iptables/ipkg/iptables-utils.control delete mode 100644 package/iptables/ipkg/iptables.control delete mode 100644 package/iptables/ipkg/iptables.postinst delete mode 100644 package/iptraf/ipkg/iptraf.control delete mode 100644 package/irssi/ipkg/irssi.control delete mode 100644 package/iw/ipkg/iw.control delete mode 100644 package/jamvm/ipkg/jamvm.control delete mode 100644 package/jpeg/ipkg/libjpeg.control create mode 100644 package/kismet/files/kismet-client.conffiles create mode 100644 package/kismet/files/kismet-drone.conffiles create mode 100644 package/kismet/files/kismet-server.conffiles delete mode 100644 package/kismet/ipkg/kismet-client.conffiles delete mode 100644 package/kismet/ipkg/kismet-client.control delete mode 100644 package/kismet/ipkg/kismet-drone.conffiles delete mode 100644 package/kismet/ipkg/kismet-drone.control delete mode 100644 package/kismet/ipkg/kismet-server.conffiles delete mode 100644 package/kismet/ipkg/kismet-server.control delete mode 100644 package/kismet/ipkg/kismet.control create mode 100644 package/knock/files/knockd.conffiles delete mode 100644 package/knock/ipkg/knock.control delete mode 100644 package/knock/ipkg/knockd.conffiles delete mode 100644 package/knock/ipkg/knockd.control create mode 100644 package/knock/patches/patch-src_knockd_c create mode 100644 package/krb5/files/krb5-server.postinst delete mode 100644 package/krb5/ipkg/krb5-libs.control delete mode 100644 package/krb5/ipkg/krb5-server.control delete mode 100644 package/krb5/ipkg/krb5-server.postinst create mode 100644 package/l2tpns/files/l2tpns.conffiles delete mode 100644 package/l2tpns/ipkg/l2tpns.conffiles delete mode 100644 package/l2tpns/ipkg/l2tpns.control delete mode 100644 package/l2tpns/patches/01-honor_includes_remove_backtrace.patch create mode 100644 package/l2tpns/patches/patch-Makefile create mode 100644 package/l2tpns/patches/patch-l2tpns_c delete mode 100644 package/lame/ipkg/lame.control delete mode 100644 package/lame/ipkg/liblame.control delete mode 100644 package/less/ipkg/less.control delete mode 100644 package/libICE/ipkg/libice.control delete mode 100644 package/libSM/ipkg/libsm.control delete mode 100644 package/libX11/ipkg/libx11.control delete mode 100644 package/libXau/ipkg/libxau.control delete mode 100644 package/libXaw/ipkg/libxaw.control delete mode 100644 package/libXdmcp/ipkg/libxdmcp.control delete mode 100644 package/libXext/ipkg/libxext.control delete mode 100644 package/libXfont/ipkg/libxfont.control delete mode 100644 package/libXmu/ipkg/libxmu.control delete mode 100644 package/libXpm/ipkg/libxpm.control delete mode 100644 package/libXt/ipkg/libxt.control delete mode 100644 package/libXxf86dga/ipkg/libxxf86dga.control delete mode 100644 package/libao/ipkg/libao.control delete mode 100644 package/libart/ipkg/libart.control delete mode 100644 package/libaudiofile/ipkg/libaudiofile.control delete mode 100644 package/libc/ipkg/libc.control delete mode 100755 package/libcli/ipkg/libcli.control delete mode 100644 package/libdaemon/ipkg/libdaemon.control delete mode 100644 package/libdb/ipkg/libdb.control delete mode 100644 package/libdnet/ipkg/libdnet.control delete mode 100644 package/libelf/ipkg/libelf.control delete mode 100644 package/libevent/ipkg/libevent.control delete mode 100644 package/libffi/ipkg/libffi.control delete mode 100644 package/libfontenc/ipkg/libfontenc.control delete mode 100644 package/libgcrypt/ipkg/libgcrypt.control delete mode 100644 package/libgd/ipkg/libgd.control delete mode 100644 package/libgdbm/ipkg/libgdbm.control delete mode 100644 package/libgpg-error/ipkg/libgpg-error.control delete mode 100644 package/libgssglue/ipkg/libgssglue.control delete mode 100644 package/libiconv/ipkg/libiconv.control delete mode 100644 package/libid3tag/ipkg/libid3tag.control delete mode 100644 package/liblzo/ipkg/liblzo.control delete mode 100644 package/libmad/ipkg/libmad.control delete mode 100644 package/libnet/ipkg/libnet.control delete mode 100644 package/libnfsidmap/ipkg/libnfsidmap.control delete mode 100644 package/libnids/ipkg/libnids.control delete mode 100644 package/libnl/ipkg/libnl.control create mode 100644 package/libnl/patches/patch-include_netlink-local_h create mode 100644 package/libnl/patches/patch-lib_object_c delete mode 100644 package/libogg/ipkg/libogg.control delete mode 100644 package/libol/ipkg/libol.control delete mode 100644 package/libosip2/ipkg/libosip2.control delete mode 100644 package/libp11/ipkg/libp11.control delete mode 100644 package/libpcap/ipkg/libpcap.control delete mode 100644 package/libpciaccess/ipkg/libpciaccess.control delete mode 100644 package/libpng/ipkg/libpng.control delete mode 100644 package/libpri/ipkg/libpri.control delete mode 100644 package/libpthread/ipkg/libpthread.control delete mode 100644 package/librpcsecgss/ipkg/librpcsecgss.control delete mode 100644 package/libshout/ipkg/libshout.control delete mode 100644 package/libsigc++/ipkg/libsigc++.control delete mode 100644 package/libstdcxx/ipkg/libstdcxx.control delete mode 100644 package/libtasn1/ipkg/libtasn1.control delete mode 100644 package/libthread_db/ipkg/libthread-db.control delete mode 100644 package/libtiff/ipkg/libtiff.control delete mode 100644 package/libtirpc/ipkg/libtirpc.control create mode 100644 package/libtirpc/patches/patch-INSTALL delete mode 100644 package/libtirpc/patches/patch-Makefile_am create mode 100644 package/libtirpc/patches/patch-Makefile_in create mode 100644 package/libtirpc/patches/patch-aclocal_m4 create mode 100644 package/libtirpc/patches/patch-config_guess create mode 100644 package/libtirpc/patches/patch-config_h_in create mode 100644 package/libtirpc/patches/patch-config_sub create mode 100644 package/libtirpc/patches/patch-configure create mode 100644 package/libtirpc/patches/patch-doc_Makefile_in create mode 100644 package/libtirpc/patches/patch-ltmain_sh create mode 100644 package/libtirpc/patches/patch-man_Makefile_in create mode 100644 package/libtirpc/patches/patch-src_Makefile_in delete mode 100644 package/libtirpc/patches/patch-src_rpc_soc_c delete mode 100644 package/libtool/ipkg/libltdl.control delete mode 100644 package/libtorrent/ipkg/libtorrent.control delete mode 100644 package/libupnp/ipkg/libupnp.control delete mode 100644 package/libusb/ipkg/libusb.control delete mode 100644 package/libusb/patches/no-libusbpp.patch delete mode 100644 package/libvorbis/ipkg/libvorbis.control delete mode 100644 package/libvorbis/ipkg/libvorbisenc.control delete mode 100644 package/libvorbisidec/ipkg/libvorbisidec.control delete mode 100644 package/libxkbfile/ipkg/libxkbfile.control delete mode 100644 package/libxml2/ipkg/libxml2.control delete mode 100644 package/libxslt/ipkg/libxslt.control create mode 100644 package/lighttpd/files/lighttpd.conffiles create mode 100644 package/lighttpd/files/lighttpd.postinst delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-accesslog.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-alias.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-auth.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-cgi.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-evasive.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-expire.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-fastcgi.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-proxy.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-redirect.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-rewrite.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-setenv.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-simple-vhost.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-ssi.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-status.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-usertrack.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-webdav.control delete mode 100644 package/lighttpd/ipkg/lighttpd.conffiles delete mode 100644 package/lighttpd/ipkg/lighttpd.control delete mode 100644 package/lighttpd/ipkg/lighttpd.postinst delete mode 100644 package/links/ipkg/links.control delete mode 100644 package/linux-atm/ipkg/br2684ctl.control delete mode 100644 package/linux-atm/ipkg/linux-atm.control delete mode 100644 package/linux-atm/patches/000-debian_16.patch delete mode 100644 package/linux-atm/patches/010-header_stupidity.patch delete mode 100644 package/linux-atm/patches/100-br2684.patch delete mode 100644 package/linux-atm/patches/200-no_libfl.patch delete mode 100644 package/linux-atm/patches/300-no_autotools.patch create mode 100644 package/linux-atm/patches/patch-src_qgen_Makefile_in create mode 100644 package/linux-atm/patches/patch-src_qgen_ql_l_c create mode 100644 package/linux-atm/patches/patch-src_sigd_Makefile_in create mode 100644 package/linux-atm/patches/patch-src_sigd_cfg_l_c create mode 100644 package/linux-atm/patches/patch-src_switch_cfg_l_c create mode 100644 package/linux-atm/patches/patch-src_switch_debug_Makefile_in create mode 100644 package/linux-atm/patches/patch-src_switch_tcp_Makefile_in create mode 100644 package/linux-atm/patches/patch-src_test_Makefile_in create mode 100644 package/linux-atm/patches/patch-src_test_ispl_l_c create mode 100644 package/linux-atm/patches/patch-src_test_ttcp_c delete mode 100644 package/logrotate/ipkg/logrotate.control delete mode 100644 package/lrzsz/ipkg/lrzsz.control delete mode 100644 package/ltp/Config.in delete mode 100644 package/ltp/Makefile delete mode 100644 package/ltp/ipkg/ltp.control delete mode 100644 package/ltp/patches/patch-Makefile delete mode 100644 package/ltp/patches/patch-runltp delete mode 100644 package/ltp/patches/patch-testcases_kernel_syscalls_Makefile delete mode 100644 package/ltp/patches/patch-testcases_misc_math_Makefile delete mode 100644 package/ltp/patches/patch-testcases_misc_math_float_Makefile delete mode 100644 package/lua/ipkg/liblua.control delete mode 100644 package/lua/ipkg/lua-examples.control delete mode 100644 package/lua/ipkg/lua.control delete mode 100644 package/lua/ipkg/luac.control delete mode 100644 package/lua/patches/lua-5.0.2-config.patch delete mode 100644 package/lua/patches/lua-5.0.2-soname.patch create mode 100644 package/lua/patches/patch-src_Makefile delete mode 100644 package/lvm/ipkg/lvm.control delete mode 100644 package/lynx/ipkg/lynx.control delete mode 100644 package/mac80211/ipkg/kmod-mac80211-ath5k.control delete mode 100644 package/mac80211/ipkg/kmod-mac80211-rt61.control delete mode 100644 package/mac80211/ipkg/kmod-mac80211.control delete mode 100755 package/macchanger/ipkg/macchanger.control delete mode 100644 package/madplay/ipkg/madplay.control create mode 100644 package/maradns/files/maradns.conffiles create mode 100644 package/maradns/files/maradns.postinst delete mode 100644 package/maradns/ipkg/maradns.conffiles delete mode 100644 package/maradns/ipkg/maradns.control delete mode 100644 package/maradns/ipkg/maradns.postinst delete mode 100644 package/mc/ipkg/mc.control delete mode 100644 package/mgetty/ipkg/mgetty.control create mode 100644 package/miau/files/miau.conffiles create mode 100644 package/miau/files/miau.postinst delete mode 100644 package/miau/ipkg/miau.conffiles delete mode 100644 package/miau/ipkg/miau.control delete mode 100644 package/miau/ipkg/miau.postinst delete mode 100644 package/miax/ipkg/miax.control delete mode 100644 package/microperl/ipkg/microperl.control create mode 100644 package/microperl/patches/patch-Makefile_micro create mode 100644 package/mini_httpd/files/mini-httpd-matrixssl.conffiles create mode 100644 package/mini_httpd/files/mini-httpd-matrixssl.postinst create mode 100644 package/mini_httpd/files/mini-httpd-openssl.conffiles create mode 100644 package/mini_httpd/files/mini-httpd-openssl.postinst create mode 100644 package/mini_httpd/files/mini-httpd.conffiles create mode 100644 package/mini_httpd/files/mini-httpd.postinst delete mode 100644 package/mini_httpd/ipkg/mini-httpd-htpasswd.control delete mode 100644 package/mini_httpd/ipkg/mini-httpd-matrixssl.conffiles delete mode 100644 package/mini_httpd/ipkg/mini-httpd-matrixssl.control delete mode 100644 package/mini_httpd/ipkg/mini-httpd-matrixssl.postinst delete mode 100644 package/mini_httpd/ipkg/mini-httpd-openssl.conffiles delete mode 100644 package/mini_httpd/ipkg/mini-httpd-openssl.control delete mode 100644 package/mini_httpd/ipkg/mini-httpd-openssl.postinst delete mode 100644 package/mini_httpd/ipkg/mini-httpd.conffiles delete mode 100644 package/mini_httpd/ipkg/mini-httpd.control delete mode 100644 package/mini_httpd/ipkg/mini-httpd.postinst delete mode 100644 package/mini_sendmail/ipkg/mini-sendmail.control create mode 100644 package/miredo/files/miredo-server.postinst create mode 100644 package/miredo/files/miredo.conffiles create mode 100644 package/miredo/files/miredo.postinst delete mode 100644 package/miredo/ipkg/miredo-server.control delete mode 100644 package/miredo/ipkg/miredo-server.postinst delete mode 100644 package/miredo/ipkg/miredo.conffiles delete mode 100644 package/miredo/ipkg/miredo.control delete mode 100644 package/miredo/ipkg/miredo.postinst create mode 100644 package/mksh/files/mksh.conffiles delete mode 100644 package/mksh/ipkg/mksh.conffiles delete mode 100644 package/mksh/ipkg/mksh.control delete mode 100644 package/moc/ipkg/moc.control create mode 100644 package/monit/files/monit-nossl.conffiles create mode 100644 package/monit/files/monit.conffiles delete mode 100644 package/monit/ipkg/monit-nossl.conffiles delete mode 100644 package/monit/ipkg/monit-nossl.control delete mode 100644 package/monit/ipkg/monit.conffiles delete mode 100644 package/monit/ipkg/monit.control delete mode 100644 package/motion/ipkg/motion.control delete mode 100644 package/motion/patches/01-ffmpeg.patch delete mode 100644 package/motion/patches/02-honor_cppflags.patch create mode 100644 package/motion/patches/patch-track_c create mode 100644 package/mpd/files/mpd.conffiles create mode 100644 package/mpd/files/mpd.postinst delete mode 100644 package/mpd/ipkg/mpd.conffiles delete mode 100644 package/mpd/ipkg/mpd.control delete mode 100644 package/mpd/ipkg/mpd.postinst delete mode 100644 package/mpfr/ipkg/mpfr.control delete mode 100644 package/mplayer/ipkg/mplayer.control create mode 100644 package/mrd6/files/mrd6.postinst delete mode 100644 package/mrd6/ipkg/mrd6.control delete mode 100644 package/mrd6/ipkg/mrd6.postinst create mode 100644 package/mt-daapd/files/mt-daapd.conffiles create mode 100644 package/mt-daapd/files/mt-daapd.postinst delete mode 100644 package/mt-daapd/ipkg/mt-daapd.conffiles delete mode 100644 package/mt-daapd/ipkg/mt-daapd.control delete mode 100644 package/mt-daapd/ipkg/mt-daapd.postinst delete mode 100644 package/mtr/ipkg/mtr.control delete mode 100644 package/mutt/ipkg/mutt.control delete mode 100644 package/mysql/ipkg/libmysqlclient.control create mode 100644 package/nano/files/nano.conffiles delete mode 100644 package/nano/ipkg/nano.conffiles delete mode 100644 package/nano/ipkg/nano.control delete mode 100644 package/ncurses/ipkg/libncurses.control delete mode 100644 package/ndisc/ipkg/ndisc6.control delete mode 100644 package/ndisc/ipkg/rdisc6.control delete mode 100644 package/ndisc/ipkg/tcptraceroute6.control delete mode 100644 package/neon/ipkg/neon.control create mode 100644 package/net-snmp/files/snmpd.conffiles create mode 100644 package/net-snmp/files/snmpd.postinst delete mode 100644 package/net-snmp/ipkg/libnetsnmp.control delete mode 100644 package/net-snmp/ipkg/snmp-utils.control delete mode 100644 package/net-snmp/ipkg/snmpd.conffiles delete mode 100644 package/net-snmp/ipkg/snmpd.control delete mode 100644 package/net-snmp/ipkg/snmpd.postinst create mode 100644 package/netperf/files/netperf.postinst delete mode 100644 package/netperf/ipkg/netperf.control delete mode 100644 package/netperf/ipkg/netperf.postinst delete mode 100644 package/netperf/patches/01-netperf-2.3pl1-openwrt.patch delete mode 100644 package/netstat-nat/ipkg/netstat-nat.control create mode 100644 package/nfs-utils/files/nfs-utils.postinst delete mode 100644 package/nfs-utils/ipkg/nfs-utils.control delete mode 100644 package/nfs-utils/ipkg/nfs-utils.postinst delete mode 100644 package/nmap/ipkg/nmap.control delete mode 100644 package/nocatsplash/Config.in delete mode 100644 package/nocatsplash/Makefile delete mode 100644 package/nocatsplash/ipkg/nocatsplash.conffiles delete mode 100644 package/nocatsplash/ipkg/nocatsplash.control delete mode 100644 package/nocatsplash/patches/openwrt-firewall.patch delete mode 100644 package/ntfs-3g/ipkg/kmod-fs-ntfs-3g.control delete mode 100644 package/ntpclient/ipkg/ntpclient.control create mode 100644 package/nut/files/nut.conffiles create mode 100644 package/nut/files/nut.postinst delete mode 100644 package/nut/ipkg/nut.conffiles delete mode 100644 package/nut/ipkg/nut.control delete mode 100644 package/nut/ipkg/nut.postinst delete mode 100644 package/obexftp/ipkg/obexftp.control create mode 100644 package/olsrd/files/olsrd-mod-secure.conffiles create mode 100644 package/olsrd/files/olsrd.conffiles create mode 100644 package/olsrd/files/olsrd.postinst delete mode 100644 package/olsrd/ipkg/olsrd-mod-dot-draw.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-dyn-gw.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-httpinfo.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-nameservice.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-power.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-secure.conffiles delete mode 100644 package/olsrd/ipkg/olsrd-mod-secure.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-tas.control delete mode 100644 package/olsrd/ipkg/olsrd.conffiles delete mode 100644 package/olsrd/ipkg/olsrd.control delete mode 100644 package/olsrd/ipkg/olsrd.postinst delete mode 100644 package/opencdk/ipkg/libopencdk.control delete mode 100644 package/openct/ipkg/openct.control create mode 100644 package/openldap/files/libopenldap.conffiles create mode 100644 package/openldap/files/openldap-slapd.postinst delete mode 100644 package/openldap/ipkg/libopenldap.conffiles delete mode 100644 package/openldap/ipkg/libopenldap.control delete mode 100644 package/openldap/ipkg/openldap-slapd.control delete mode 100644 package/openldap/ipkg/openldap-slapd.postinst delete mode 100644 package/openldap/ipkg/openldap-utils.control create mode 100644 package/openntpd/files/openntpd.conffiles create mode 100644 package/openntpd/files/openntpd.postinst delete mode 100644 package/openntpd/ipkg/openntpd.conffiles delete mode 100644 package/openntpd/ipkg/openntpd.control delete mode 100644 package/openntpd/ipkg/openntpd.postinst delete mode 100644 package/openobex/ipkg/openobex.control create mode 100644 package/openobex/patches/patch-configure delete mode 100644 package/opensc/ipkg/opensc.control create mode 100644 package/opensips/files/opensips.conffiles create mode 100644 package/opensips/files/opensips.postinst delete mode 100644 package/opensips/ipkg/opensips-mod-acc.control delete mode 100644 package/opensips/ipkg/opensips-mod-auth-db.control delete mode 100644 package/opensips/ipkg/opensips-mod-auth-radius.control delete mode 100644 package/opensips/ipkg/opensips-mod-auth.control delete mode 100644 package/opensips/ipkg/opensips-mod-avp-radius.control delete mode 100644 package/opensips/ipkg/opensips-mod-avp_radius.control delete mode 100644 package/opensips/ipkg/opensips-mod-avpops.control delete mode 100644 package/opensips/ipkg/opensips-mod-dispatcher.control delete mode 100644 package/opensips/ipkg/opensips-mod-diversion.control delete mode 100644 package/opensips/ipkg/opensips-mod-flatstore.control delete mode 100644 package/opensips/ipkg/opensips-mod-gflags.control delete mode 100644 package/opensips/ipkg/opensips-mod-group-radius.control delete mode 100644 package/opensips/ipkg/opensips-mod-group.control delete mode 100644 package/opensips/ipkg/opensips-mod-group_radius.control delete mode 100644 package/opensips/ipkg/opensips-mod-lcr.control delete mode 100644 package/opensips/ipkg/opensips-mod-mediaproxy.control delete mode 100644 package/opensips/ipkg/opensips-mod-msilo.control delete mode 100644 package/opensips/ipkg/opensips-mod-mysql.control delete mode 100644 package/opensips/ipkg/opensips-mod-nathelper.control delete mode 100644 package/opensips/ipkg/opensips-mod-options.control delete mode 100644 package/opensips/ipkg/opensips-mod-pdt.control delete mode 100644 package/opensips/ipkg/opensips-mod-permissions.control delete mode 100644 package/opensips/ipkg/opensips-mod-pike.control delete mode 100644 package/opensips/ipkg/opensips-mod-sms.control delete mode 100644 package/opensips/ipkg/opensips-mod-speeddial.control delete mode 100644 package/opensips/ipkg/opensips-mod-uac-redirect.control delete mode 100644 package/opensips/ipkg/opensips-mod-uac.control delete mode 100644 package/opensips/ipkg/opensips-mod-uac_redirect.control delete mode 100644 package/opensips/ipkg/opensips-mod-uri-db.control delete mode 100644 package/opensips/ipkg/opensips-mod-uri-radius.control delete mode 100644 package/opensips/ipkg/opensips-mod-uri.control delete mode 100644 package/opensips/ipkg/opensips-mod-uri_db.control delete mode 100644 package/opensips/ipkg/opensips-mod-uri_radius.control delete mode 100644 package/opensips/ipkg/opensips-mod-xlog.control delete mode 100644 package/opensips/ipkg/opensips.conffiles delete mode 100644 package/opensips/ipkg/opensips.control delete mode 100644 package/opensips/ipkg/opensips.postinst create mode 100644 package/openssh/files/openssh-client.conffiles create mode 100644 package/openssh/files/openssh-server.conffiles create mode 100644 package/openssh/files/openssh-server.postinst delete mode 100644 package/openssh/ipkg/openssh-client-utils.control delete mode 100644 package/openssh/ipkg/openssh-client.conffiles delete mode 100644 package/openssh/ipkg/openssh-client.control delete mode 100644 package/openssh/ipkg/openssh-server.conffiles delete mode 100644 package/openssh/ipkg/openssh-server.control delete mode 100644 package/openssh/ipkg/openssh-server.postinst delete mode 100644 package/openssh/ipkg/openssh-sftp-client.control delete mode 100644 package/openssh/ipkg/openssh-sftp-server.control delete mode 100644 package/openssl-pkcs11/ipkg/openssl-pkcs11.control delete mode 100644 package/openssl-pkcs11/patches/patch-configure create mode 100644 package/openssl/files/ca-certificates.conffiles create mode 100644 package/openssl/files/openssl-util.conffiles delete mode 100644 package/openssl/ipkg/ca-certificates.conffiles delete mode 100644 package/openssl/ipkg/ca-certificates.control delete mode 100644 package/openssl/ipkg/libopenssl.control delete mode 100644 package/openssl/ipkg/openssl-util.conffiles delete mode 100644 package/openssl/ipkg/openssl-util.control create mode 100644 package/openswan/files/openswan.conffiles create mode 100644 package/openswan/files/openswan.postinst delete mode 100644 package/openswan/ipkg/openswan.conffiles delete mode 100644 package/openswan/ipkg/openswan.control delete mode 100644 package/openswan/ipkg/openswan.postinst create mode 100644 package/openvpn/files/openvpn.postinst delete mode 100644 package/openvpn/ipkg/openvpn-easy-rsa.control delete mode 100644 package/openvpn/ipkg/openvpn.control delete mode 100644 package/openvpn/ipkg/openvpn.postinst delete mode 100644 package/oprofile/ipkg/oprofile.control create mode 100644 package/osiris/files/osirisd.postinst delete mode 100644 package/osiris/ipkg/osirisd.control delete mode 100644 package/osiris/ipkg/osirisd.postinst delete mode 100644 package/owfs/ipkg/owfs.control create mode 100644 package/p910nd/files/p910nd.postinst delete mode 100644 package/p910nd/ipkg/p910nd.control delete mode 100644 package/p910nd/ipkg/p910nd.postinst create mode 100644 package/palantir/files/palantir.conffiles delete mode 100644 package/palantir/ipkg/palantir.conffiles delete mode 100644 package/palantir/ipkg/palantir.control create mode 100644 package/parprouted/files/parprouted.postinst delete mode 100644 package/parprouted/ipkg/parprouted.control delete mode 100644 package/parprouted/ipkg/parprouted.postinst delete mode 100644 package/parprouted/patches/parprouted.patch delete mode 100644 package/pciutils/ipkg/pciutils.control delete mode 100644 package/pcre/ipkg/libpcre.control create mode 100644 package/php/files/php-cgi.conffiles create mode 100644 package/php/files/php-cli.conffiles create mode 100644 package/php/files/php-fastcgi.conffiles create mode 100644 package/php/files/php-fastcgi.postinst delete mode 100644 package/php/ipkg/php-cgi.conffiles delete mode 100644 package/php/ipkg/php-cgi.control delete mode 100644 package/php/ipkg/php-cli.conffiles delete mode 100644 package/php/ipkg/php-cli.control delete mode 100644 package/php/ipkg/php-fastcgi.conffiles delete mode 100644 package/php/ipkg/php-fastcgi.control delete mode 100644 package/php/ipkg/php-fastcgi.postinst delete mode 100644 package/php/ipkg/php-mod-curl.control delete mode 100644 package/php/ipkg/php-mod-ftp.control delete mode 100644 package/php/ipkg/php-mod-gd.control delete mode 100644 package/php/ipkg/php-mod-gmp.control delete mode 100644 package/php/ipkg/php-mod-ldap.control delete mode 100644 package/php/ipkg/php-mod-mysql.control delete mode 100644 package/php/ipkg/php-mod-openssl.control delete mode 100644 package/php/ipkg/php-mod-pcre.control delete mode 100644 package/php/ipkg/php-mod-pgsql.control delete mode 100644 package/php/ipkg/php-mod-session.control delete mode 100644 package/php/ipkg/php-mod-sockets.control delete mode 100644 package/php/ipkg/php-mod-sqlite.control delete mode 100644 package/php/ipkg/php-mod-xml.control delete mode 100644 package/picocom/ipkg/picocom.control delete mode 100644 package/pipacs/ipkg/pipacs.control delete mode 100644 package/pixman/ipkg/pixman.control create mode 100644 package/pmacct/files/nfacctd.conffiles create mode 100644 package/pmacct/files/nfacctd.postinst create mode 100644 package/pmacct/files/pmacctd.conffiles create mode 100644 package/pmacct/files/pmacctd.postinst delete mode 100644 package/pmacct/ipkg/nfacctd-custom.control delete mode 100644 package/pmacct/ipkg/nfacctd-mysql.control delete mode 100644 package/pmacct/ipkg/nfacctd-pgsql.control delete mode 100644 package/pmacct/ipkg/nfacctd-sqlite.control delete mode 100644 package/pmacct/ipkg/nfacctd.conffiles delete mode 100644 package/pmacct/ipkg/nfacctd.control delete mode 100644 package/pmacct/ipkg/nfacctd.postinst delete mode 100644 package/pmacct/ipkg/pmacct-client.control delete mode 100644 package/pmacct/ipkg/pmacctd-custom.control delete mode 100644 package/pmacct/ipkg/pmacctd-mysql.control delete mode 100644 package/pmacct/ipkg/pmacctd-pgsql.control delete mode 100644 package/pmacct/ipkg/pmacctd-sqlite.control delete mode 100644 package/pmacct/ipkg/pmacctd.conffiles delete mode 100644 package/pmacct/ipkg/pmacctd.control delete mode 100644 package/pmacct/ipkg/pmacctd.postinst create mode 100644 package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c delete mode 100644 package/popt/ipkg/libpopt.control create mode 100644 package/portmap/files/portmap.postinst delete mode 100644 package/portmap/ipkg/portmap.control delete mode 100644 package/portmap/ipkg/portmap.postinst create mode 100644 package/portsentry/files/portsentry.conffiles delete mode 100644 package/portsentry/ipkg/portsentry.conffiles delete mode 100644 package/portsentry/ipkg/portsentry.control delete mode 100644 package/postgresql/ipkg/libpq.control delete mode 100644 package/postgresql/ipkg/pgsql-cli.control create mode 100644 package/ppp/files/ppp-mod-radius.conffiles create mode 100644 package/ppp/files/ppp.conffiles delete mode 100644 package/ppp/ipkg/ppp-mod-chat.control delete mode 100644 package/ppp/ipkg/ppp-mod-pppdump.control delete mode 100644 package/ppp/ipkg/ppp-mod-pppoa.control delete mode 100644 package/ppp/ipkg/ppp-mod-pppoe.control delete mode 100644 package/ppp/ipkg/ppp-mod-pppstats.control delete mode 100644 package/ppp/ipkg/ppp-mod-pppumts.control delete mode 100644 package/ppp/ipkg/ppp-mod-radius.conffiles delete mode 100644 package/ppp/ipkg/ppp-mod-radius.control delete mode 100644 package/ppp/ipkg/ppp.conffiles delete mode 100644 package/ppp/ipkg/ppp.control create mode 100644 package/pptp/files/pptp.conffiles delete mode 100644 package/pptp/ipkg/pptp.conffiles delete mode 100644 package/pptp/ipkg/pptp.control create mode 100644 package/pptpd/files/pptpd.conffiles create mode 100644 package/pptpd/files/pptpd.postinst delete mode 100644 package/pptpd/ipkg/pptpd.conffiles delete mode 100644 package/pptpd/ipkg/pptpd.control delete mode 100644 package/pptpd/ipkg/pptpd.postinst delete mode 100644 package/privoxy/ipkg/privoxy.control delete mode 100644 package/procmail/ipkg/procmail.control delete mode 100644 package/procps/ipkg/procps.control delete mode 100644 package/ptunnel/ipkg/ptunnel.control create mode 100644 package/quagga/files/quagga.postinst delete mode 100644 package/quagga/ipkg/quagga-bgpd.control delete mode 100644 package/quagga/ipkg/quagga-ospf6d.control delete mode 100644 package/quagga/ipkg/quagga-ospfd.control delete mode 100644 package/quagga/ipkg/quagga-ripd.control delete mode 100644 package/quagga/ipkg/quagga-ripngd.control delete mode 100644 package/quagga/ipkg/quagga-vtysh.control delete mode 100644 package/quagga/ipkg/quagga.control delete mode 100644 package/quagga/ipkg/quagga.postinst delete mode 100755 package/raddump/ipkg/raddump.control delete mode 100644 package/radiusclient-ng/ipkg/libradiusclient-ng.control delete mode 100644 package/radiusclient-ng/ipkg/radiusclient-ng.control create mode 100644 package/radvd/files/radvd.conffiles create mode 100644 package/radvd/files/radvd.postinst delete mode 100644 package/radvd/ipkg/radvd.conffiles delete mode 100644 package/radvd/ipkg/radvd.control delete mode 100644 package/radvd/ipkg/radvd.postinst create mode 100644 package/radvd/patches/patch-Makefile_in create mode 100644 package/rarpd/files/rarpd.postinst delete mode 100644 package/rarpd/ipkg/rarpd.control delete mode 100644 package/rarpd/ipkg/rarpd.postinst create mode 100644 package/rdate/files/rdate.postinst delete mode 100644 package/rdate/ipkg/rdate.control delete mode 100644 package/rdate/ipkg/rdate.postinst delete mode 100644 package/readline/ipkg/libreadline.control create mode 100644 package/reaim/files/reaim.postinst delete mode 100644 package/reaim/ipkg/reaim.control delete mode 100644 package/reaim/ipkg/reaim.postinst create mode 100644 package/rp-pppoe/files/pppoe-client.conffiles create mode 100644 package/rp-pppoe/files/pppoe-client.postinst create mode 100644 package/rp-pppoe/files/pppoe-relay.postinst create mode 100644 package/rp-pppoe/files/pppoe-server.conffiles create mode 100644 package/rp-pppoe/files/rules create mode 100644 package/rp-pppoe/files/version delete mode 100644 package/rp-pppoe/ipkg/pppoe-client.conffiles delete mode 100644 package/rp-pppoe/ipkg/pppoe-client.control delete mode 100644 package/rp-pppoe/ipkg/pppoe-client.postinst delete mode 100644 package/rp-pppoe/ipkg/pppoe-relay.control delete mode 100644 package/rp-pppoe/ipkg/pppoe-relay.postinst delete mode 100644 package/rp-pppoe/ipkg/pppoe-server.conffiles delete mode 100644 package/rp-pppoe/ipkg/pppoe-server.control delete mode 100644 package/rp-pppoe/ipkg/pppoe-sniff.control delete mode 100644 package/rp-pppoe/ipkg/rules delete mode 100644 package/rp-pppoe/ipkg/version create mode 100644 package/rrdcollect/files/rrdcollect-example.conffiles create mode 100644 package/rrdcollect/files/rrdcollect.postinst delete mode 100644 package/rrdcollect/ipkg/rrdcollect-example.conffiles delete mode 100644 package/rrdcollect/ipkg/rrdcollect-example.control delete mode 100644 package/rrdcollect/ipkg/rrdcollect.control delete mode 100644 package/rrdcollect/ipkg/rrdcollect.postinst delete mode 100644 package/rrdtool/ipkg/librrd.control delete mode 100644 package/rrdtool/ipkg/rrdcgi.control delete mode 100644 package/rrdtool/ipkg/rrdtool.control delete mode 100644 package/rrs/ipkg/rrs-nossl.control delete mode 100644 package/rrs/ipkg/rrs.control delete mode 100644 package/rsync/ipkg/rsync.control delete mode 100644 package/rtorrent/ipkg/rtorrent.control delete mode 100644 package/ruby/ipkg/ruby.control create mode 100644 package/samba/files/samba.conffiles create mode 100644 package/samba/files/samba.postinst create mode 100644 package/samba/files/swat.postinst delete mode 100644 package/samba/ipkg/samba-client.control delete mode 100644 package/samba/ipkg/samba-passwd.control delete mode 100644 package/samba/ipkg/samba.conffiles delete mode 100644 package/samba/ipkg/samba.control delete mode 100644 package/samba/ipkg/samba.postinst delete mode 100644 package/samba/ipkg/swat.control delete mode 100644 package/samba/ipkg/swat.postinst create mode 100644 package/sane-backends/files/sane-backend-abaton.conffiles create mode 100644 package/sane-backends/files/sane-backend-abaton.postinst create mode 100644 package/sane-backends/files/sane-backend-agfafocus.conffiles create mode 100644 package/sane-backends/files/sane-backend-agfafocus.postinst create mode 100644 package/sane-backends/files/sane-backend-apple.conffiles create mode 100644 package/sane-backends/files/sane-backend-apple.postinst create mode 100644 package/sane-backends/files/sane-backend-artec-eplus48u.conffiles create mode 100644 package/sane-backends/files/sane-backend-artec-eplus48u.postinst create mode 100644 package/sane-backends/files/sane-backend-artec.conffiles create mode 100644 package/sane-backends/files/sane-backend-artec.postinst create mode 100644 package/sane-backends/files/sane-backend-as6e.postinst create mode 100644 package/sane-backends/files/sane-backend-avision.conffiles create mode 100644 package/sane-backends/files/sane-backend-avision.postinst create mode 100644 package/sane-backends/files/sane-backend-bh.conffiles create mode 100644 package/sane-backends/files/sane-backend-bh.postinst create mode 100644 package/sane-backends/files/sane-backend-canon.conffiles create mode 100644 package/sane-backends/files/sane-backend-canon.postinst create mode 100644 package/sane-backends/files/sane-backend-canon630u.conffiles create mode 100644 package/sane-backends/files/sane-backend-canon630u.postinst create mode 100644 package/sane-backends/files/sane-backend-coolscan.conffiles create mode 100644 package/sane-backends/files/sane-backend-coolscan.postinst create mode 100644 package/sane-backends/files/sane-backend-coolscan2.conffiles create mode 100644 package/sane-backends/files/sane-backend-coolscan2.postinst create mode 100644 package/sane-backends/files/sane-backend-dc25.conffiles create mode 100644 package/sane-backends/files/sane-backend-dc25.postinst create mode 100644 package/sane-backends/files/sane-backend-dmc.conffiles create mode 100644 package/sane-backends/files/sane-backend-dmc.postinst create mode 100644 package/sane-backends/files/sane-backend-epson.conffiles create mode 100644 package/sane-backends/files/sane-backend-epson.postinst create mode 100644 package/sane-backends/files/sane-backend-fujitsu.conffiles create mode 100644 package/sane-backends/files/sane-backend-fujitsu.postinst create mode 100644 package/sane-backends/files/sane-backend-genesys.conffiles create mode 100644 package/sane-backends/files/sane-backend-genesys.postinst create mode 100644 package/sane-backends/files/sane-backend-gt68xx.conffiles create mode 100644 package/sane-backends/files/sane-backend-gt68xx.postinst create mode 100644 package/sane-backends/files/sane-backend-hp.conffiles create mode 100644 package/sane-backends/files/sane-backend-hp.postinst create mode 100644 package/sane-backends/files/sane-backend-hp3500.postinst create mode 100644 package/sane-backends/files/sane-backend-hp4200.conffiles create mode 100644 package/sane-backends/files/sane-backend-hp4200.postinst create mode 100644 package/sane-backends/files/sane-backend-hp5400.conffiles create mode 100644 package/sane-backends/files/sane-backend-hp5400.postinst create mode 100644 package/sane-backends/files/sane-backend-ibm.conffiles create mode 100644 package/sane-backends/files/sane-backend-ibm.postinst create mode 100644 package/sane-backends/files/sane-backend-leo.conffiles create mode 100644 package/sane-backends/files/sane-backend-leo.postinst create mode 100644 package/sane-backends/files/sane-backend-lexmark.conffiles create mode 100644 package/sane-backends/files/sane-backend-lexmark.postinst create mode 100644 package/sane-backends/files/sane-backend-ma1509.conffiles create mode 100644 package/sane-backends/files/sane-backend-ma1509.postinst create mode 100644 package/sane-backends/files/sane-backend-matsushita.conffiles create mode 100644 package/sane-backends/files/sane-backend-matsushita.postinst create mode 100644 package/sane-backends/files/sane-backend-microtek.conffiles create mode 100644 package/sane-backends/files/sane-backend-microtek.postinst create mode 100644 package/sane-backends/files/sane-backend-microtek2.conffiles create mode 100644 package/sane-backends/files/sane-backend-microtek2.postinst create mode 100644 package/sane-backends/files/sane-backend-mustek-usb.conffiles create mode 100644 package/sane-backends/files/sane-backend-mustek-usb.postinst create mode 100644 package/sane-backends/files/sane-backend-mustek-usb2.postinst create mode 100644 package/sane-backends/files/sane-backend-mustek.conffiles create mode 100644 package/sane-backends/files/sane-backend-mustek.postinst create mode 100644 package/sane-backends/files/sane-backend-nec.conffiles create mode 100644 package/sane-backends/files/sane-backend-nec.postinst create mode 100644 package/sane-backends/files/sane-backend-net.conffiles create mode 100644 package/sane-backends/files/sane-backend-net.postinst create mode 100644 package/sane-backends/files/sane-backend-niash.postinst create mode 100644 package/sane-backends/files/sane-backend-pie.conffiles create mode 100644 package/sane-backends/files/sane-backend-pie.postinst create mode 100644 package/sane-backends/files/sane-backend-pixma.postinst create mode 100644 package/sane-backends/files/sane-backend-plustek-pp.conffiles create mode 100644 package/sane-backends/files/sane-backend-plustek-pp.postinst create mode 100644 package/sane-backends/files/sane-backend-plustek.conffiles create mode 100644 package/sane-backends/files/sane-backend-plustek.postinst create mode 100644 package/sane-backends/files/sane-backend-qcam.conffiles create mode 100644 package/sane-backends/files/sane-backend-qcam.postinst create mode 100644 package/sane-backends/files/sane-backend-ricoh.conffiles create mode 100644 package/sane-backends/files/sane-backend-ricoh.postinst create mode 100644 package/sane-backends/files/sane-backend-s9036.conffiles create mode 100644 package/sane-backends/files/sane-backend-s9036.postinst create mode 100644 package/sane-backends/files/sane-backend-sceptre.conffiles create mode 100644 package/sane-backends/files/sane-backend-sceptre.postinst create mode 100644 package/sane-backends/files/sane-backend-sharp.conffiles create mode 100644 package/sane-backends/files/sane-backend-sharp.postinst create mode 100644 package/sane-backends/files/sane-backend-sm3600.postinst create mode 100644 package/sane-backends/files/sane-backend-sm3840.conffiles create mode 100644 package/sane-backends/files/sane-backend-sm3840.postinst create mode 100644 package/sane-backends/files/sane-backend-snapscan.conffiles create mode 100644 package/sane-backends/files/sane-backend-snapscan.postinst create mode 100644 package/sane-backends/files/sane-backend-sp15c.conffiles create mode 100644 package/sane-backends/files/sane-backend-sp15c.postinst create mode 100644 package/sane-backends/files/sane-backend-st400.conffiles create mode 100644 package/sane-backends/files/sane-backend-st400.postinst create mode 100644 package/sane-backends/files/sane-backend-stv680.conffiles create mode 100644 package/sane-backends/files/sane-backend-stv680.postinst create mode 100644 package/sane-backends/files/sane-backend-tamarack.conffiles create mode 100644 package/sane-backends/files/sane-backend-tamarack.postinst create mode 100644 package/sane-backends/files/sane-backend-teco1.conffiles create mode 100644 package/sane-backends/files/sane-backend-teco1.postinst create mode 100644 package/sane-backends/files/sane-backend-teco2.conffiles create mode 100644 package/sane-backends/files/sane-backend-teco2.postinst create mode 100644 package/sane-backends/files/sane-backend-teco3.conffiles create mode 100644 package/sane-backends/files/sane-backend-teco3.postinst create mode 100644 package/sane-backends/files/sane-backend-test.conffiles create mode 100644 package/sane-backends/files/sane-backend-test.postinst create mode 100644 package/sane-backends/files/sane-backend-u12.conffiles create mode 100644 package/sane-backends/files/sane-backend-u12.postinst create mode 100644 package/sane-backends/files/sane-backend-umax-pp.conffiles create mode 100644 package/sane-backends/files/sane-backend-umax-pp.postinst create mode 100644 package/sane-backends/files/sane-backend-umax.conffiles create mode 100644 package/sane-backends/files/sane-backend-umax.postinst create mode 100644 package/sane-backends/files/sane-backend-umax1220u.conffiles create mode 100644 package/sane-backends/files/sane-backend-umax1220u.postinst create mode 100644 package/sane-backends/files/sane-backend-v4l.conffiles create mode 100644 package/sane-backends/files/sane-backend-v4l.postinst create mode 100644 package/sane-backends/files/sane-backends.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-abaton.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-abaton.control delete mode 100644 package/sane-backends/ipkg/sane-backend-abaton.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-agfafocus.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-agfafocus.control delete mode 100644 package/sane-backends/ipkg/sane-backend-agfafocus.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-apple.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-apple.control delete mode 100644 package/sane-backends/ipkg/sane-backend-apple.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-artec-eplus48u.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-artec-eplus48u.control delete mode 100644 package/sane-backends/ipkg/sane-backend-artec-eplus48u.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-artec.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-artec.control delete mode 100644 package/sane-backends/ipkg/sane-backend-artec.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-as6e.control delete mode 100644 package/sane-backends/ipkg/sane-backend-as6e.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-avision.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-avision.control delete mode 100644 package/sane-backends/ipkg/sane-backend-avision.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-bh.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-bh.control delete mode 100644 package/sane-backends/ipkg/sane-backend-bh.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-canon.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-canon.control delete mode 100644 package/sane-backends/ipkg/sane-backend-canon.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-canon630u.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-canon630u.control delete mode 100644 package/sane-backends/ipkg/sane-backend-canon630u.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-coolscan.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-coolscan.control delete mode 100644 package/sane-backends/ipkg/sane-backend-coolscan.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-coolscan2.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-coolscan2.control delete mode 100644 package/sane-backends/ipkg/sane-backend-coolscan2.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-dc25.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-dc25.control delete mode 100644 package/sane-backends/ipkg/sane-backend-dc25.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-dmc.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-dmc.control delete mode 100644 package/sane-backends/ipkg/sane-backend-dmc.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-epson.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-epson.control delete mode 100644 package/sane-backends/ipkg/sane-backend-epson.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-fujitsu.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-fujitsu.control delete mode 100644 package/sane-backends/ipkg/sane-backend-fujitsu.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-genesys.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-genesys.control delete mode 100644 package/sane-backends/ipkg/sane-backend-genesys.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-gt68xx.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-gt68xx.control delete mode 100644 package/sane-backends/ipkg/sane-backend-gt68xx.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-hp.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-hp.control delete mode 100644 package/sane-backends/ipkg/sane-backend-hp.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-hp3500.control delete mode 100644 package/sane-backends/ipkg/sane-backend-hp3500.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-hp4200.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-hp4200.control delete mode 100644 package/sane-backends/ipkg/sane-backend-hp4200.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-hp5400.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-hp5400.control delete mode 100644 package/sane-backends/ipkg/sane-backend-hp5400.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-ibm.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-ibm.control delete mode 100644 package/sane-backends/ipkg/sane-backend-ibm.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-leo.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-leo.control delete mode 100644 package/sane-backends/ipkg/sane-backend-leo.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-lexmark.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-lexmark.control delete mode 100644 package/sane-backends/ipkg/sane-backend-lexmark.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-ma1509.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-ma1509.control delete mode 100644 package/sane-backends/ipkg/sane-backend-ma1509.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-matsushita.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-matsushita.control delete mode 100644 package/sane-backends/ipkg/sane-backend-matsushita.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-microtek.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-microtek.control delete mode 100644 package/sane-backends/ipkg/sane-backend-microtek.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-microtek2.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-microtek2.control delete mode 100644 package/sane-backends/ipkg/sane-backend-microtek2.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-mustek-usb.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-mustek-usb.control delete mode 100644 package/sane-backends/ipkg/sane-backend-mustek-usb.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-mustek-usb2.control delete mode 100644 package/sane-backends/ipkg/sane-backend-mustek-usb2.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-mustek.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-mustek.control delete mode 100644 package/sane-backends/ipkg/sane-backend-mustek.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-nec.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-nec.control delete mode 100644 package/sane-backends/ipkg/sane-backend-nec.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-net.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-net.control delete mode 100644 package/sane-backends/ipkg/sane-backend-net.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-niash.control delete mode 100644 package/sane-backends/ipkg/sane-backend-niash.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-pie.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-pie.control delete mode 100644 package/sane-backends/ipkg/sane-backend-pie.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-pixma.control delete mode 100644 package/sane-backends/ipkg/sane-backend-pixma.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-plustek-pp.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-plustek-pp.control delete mode 100644 package/sane-backends/ipkg/sane-backend-plustek-pp.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-plustek.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-plustek.control delete mode 100644 package/sane-backends/ipkg/sane-backend-plustek.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-qcam.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-qcam.control delete mode 100644 package/sane-backends/ipkg/sane-backend-qcam.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-ricoh.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-ricoh.control delete mode 100644 package/sane-backends/ipkg/sane-backend-ricoh.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-s9036.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-s9036.control delete mode 100644 package/sane-backends/ipkg/sane-backend-s9036.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-sceptre.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-sceptre.control delete mode 100644 package/sane-backends/ipkg/sane-backend-sceptre.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-sharp.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-sharp.control delete mode 100644 package/sane-backends/ipkg/sane-backend-sharp.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-sm3600.control delete mode 100644 package/sane-backends/ipkg/sane-backend-sm3600.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-sm3840.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-sm3840.control delete mode 100644 package/sane-backends/ipkg/sane-backend-sm3840.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-snapscan.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-snapscan.control delete mode 100644 package/sane-backends/ipkg/sane-backend-snapscan.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-sp15c.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-sp15c.control delete mode 100644 package/sane-backends/ipkg/sane-backend-sp15c.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-st400.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-st400.control delete mode 100644 package/sane-backends/ipkg/sane-backend-st400.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-stv680.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-stv680.control delete mode 100644 package/sane-backends/ipkg/sane-backend-stv680.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-tamarack.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-tamarack.control delete mode 100644 package/sane-backends/ipkg/sane-backend-tamarack.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-teco1.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-teco1.control delete mode 100644 package/sane-backends/ipkg/sane-backend-teco1.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-teco2.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-teco2.control delete mode 100644 package/sane-backends/ipkg/sane-backend-teco2.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-teco3.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-teco3.control delete mode 100644 package/sane-backends/ipkg/sane-backend-teco3.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-test.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-test.control delete mode 100644 package/sane-backends/ipkg/sane-backend-test.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-u12.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-u12.control delete mode 100644 package/sane-backends/ipkg/sane-backend-u12.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-umax-pp.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-umax-pp.control delete mode 100644 package/sane-backends/ipkg/sane-backend-umax-pp.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-umax.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-umax.control delete mode 100644 package/sane-backends/ipkg/sane-backend-umax.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-umax1220u.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-umax1220u.control delete mode 100644 package/sane-backends/ipkg/sane-backend-umax1220u.postinst delete mode 100644 package/sane-backends/ipkg/sane-backend-v4l.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backend-v4l.control delete mode 100644 package/sane-backends/ipkg/sane-backend-v4l.postinst delete mode 100644 package/sane-backends/ipkg/sane-backends.conffiles delete mode 100644 package/sane-backends/ipkg/sane-backends.control create mode 100644 package/scanlogd/files/scanlogd.postinst delete mode 100644 package/scanlogd/ipkg/scanlogd.control delete mode 100644 package/scanlogd/ipkg/scanlogd.postinst delete mode 100644 package/scdp/ipkg/scdp.control delete mode 100644 package/screen/ipkg/screen.control delete mode 100644 package/scsi-spin/ipkg/scsi-spin.control create mode 100644 package/ser2net/files/ser2net.conffiles delete mode 100644 package/ser2net/ipkg/ser2net.conffiles delete mode 100644 package/ser2net/ipkg/ser2net.control delete mode 100644 package/serdisplib/ipkg/serdisplib.control create mode 100644 package/serdisplib/patches/patch-src_serdisp_control_c delete mode 100644 package/setpwc/ipkg/setpwc.control delete mode 100644 package/setserial/ipkg/setserial.control delete mode 100644 package/shat/ipkg/shat.control create mode 100644 package/shorewall-common/files/shorewall-common.conffiles create mode 100644 package/shorewall-common/files/shorewall-common.postinst create mode 100644 package/shorewall-common/files/shorewall-common.prerm delete mode 100644 package/shorewall-common/ipkg/shorewall-common.conffiles delete mode 100644 package/shorewall-common/ipkg/shorewall-common.control delete mode 100644 package/shorewall-common/ipkg/shorewall-common.postinst delete mode 100644 package/shorewall-common/ipkg/shorewall-common.prerm delete mode 100644 package/shorewall-shell/ipkg/shorewall-shell.control create mode 100644 package/siproxd/files/siproxd.conffiles create mode 100644 package/siproxd/files/siproxd.postinst delete mode 100644 package/siproxd/ipkg/siproxd.conffiles delete mode 100644 package/siproxd/ipkg/siproxd.control delete mode 100644 package/siproxd/ipkg/siproxd.postinst delete mode 100644 package/siproxd/patches/patch-configure delete mode 100644 package/sipsak/ipkg/sipsak.control delete mode 100644 package/sispmctl/ipkg/sispmctl.control delete mode 100644 package/slurm/ipkg/slurm.control create mode 100644 package/snort-wireless/files/snort-wireless.conffiles create mode 100644 package/snort-wireless/files/snort-wireless.postinst delete mode 100644 package/snort-wireless/ipkg/snort-wireless.conffiles delete mode 100644 package/snort-wireless/ipkg/snort-wireless.control delete mode 100644 package/snort-wireless/ipkg/snort-wireless.postinst create mode 100644 package/snort/files/snort.conffiles create mode 100644 package/snort/files/snort.postinst delete mode 100644 package/snort/ipkg/snort.conffiles delete mode 100644 package/snort/ipkg/snort.control delete mode 100644 package/snort/ipkg/snort.postinst delete mode 100644 package/socat/ipkg/socat.control delete mode 100644 package/speex/ipkg/libspeex.control delete mode 100644 package/sqlite/ipkg/libsqlite.control delete mode 100644 package/sqlite/ipkg/sqlite-cli.control create mode 100644 package/squid/files/squid.conffiles delete mode 100644 package/squid/ipkg/squid-mod-basic-auth-getpwnam.control delete mode 100644 package/squid/ipkg/squid-mod-basic-auth-ncsa.control delete mode 100644 package/squid/ipkg/squid-mod-basic-auth-smb.control delete mode 100644 package/squid/ipkg/squid-mod-basic-auth-winbind.control delete mode 100644 package/squid/ipkg/squid-mod-digest-auth-password.control delete mode 100644 package/squid/ipkg/squid-mod-external-acl-ip-user.control delete mode 100644 package/squid/ipkg/squid-mod-external-acl-unix-group.control delete mode 100644 package/squid/ipkg/squid-mod-external-acl-winbind-group.control delete mode 100644 package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control delete mode 100644 package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control delete mode 100644 package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control delete mode 100644 package/squid/ipkg/squid.conffiles delete mode 100644 package/squid/ipkg/squid.control create mode 100644 package/srelay/files/srelay.conffiles create mode 100644 package/srelay/files/srelay.postinst delete mode 100644 package/srelay/ipkg/srelay.conffiles delete mode 100644 package/srelay/ipkg/srelay.control delete mode 100644 package/srelay/ipkg/srelay.postinst delete mode 100644 package/ssltunnel/ipkg/ssltunnel.control create mode 100644 package/ssmtp/files/ssmtp.conffiles delete mode 100644 package/ssmtp/ipkg/ssmtp.conffiles delete mode 100644 package/ssmtp/ipkg/ssmtp.control delete mode 100644 package/strace/ipkg/strace.control delete mode 100644 package/stress/ipkg/stress.control delete mode 100644 package/strongswan/Config.in delete mode 100644 package/strongswan/Makefile delete mode 100644 package/strongswan/files/strongswan.init delete mode 100644 package/strongswan/ipkg/strongswan.control create mode 100644 package/subversion/files/subversion.postinst delete mode 100644 package/subversion/ipkg/subversion.control delete mode 100644 package/subversion/ipkg/subversion.postinst delete mode 100644 package/swconfig/ipkg/swconfig.control create mode 100644 package/syslog-ng/files/syslog-ng.conffiles create mode 100644 package/syslog-ng/files/syslog-ng.postinst delete mode 100644 package/syslog-ng/ipkg/syslog-ng.conffiles delete mode 100644 package/syslog-ng/ipkg/syslog-ng.control delete mode 100644 package/syslog-ng/ipkg/syslog-ng.postinst delete mode 100644 package/sysstat/ipkg/sysstat.control delete mode 100644 package/tar/ipkg/tar.control delete mode 100644 package/tcl/ipkg/tcl.control delete mode 100644 package/tcp_wrappers/ipkg/libwrap.control delete mode 100644 package/tcpdump/ipkg/tcpdump.control delete mode 100644 package/tinc/ipkg/tinc.control create mode 100644 package/tinyproxy/files/tinyproxy.postinst delete mode 100644 package/tinyproxy/ipkg/tinyproxy.control delete mode 100644 package/tinyproxy/ipkg/tinyproxy.postinst delete mode 100644 package/tmsnc/ipkg/tmsnc.control create mode 100644 package/tntnet/files/tntnet.conffiles create mode 100644 package/tntnet/files/tntnet.postinst delete mode 100644 package/tntnet/ipkg/tntnet.conffiles delete mode 100644 package/tntnet/ipkg/tntnet.control delete mode 100644 package/tntnet/ipkg/tntnet.postinst create mode 100644 package/tor/files/tor.conffiles create mode 100644 package/tor/files/tor.postinst delete mode 100644 package/tor/ipkg/tor.conffiles delete mode 100644 package/tor/ipkg/tor.control delete mode 100644 package/tor/ipkg/tor.postinst delete mode 100644 package/trafshow/ipkg/trafshow.control delete mode 100644 package/ttcp/ipkg/ttcp.control delete mode 100644 package/uclibc++/ipkg/uclibc++.control create mode 100644 package/uclibc/files/uclibc.conffiles delete mode 100644 package/uclibc/ipkg/uclibc.conffiles delete mode 100644 package/uclibc/ipkg/uclibc.control create mode 100644 package/udev/files/udev.conffiles delete mode 100644 package/udev/ipkg/udev.conffiles delete mode 100644 package/udev/ipkg/udev.control delete mode 100644 package/udev/patches/01-no_debug.patch delete mode 100644 package/udp-broadcast-relay/ipkg/udp-broadcast-relay.control create mode 100644 package/ulogd/files/ulogd.conffiles create mode 100644 package/ulogd/files/ulogd.postinst delete mode 100644 package/ulogd/ipkg/ulogd-mod-extra.control delete mode 100644 package/ulogd/ipkg/ulogd-mod-mysql.control delete mode 100644 package/ulogd/ipkg/ulogd-mod-pcap.control delete mode 100644 package/ulogd/ipkg/ulogd-mod-pgsql.control delete mode 100644 package/ulogd/ipkg/ulogd-mod-sqlite.control delete mode 100644 package/ulogd/ipkg/ulogd.conffiles delete mode 100644 package/ulogd/ipkg/ulogd.control delete mode 100644 package/ulogd/ipkg/ulogd.postinst delete mode 100644 package/updatedd/ipkg/updatedd-mod-changeip.control delete mode 100644 package/updatedd/ipkg/updatedd-mod-dyndns.control delete mode 100644 package/updatedd/ipkg/updatedd-mod-eurodyndns.control delete mode 100644 package/updatedd/ipkg/updatedd-mod-hn.control delete mode 100644 package/updatedd/ipkg/updatedd-mod-noip.control delete mode 100644 package/updatedd/ipkg/updatedd-mod-ods.control delete mode 100644 package/updatedd/ipkg/updatedd-mod-ovh.control delete mode 100644 package/updatedd/ipkg/updatedd-mod-regfish.control delete mode 100644 package/updatedd/ipkg/updatedd-mod-tzo.control delete mode 100644 package/updatedd/ipkg/updatedd.control delete mode 100644 package/usbutils/ipkg/lsusb.control delete mode 100644 package/ussp-push/ipkg/ussp-push.control delete mode 100644 package/ustl/ipkg/ustl.control delete mode 100644 package/util-linux/ipkg/fdisk.control delete mode 100644 package/util-linux/ipkg/losetup.control delete mode 100644 package/util-linux/ipkg/swap-utils.control delete mode 100644 package/valgrind/ipkg/valgrind.control delete mode 100755 package/vgp/ipkg/vgp.control delete mode 100644 package/vilistextum/ipkg/vilistextum.control delete mode 100644 package/vim/ipkg/vim.control delete mode 100755 package/vnc-reflector/ipkg/vnc-reflector.control delete mode 100644 package/vnstat/ipkg/vnstat.control create mode 100644 package/vpnc/files/vpnc.conffiles delete mode 100644 package/vpnc/ipkg/vpnc.conffiles delete mode 100755 package/vpnc/ipkg/vpnc.control create mode 100644 package/vrrpd/files/vrrpd.postinst delete mode 100644 package/vrrpd/ipkg/vrrpd.control delete mode 100644 package/vrrpd/ipkg/vrrpd.postinst create mode 100644 package/vsftpd/files/vsftpd.conffiles create mode 100644 package/vsftpd/files/vsftpd.postinst delete mode 100644 package/vsftpd/ipkg/vsftpd.conffiles delete mode 100644 package/vsftpd/ipkg/vsftpd.control delete mode 100644 package/vsftpd/ipkg/vsftpd.postinst create mode 100644 package/vtun/files/vtun.conffiles delete mode 100644 package/vtun/ipkg/vtun.conffiles delete mode 100644 package/vtun/ipkg/vtun.control create mode 100644 package/watchdog/files/watchdog.conffiles create mode 100644 package/watchdog/files/watchdog.postinst delete mode 100644 package/watchdog/ipkg/watchdog.conffiles delete mode 100644 package/watchdog/ipkg/watchdog.control delete mode 100644 package/watchdog/ipkg/watchdog.postinst delete mode 100644 package/wccpd/ipkg/wccpd.control delete mode 100644 package/wdfs/ipkg/wdfs.control delete mode 100644 package/weechat/ipkg/weechat.control create mode 100644 package/wifidog/files/wifidog.conffiles create mode 100644 package/wifidog/files/wifidog.postinst delete mode 100644 package/wifidog/ipkg/wifidog.conffiles delete mode 100644 package/wifidog/ipkg/wifidog.control delete mode 100644 package/wifidog/ipkg/wifidog.postinst delete mode 100644 package/wireless-firmware/ipkg/wireless-firmware-rt61.control delete mode 100644 package/wireless-tools/ipkg/wireless-tools.control delete mode 100644 package/wol/ipkg/wol.control create mode 100644 package/wondershaper/files/wondershaper.conffiles create mode 100644 package/wondershaper/files/wondershaper.postinst delete mode 100644 package/wondershaper/ipkg/wondershaper.conffiles delete mode 100644 package/wondershaper/ipkg/wondershaper.control delete mode 100644 package/wondershaper/ipkg/wondershaper.postinst delete mode 100644 package/wpa_supplicant/ipkg/wpa-supplicant.control delete mode 100644 package/wput/ipkg/wput.control delete mode 100644 package/xcmiscproto/ipkg/xcmiscproto.control delete mode 100644 package/xfsprogs/ipkg/xfsprogs.control create mode 100644 package/xinetd/files/xinetd.conffiles create mode 100644 package/xinetd/files/xinetd.postinst delete mode 100644 package/xinetd/ipkg/xinetd.conffiles delete mode 100644 package/xinetd/ipkg/xinetd.control delete mode 100644 package/xinetd/ipkg/xinetd.postinst delete mode 100644 package/xorg-server/ipkg/xorg-server.control delete mode 100644 package/xtrans/ipkg/xtrans.control delete mode 100644 package/zlib/ipkg/zlib.control delete mode 100644 package/zsh/ipkg/zsh.control diff --git a/TODO b/TODO index 8be6be3..4c16d17 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,16 @@ +- rename radiusclient-ng -> freeradius-client +- squid package update +- 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 -- glibc 2.10 support - rescue initramfs image (more archs, generic kernel config ) - replace ibm x40 - usb boot via stick -- kernel 2.6.29.3 +- kernel 2.6.30 - bind isc 9.6.1 - asterisk 1.6 -- gcc 4.4.0 diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 128f3a5..386fbbe 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -3,7 +3,7 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -ifneq ($(strip ${MASTER_SITES}),) +ifneq ($(strip ${PKG_SITES}),) ifeq ($(strip ${DISTFILES}),) DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif diff --git a/mk/fetch.mk b/mk/fetch.mk index c4625cc..dc593be 100644 --- a/mk/fetch.mk +++ b/mk/fetch.mk @@ -69,7 +69,7 @@ $(1): fi; \ mkdir -p "$$$${fullname%%/$$$$filename}"; \ cd "$$$${fullname%%/$$$$filename}"; \ - for site in $${MASTER_SITES} $${MASTER_SITE_BACKUP}; do \ + for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \ : echo "$${FETCH_CMD} $$$$site$$$$filename"; \ rm -f "$$$$filename"; \ if $${FETCH_CMD} $$$$site$$$$filename; then \ diff --git a/mk/linux.mk b/mk/linux.mk index e9d17e2..c2b226b 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -7,5 +7,5 @@ PKG_NAME:= linux PKG_VERSION:= $(KERNEL_VERSION) PKG_RELEASE:= $(KERNEL_RELEASE) PKG_MD5SUM= $(KERNEL_MD5SUM) +PKG_SITES= ${MASTER_SITE_KERNEL:=kernel/v2.6/} DISTFILES= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -MASTER_SITES= ${MASTER_SITE_KERNEL:=kernel/v2.6/} diff --git a/mk/package.mk b/mk/package.mk index 03e07e2..b635d6a 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -106,9 +106,11 @@ build-all-ipkgs: ${_IPKGS_COOKIE} # there are some parameters to the PKG_template function # 1.) Config.in identifier ADK_PACKAGE_$(1) # 2.) name of the package, for single package mostly $(PKG_NAME) -# 3.) package version (upstream version) and package revision (adk revision), -# always $(PKG_VERSION)-$(PKG_REVISION) +# 3.) package version (upstream version) and package release (adk version), +# always $(PKG_VERSION)-$(PKG_RELEASE) # 4.) dependencies to other packages, $(PKG_DEPENDS) +# 5.) description for the package, $(PKG_DESCR) +# 6.) section of the package, $(PKG_SECTION) # # should be package format independent and modular in the future define PKG_template @@ -127,8 +129,11 @@ endif IDEPEND_$(1):= $$(strip $(4)) _ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control -ICONTROL_$(1)?= ipkg/$(2).control +ICONTROL_$(1)?= $(WRKDIR)/.$(2).control $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} + @echo "Package: $(2)" > $(WRKDIR)/.$(2).control + @echo "Section: $(6)" >> $(WRKDIR)/.$(2).control + @echo "Description: $(5)" >> $(WRKDIR)/.$(2).control ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH} @adeps='$$(strip $${IDEPEND_$(1)})'; if [[ -n $$$$adeps ]]; then \ comma=; \ @@ -146,7 +151,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} echo "Depends: $$$$deps" >>$${IDIR_$(1)}/CONTROL/control; \ fi @for file in conffiles preinst postinst prerm postrm; do \ - [ ! -f ./ipkg/$(2).$$$$file ] || cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \ + [ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \ done # FIXME: special case for device dependent base-files package ifneq ($(strip $${ICONTROL_ADDON_$(1)}),) @@ -157,6 +162,13 @@ $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE} ifeq ($(ADK_DEBUG),) $${RSTRIP} $${IDIR_$(1)} $(MAKE_TRACE) endif + @for file in $$$$(ls ./files/*.init 2>/dev/null); do \ + fname=$$$$(echo $$$$file| sed -e "s#.*/##" -e "s#.init##"); \ + check=$$$$(grep PKG $$$$file|cut -d ' ' -f 2); \ + if [ "$$$$check" == $(2) ];then \ + mkdir -p $$(IDIR_$(1))/etc/init.d && cp $$$$file $$(IDIR_$(1))/etc/init.d/$$$$fname; \ + fi; \ + done @cd $${IDIR_$(1)}; for script in etc/init.d/*; do \ [[ -e $$$$script ]] || continue; \ chmod 0755 "$$$$script"; \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 1f366ab..e1c7d2e 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -116,7 +116,7 @@ else @exit 1 endif ifneq ($(filter confprog,${INSTALL_STYLE}),) - for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \ + @for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \ [[ -e $$a ]] || continue; \ $(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \ done diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile index 039c790..993b9b1 100644 --- a/package/6tunnel/Makefile +++ b/package/6tunnel/Makefile @@ -9,12 +9,15 @@ PKG_NAME:= 6tunnel PKG_VERSION:= 0.11rc1 PKG_RELEASE:= 1 PKG_MD5SUM:= b325fa9d238e32195fbb3fc3646b0d28 -MASTER_SITES:= http://toxygen.net/6tunnel/ +PKG_DESCR:= IPv4/IPv6 tunnel proxy +PKG_SECTION:= net +PKG_SITES:= http://toxygen.net/6tunnel/ + WRKDIST= ${WRKDIR}/$(PKG_NAME)-0.11 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_path_STRIP=$(STRIP) \ diff --git a/package/6tunnel/ipkg/6tunnel.control b/package/6tunnel/ipkg/6tunnel.control deleted file mode 100644 index ea49785..0000000 --- a/package/6tunnel/ipkg/6tunnel.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: 6tunnel -Priority: optional -Section: net -Description: An IPv4/IPv6 tunnel proxy diff --git a/package/Config.in b/package/Config.in index 25badd5..d2d291b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -206,7 +206,8 @@ menu "IPv6" depends ADK_IPV6 source "package/6tunnel/Config.in" source "package/aiccu/Config.in" -source "package/dhcp6/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" @@ -231,7 +232,6 @@ source "package/ether-wake/Config.in" source "package/iproute2/Config.in" source "package/ipset/Config.in" source "package/iptables/Config.in" -source "package/iptables-snmp/Config.in" source "package/knock/Config.in" source "package/linux-atm/Config.in" source "package/macchanger/Config.in" @@ -339,7 +339,6 @@ source "package/chillispot/Config.in" source "package/hostapd/Config.in" source "package/iw/Config.in" #source "package/kismet/Config.in" -source "package/nocatsplash/Config.in" source "package/olsrd/Config.in" source "package/snort-wireless/Config.in" source "package/wifidog/Config.in" diff --git a/package/Depends.mk b/package/Depends.mk index 6d30f73..d361acb 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -36,7 +36,7 @@ endif davfs2-compile: libiconv-compile neon-compile dbus-compile: expat-compile deco-compile: ncurses-compile -dhcp6-compile: ncurses-compile +dhcpv6-compile: libnl-compile ncurses-compile digitemp-compile: libusb-compile dsniff-compile: libnids-compile openssl-compile libgdbm-compile elinks-compile: openssl-compile @@ -76,7 +76,6 @@ ifeq (${ADK_COMPILE_IPERF_WITH_UCLIBCXX},y) iperf-compile: uclibc++-compile endif ipsec-tools-compile: openssl-compile -iptables-snmp-compile: net-snmp-compile iptraf-compile: ncurses-compile irssi-compile: glib2-compile ncurses-compile iw-compile: libnl-compile @@ -151,7 +150,6 @@ ifeq (${ADK_COMPILE_NMAP_WITH_UCLIBCXX},y) nmap-compile: uclibc++-compile endif nmap-compile: pcre-compile libpcap-compile -nocatsplash-compile: glib-compile obexftp-compile: openobex-compile libiconv-compile opencdk-compile: libgcrypt-compile libgpg-error-compile zlib-compile openct-compile: libtool-compile libusb-compile diff --git a/package/Makefile b/package/Makefile index 512b6eb..f446268 100644 --- a/package/Makefile +++ b/package/Makefile @@ -66,7 +66,7 @@ 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_PACKAGE_DHCP6) += dhcp6 +package-$(ADK_COMPILE_DHCPV6) += dhcpv6 package-$(ADK_PACKAGE_DIGITEMP) += digitemp package-$(ADK_PACKAGE_DNSMASQ) += dnsmasq package-$(ADK_PACKAGE_DOSFSTOOLS) += dosfstools @@ -140,7 +140,6 @@ package-$(ADK_COMPILE_IPROUTE2) += iproute2 package-$(ADK_PACKAGE_IPSEC_TOOLS) += ipsec-tools package-$(ADK_PACKAGE_IPSET) += ipset package-$(ADK_COMPILE_IPTABLES) += iptables -package-$(ADK_PACKAGE_IPTABLES_SNMP) += iptables-snmp package-$(ADK_PACKAGE_IPTRAF) += iptraf package-$(ADK_PACKAGE_IRSSI) += irssi package-$(ADK_PACKAGE_IW) += iw @@ -259,7 +258,6 @@ package-$(ADK_PACKAGE_NETSTAT_NAT) += netstat-nat package-$(ADK_PACKAGE_NFS_UTILS) += nfs-utils package-$(ADK_PACKAGE_NFS_KERNEL_NFSD) += nfs-utils package-$(ADK_PACKAGE_NMAP) += nmap -package-$(ADK_PACKAGE_NOCATSPLASH) += nocatsplash package-$(ADK_PACKAGE_NTPCLIENT) += ntpclient package-$(ADK_PACKAGE_OBEXFTP) += obexftp package-$(ADK_PACKAGE_OLSRD) += olsrd @@ -346,7 +344,6 @@ package-$(ADK_PACKAGE_SSLTUNNEL) += ssltunnel package-$(ADK_PACKAGE_SSMTP) += ssmtp package-$(ADK_PACKAGE_STRACE) += strace package-$(ADK_PACKAGE_STRESS) += stress -package-$(ADK_PACKAGE_STRONGSWAN) += strongswan package-$(ADK_PACKAGE_SUBVERSION) += subversion package-$(ADK_PACKAGE_SWCONFIG) += swconfig package-$(ADK_PACKAGE_SYSLOG_NG) += syslog-ng @@ -412,7 +409,7 @@ package-$(ADK_PACKAGE_ZSH) += zsh # kernel addon packages package-$(ADK_PACKAGE_KMOD_EM28XX) += em28xx package-$(ADK_PACKAGE_KMOD_MAC80211) += mac80211 -package-$(ADK_PACKAGE_KMOD_FS_NTFS_3G) += ntfs-3g +package-$(ADK_PACKAGE_NTFS_3G) += ntfs-3g DOWNLOAD:=$(patsubst %,%-download,$(package-y) $(package-m)) COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 1f5d6b5..36a3900 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -9,15 +9,18 @@ PKG_NAME:= aiccu PKG_VERSION:= 20070115 PKG_RELEASE:= 7 PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350 +PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility +PKG_SECTION:= net +PKG_DEPENDS:= kmod-ipv6 libpthread +PKG_URL:= http://www.sixxs.net +PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/ -MASTER_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/ DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.gz - WRKDIST= ${WRKDIR}/$(PKG_NAME) include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TCFLAGS+= -D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \ -D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\" diff --git a/package/aiccu/files/aiccu.conffiles b/package/aiccu/files/aiccu.conffiles new file mode 100644 index 0000000..79c42f9 --- /dev/null +++ b/package/aiccu/files/aiccu.conffiles @@ -0,0 +1 @@ +/etc/aiccu.conf diff --git a/package/aiccu/files/aiccu.init b/package/aiccu/files/aiccu.init index e678664..dbec044 100644 --- a/package/aiccu/files/aiccu.init +++ b/package/aiccu/files/aiccu.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG aiccu +#INIT 60 . /etc/rc.conf case $1 in diff --git a/package/aiccu/files/aiccu.postinst b/package/aiccu/files/aiccu.postinst new file mode 100644 index 0000000..e6d0f0d --- /dev/null +++ b/package/aiccu/files/aiccu.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf aiccu aiccu NO diff --git a/package/aiccu/ipkg/aiccu.conffiles b/package/aiccu/ipkg/aiccu.conffiles deleted file mode 100644 index 79c42f9..0000000 --- a/package/aiccu/ipkg/aiccu.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/aiccu.conf diff --git a/package/aiccu/ipkg/aiccu.control b/package/aiccu/ipkg/aiccu.control deleted file mode 100644 index 98bc6f1..0000000 --- a/package/aiccu/ipkg/aiccu.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: aiccu -Priority: optional -Section: net -Depends: kmod-ipv6, libpthread -Description: SixXS Automatic IPv6 Connectivity Client Utility diff --git a/package/aiccu/ipkg/aiccu.postinst b/package/aiccu/ipkg/aiccu.postinst deleted file mode 100644 index e6d0f0d..0000000 --- a/package/aiccu/ipkg/aiccu.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf aiccu aiccu NO diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index 1e6a3c3..3d53df6 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= aircrack-ng PKG_VERSION:= 1.0-rc3 PKG_RELEASE:= 1 PKG_MD5SUM:= 37884de939af82eab60d3e7d165b40ad -MASTER_SITES:= http://download.aircrack-ng.org/ +PKG_DESCR:= set of tools for auditing wireless networks +PKG_SECTION:= net +PKG_DEPENDS:= libpthread libopenssl libpcap +PKG_URL:= http://www.aircrack-ng.org +PKG_SITES:= http://download.aircrack-ng.org/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/aircrack-ng/ipkg/aircrack-ng.control b/package/aircrack-ng/ipkg/aircrack-ng.control deleted file mode 100644 index 4e0ed40..0000000 --- a/package/aircrack-ng/ipkg/aircrack-ng.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: aircrack-ng -Priority: optional -Section: net -Depends: libpthread, libopenssl, libpcap -Description: A set of tools for auditing wireless networks diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index e57470e..4c82c64 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= alsa-lib PKG_VERSION:= 1.0.19 PKG_RELEASE:= 1 PKG_MD5SUM:= 73db3666c211e5fb023bb77450cf430d -MASTER_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/lib/ \ +PKG_DESCR:= ALSA sound library +PKG_SECTION:= libs +PKG_URL:= http://www.alsa-project.org +PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/lib/ \ ftp://ftp.alsa-project.org/pub/lib/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-python @@ -23,8 +27,7 @@ BUILD_STYLE= auto INSTALL_STYLE= auto confprog post-install: - ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib - ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/share/alsa + ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa ${CP} ${WRKINST}/usr/lib/libasound.so.* ${IDIR_ALSA_LIB}/usr/lib/ ${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/ diff --git a/package/alsa-lib/files/alsa-lib.postinst b/package/alsa-lib/files/alsa-lib.postinst new file mode 100644 index 0000000..8489592 --- /dev/null +++ b/package/alsa-lib/files/alsa-lib.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +gid=$(get_next_gid) +add_group audio $gid diff --git a/package/alsa-lib/ipkg/alsa-lib.control b/package/alsa-lib/ipkg/alsa-lib.control deleted file mode 100644 index 480bb0d..0000000 --- a/package/alsa-lib/ipkg/alsa-lib.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: alsa-lib -Priority: optional -Section: libs -Description: ALSA sound library diff --git a/package/alsa-lib/ipkg/alsa-lib.postinst b/package/alsa-lib/ipkg/alsa-lib.postinst deleted file mode 100644 index 8489592..0000000 --- a/package/alsa-lib/ipkg/alsa-lib.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group audio $gid diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 9471970..5434bc3 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= alsa-utils PKG_VERSION:= 1.0.19 PKG_RELEASE:= 2 PKG_MD5SUM:= 5ff0379c707c1a29083233edc9ab4e06 -MASTER_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ +PKG_DESCR:= ALSA mixer utility +PKG_SECTION:= libs +PKG_URL:= http://www.alsa-project.org +PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ ftp://ftp.alsa-project.org/pub/utils/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-alsamixer @@ -23,9 +27,7 @@ BUILD_STYLE= auto INSTALL_STYLE= auto post-install: - ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/etc/init.d - ${INSTALL_BIN} ./files/amixer.init ${IDIR_ALSA_UTILS}/etc/init.d/amixer - ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin + ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin ${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/alsa-utils/files/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst new file mode 100644 index 0000000..f18dbf6 --- /dev/null +++ b/package/alsa-utils/files/alsa-utils.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf amixer + diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init index 5d5aa6e..d7f3888 100644 --- a/package/alsa-utils/files/amixer.init +++ b/package/alsa-utils/files/amixer.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG alsa-utils +#INIT 60 . /etc/rc.conf case $1 in diff --git a/package/alsa-utils/ipkg/alsa-utils.control b/package/alsa-utils/ipkg/alsa-utils.control deleted file mode 100644 index 88e38c9..0000000 --- a/package/alsa-utils/ipkg/alsa-utils.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: alsa-utils -Priority: optional -Section: libs -Description: ALSA utilities diff --git a/package/alsa-utils/ipkg/alsa-utils.postinst b/package/alsa-utils/ipkg/alsa-utils.postinst deleted file mode 100644 index f18dbf6..0000000 --- a/package/alsa-utils/ipkg/alsa-utils.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf amixer - diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 8a3de3b..2404632 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= apr-util PKG_VERSION:= 0.9.15 PKG_RELEASE:= 1 PKG_MD5SUM:= dc772ae295f49ddb8ee8e69a9716c53b -MASTER_SITES:= http://apache.mirror.clusters.cc/apr/ +PKG_DESCR:= Apache Portable Runtime utility library +PKG_SECTION:= libs +PKG_DEPENDS:= libexpat apr +PKG_URL:= http://apr.apache.org +PKG_SITES:= http://apache.mirror.clusters.cc/apr/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,APR_UTIL,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-berkeley-db diff --git a/package/apr-util/ipkg/apr-util.control b/package/apr-util/ipkg/apr-util.control deleted file mode 100644 index 45af346..0000000 --- a/package/apr-util/ipkg/apr-util.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: apr-util -Priority: optional -Section: lib -Description: Apache Portable Runtime -Depends: libexpat, apr diff --git a/package/apr/Makefile b/package/apr/Makefile index 8dbddd9..bfe4f5b 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -9,11 +9,18 @@ PKG_NAME:= apr PKG_VERSION:= 0.9.17 PKG_RELEASE:= 1 PKG_MD5SUM:= ca1e22d98081a03a33c2a0b8684eb192 -MASTER_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ +PKG_DESCR:= Apache Portable Runtime library +PKG_SECTION:= libs +PKG_URL:= http://apr.apache.org +PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +ifeq (${ADK_PACKAGE_APR_THREADING},y) +PKG_DEPENDS:= libpthread +endif + +$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_setpgrp_void=no @@ -35,20 +42,13 @@ INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_APR}/usr/lib ${CP} ${WRKINST}/usr/lib/libapr-0.so* ${IDIR_APR}/usr/lib/ - ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build ${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/ - # we need to patch paths to get apr-util compiling - printf '%s\n%s\n%s\n%s\n%s\nwq\n' \ - '/^installbuilddir="/s##&${STAGING_DIR}/#' \ - '/^libdir="/s##&${STAGING_DIR}/#' \ - '/^datadir="/s##&${STAGING_DIR}/#' \ - '/^includedir="/s##&${STAGING_DIR}/#' \ - '/^bindir="/s##&${STAGING_DIR}/#' | \ - ed -s ${WRKINST}/usr/bin/apr-config -ifeq (${ADK_PACKAGE_APR_THREADING},y) - echo 'Depends: libpthread' >> ${IDIR_APR}/CONTROL/control -endif + $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config + $(SED) "s,\(^libdir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config + $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config + $(SED) "s,\(^includedir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config + $(SED) "s,\(^bindir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/apr/ipkg/apr.control b/package/apr/ipkg/apr.control deleted file mode 100644 index 8ea0e5e..0000000 --- a/package/apr/ipkg/apr.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: apr -Priority: optional -Section: lib -Description: Apache Portable Runtime diff --git a/package/arpd/Makefile b/package/arpd/Makefile index ecf7118..50c9243 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -9,12 +9,17 @@ PKG_NAME:= arpd PKG_VERSION:= 0.2 PKG_RELEASE:= 1 PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d -MASTER_SITES:= http://niels.xtdnet.nl/honeyd/ +PKG_DESCR:= Generates ARP responses for IP address ranges +PKG_SECTION:= net +PKG_DEPENDS:= libpcap libdnet libevent +PKG_URL:= http://niels.xtdnet.nl/honeyd/ +PKG_SITES:= http://niels.xtdnet.nl/honeyd/ + WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ARPD,arpd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-libdnet=${STAGING_DIR}/usr \ diff --git a/package/arpd/ipkg/arpd.control b/package/arpd/ipkg/arpd.control deleted file mode 100644 index 249263e..0000000 --- a/package/arpd/ipkg/arpd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: arpd -Priority: optional -Section: net -Depends: libpcap, libdnet, libevent -Description: Generates ARP responses for IP address ranges diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index 9519710..2c2c51c 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= arpwatch PKG_VERSION:= 2.1a15 PKG_RELEASE:= 1 PKG_MD5SUM:= cebfeb99c4a7c2a6cee2564770415fe7 -MASTER_SITES:= ftp://ftp.ee.lbl.gov/ +PKG_DESCR:= Ethernet monitor program for keeping track of ethernet/ip address pairings +PKG_SECTION:= net +PKG_DEPENDS:= libpcap +PKG_URL:= http://www-nrg.ee.lbl.gov +PKG_SITES:= ftp://ftp.ee.lbl.gov/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,ARPWATCH,arpwatch,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ARPWATCH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto @@ -23,8 +27,7 @@ MAKE_FLAGS+= ARPDIR=/etc/arpwatch \ LIBS="-L$(STAGING_DIR)/usr/lib -lpcap" do-install: - $(INSTALL_DIR) $(IDIR_ARPWATCH)/usr/sbin - $(INSTALL_DIR) $(IDIR_ARPWATCH)/etc/arpwatch + $(INSTALL_DIR) $(IDIR_ARPWATCH)/usr/sbin $(IDIR_ARPWATCH)/etc/arpwatch $(INSTALL_BIN) $(WRKBUILD)/arpwatch $(IDIR_ARPWATCH)/usr/sbin/ $(INSTALL_BIN) $(WRKBUILD)/arpsnmp $(IDIR_ARPWATCH)/usr/sbin/ $(INSTALL_DATA) $(WRKBUILD)/arp.dat $(IDIR_ARPWATCH)/etc/arpwatch/ diff --git a/package/arpwatch/files/arpwatch.conffiles b/package/arpwatch/files/arpwatch.conffiles new file mode 100644 index 0000000..9b9d8b3 --- /dev/null +++ b/package/arpwatch/files/arpwatch.conffiles @@ -0,0 +1 @@ +/etc/arpwatch/arp.dat diff --git a/package/arpwatch/ipkg/arpwatch.conffiles b/package/arpwatch/ipkg/arpwatch.conffiles deleted file mode 100644 index 9b9d8b3..0000000 --- a/package/arpwatch/ipkg/arpwatch.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/arpwatch/arp.dat diff --git a/package/arpwatch/ipkg/arpwatch.control b/package/arpwatch/ipkg/arpwatch.control deleted file mode 100644 index a720881..0000000 --- a/package/arpwatch/ipkg/arpwatch.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: arpwatch -Priority: optional -Section: net -Description: Ethernet monitor program for keeping track of ethernet/ip address pairings -Depends: libpcap diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index dcda8b7..f4b0b9f 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -9,21 +9,25 @@ PKG_NAME:= asterisk PKG_VERSION:= 1.4.24.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 2b74744350f420b3a94d5323c489426f -MASTER_SITES:= http://downloads.digium.com/pub/telephony/asterisk/releases/ +PKG_DESCR:= Open Source PBX +PKG_SECTION:= net +PKG_DEPENDS:= libncurses libpthread +PKG_URL:= http://www.asterisk.org +PKG_SITES:= http://downloads.digium.com/pub/telephony/asterisk/releases/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,ASTERISK,asterisk,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= @@ -166,8 +170,6 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ) ${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/ $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf - ${INSTALL_DIR} $(IDIR_ASTERISK)/etc/init.d - ${INSTALL_BIN} ./files/asterisk.init $(IDIR_ASTERISK)/etc/init.d/asterisk asterisk-pgsql-install: ${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/etc/asterisk @@ -187,7 +189,7 @@ asterisk-voicemail-install: ${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf ${CP} $(WRKBUILD)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ ${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ - install -d -m0755 $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds + ${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds $(CP) $(WRKBUILD)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/ asterisk-chan-mgcp-install: @@ -211,7 +213,7 @@ asterisk-chan-iax2-install: asterisk-codec-speex-install: ${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules - install -m0755 $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/ + ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/ asterisk-codec-gsm-install: ${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/ diff --git a/package/asterisk/files/asterisk-chan-bluetooth.conffiles b/package/asterisk/files/asterisk-chan-bluetooth.conffiles new file mode 100644 index 0000000..40a0852 --- /dev/null +++ b/package/asterisk/files/asterisk-chan-bluetooth.conffiles @@ -0,0 +1 @@ +/etc/asterisk/bluetooth.conf diff --git a/package/asterisk/files/asterisk-chan-h323.conffiles b/package/asterisk/files/asterisk-chan-h323.conffiles new file mode 100644 index 0000000..fc0858a --- /dev/null +++ b/package/asterisk/files/asterisk-chan-h323.conffiles @@ -0,0 +1 @@ +/etc/asterisk/h323.conf diff --git a/package/asterisk/files/asterisk-chan-iax2.conffiles b/package/asterisk/files/asterisk-chan-iax2.conffiles new file mode 100644 index 0000000..f46a873 --- /dev/null +++ b/package/asterisk/files/asterisk-chan-iax2.conffiles @@ -0,0 +1,2 @@ +/etc/asterisk/iax.conf +/etc/asterisk/iaxprov.conf diff --git a/package/asterisk/files/asterisk-chan-mgcp.conffiles b/package/asterisk/files/asterisk-chan-mgcp.conffiles new file mode 100644 index 0000000..40a81df --- /dev/null +++ b/package/asterisk/files/asterisk-chan-mgcp.conffiles @@ -0,0 +1 @@ +/etc/asterisk/mgcp.conf diff --git a/package/asterisk/files/asterisk-chan-skinny.conffiles b/package/asterisk/files/asterisk-chan-skinny.conffiles new file mode 100644 index 0000000..eaf9b6d --- /dev/null +++ b/package/asterisk/files/asterisk-chan-skinny.conffiles @@ -0,0 +1 @@ +/etc/asterisk/skinny.conf diff --git a/package/asterisk/files/asterisk-meetme.conffiles b/package/asterisk/files/asterisk-meetme.conffiles new file mode 100644 index 0000000..1caab1d --- /dev/null +++ b/package/asterisk/files/asterisk-meetme.conffiles @@ -0,0 +1 @@ +/etc/asterisk/meetme.conf diff --git a/package/asterisk/files/asterisk-pbx-dundi.conffiles b/package/asterisk/files/asterisk-pbx-dundi.conffiles new file mode 100644 index 0000000..ab116b5 --- /dev/null +++ b/package/asterisk/files/asterisk-pbx-dundi.conffiles @@ -0,0 +1 @@ +/etc/asterisk/dundi.conf diff --git a/package/asterisk/files/asterisk-pgsql.conffiles b/package/asterisk/files/asterisk-pgsql.conffiles new file mode 100644 index 0000000..8b5cffe --- /dev/null +++ b/package/asterisk/files/asterisk-pgsql.conffiles @@ -0,0 +1 @@ +/etc/asterisk/cdr_pgsql.conf diff --git a/package/asterisk/files/asterisk-voicemail.conffiles b/package/asterisk/files/asterisk-voicemail.conffiles new file mode 100644 index 0000000..1c80f05 --- /dev/null +++ b/package/asterisk/files/asterisk-voicemail.conffiles @@ -0,0 +1 @@ +/etc/asterisk/voicemail.conf diff --git a/package/asterisk/files/asterisk.conffiles b/package/asterisk/files/asterisk.conffiles new file mode 100644 index 0000000..5f805de --- /dev/null +++ b/package/asterisk/files/asterisk.conffiles @@ -0,0 +1,21 @@ +/etc/asterisk/asterisk.conf +/etc/asterisk/agents.conf +/etc/asterisk/alarmreceiver.conf +/etc/asterisk/cdr_manager.conf +/etc/asterisk/codecs.conf +/etc/asterisk/enum.conf +/etc/asterisk/extconfig.conf +/etc/asterisk/extensions.conf +/etc/asterisk/features.conf +/etc/asterisk/iax.conf +/etc/asterisk/iaxprov.conf +/etc/asterisk/indications.conf +/etc/asterisk/logger.conf +/etc/asterisk/manager.conf +/etc/asterisk/modules.conf +/etc/asterisk/musiconhold.conf +/etc/asterisk/osp.conf +/etc/asterisk/privacy.conf +/etc/asterisk/queues.conf +/etc/asterisk/rtp.conf +/etc/asterisk/sip.conf diff --git a/package/asterisk/files/asterisk.init b/package/asterisk/files/asterisk.init index fcbb526..01a4edd 100644 --- a/package/asterisk/files/asterisk.init +++ b/package/asterisk/files/asterisk.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG asterisk +#INIT 60 . /etc/rc.conf case $1 in diff --git a/package/asterisk/files/asterisk.postinst b/package/asterisk/files/asterisk.postinst new file mode 100644 index 0000000..1186b26 --- /dev/null +++ b/package/asterisk/files/asterisk.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf asterisk asterisk NO diff --git a/package/asterisk/ipkg/asterisk-chan-bluetooth.conffiles b/package/asterisk/ipkg/asterisk-chan-bluetooth.conffiles deleted file mode 100644 index 40a0852..0000000 --- a/package/asterisk/ipkg/asterisk-chan-bluetooth.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/asterisk/bluetooth.conf diff --git a/package/asterisk/ipkg/asterisk-chan-bluetooth.control b/package/asterisk/ipkg/asterisk-chan-bluetooth.control deleted file mode 100644 index c79d038..0000000 --- a/package/asterisk/ipkg/asterisk-chan-bluetooth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-chan-bluetooth -Priority: optional -Section: net -Description: Bluetooth HandsFreeProfile support for Asterisk -Depends: asterisk, bluez-libs diff --git a/package/asterisk/ipkg/asterisk-chan-h323.conffiles b/package/asterisk/ipkg/asterisk-chan-h323.conffiles deleted file mode 100644 index fc0858a..0000000 --- a/package/asterisk/ipkg/asterisk-chan-h323.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/asterisk/h323.conf diff --git a/package/asterisk/ipkg/asterisk-chan-h323.control b/package/asterisk/ipkg/asterisk-chan-h323.control deleted file mode 100644 index f3a18ba..0000000 --- a/package/asterisk/ipkg/asterisk-chan-h323.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-chan-h323 -Priority: optional -Section: net -Description: H.323 support for Asterisk -Depends: asterisk, libpthread, uclibc++ diff --git a/package/asterisk/ipkg/asterisk-chan-iax2.conffiles b/package/asterisk/ipkg/asterisk-chan-iax2.conffiles deleted file mode 100644 index f46a873..0000000 --- a/package/asterisk/ipkg/asterisk-chan-iax2.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/asterisk/iax.conf -/etc/asterisk/iaxprov.conf diff --git a/package/asterisk/ipkg/asterisk-chan-iax2.control b/package/asterisk/ipkg/asterisk-chan-iax2.control deleted file mode 100644 index 55f71f4..0000000 --- a/package/asterisk/ipkg/asterisk-chan-iax2.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-chan-iax2 -Priority: optional -Section: net -Description: Asterisk Channel for the Inter Asterisk Protocol -Depends: asterisk diff --git a/package/asterisk/ipkg/asterisk-chan-mgcp.conffiles b/package/asterisk/ipkg/asterisk-chan-mgcp.conffiles deleted file mode 100644 index 40a81df..0000000 --- a/package/asterisk/ipkg/asterisk-chan-mgcp.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/asterisk/mgcp.conf diff --git a/package/asterisk/ipkg/asterisk-chan-mgcp.control b/package/asterisk/ipkg/asterisk-chan-mgcp.control deleted file mode 100644 index 78ea3b6..0000000 --- a/package/asterisk/ipkg/asterisk-chan-mgcp.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-chan-mgcp -Priority: optional -Section: net -Description: a Media Gateway Control Protocol implementation for Asterisk -Depends: asterisk diff --git a/package/asterisk/ipkg/asterisk-chan-misdn.control b/package/asterisk/ipkg/asterisk-chan-misdn.control deleted file mode 100644 index bcc7f38..0000000 --- a/package/asterisk/ipkg/asterisk-chan-misdn.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-chan-misdn -Priority: optional -Section: net -Depends: asterisk -Description: Asterisk Channel for the mISDN ISDN systems diff --git a/package/asterisk/ipkg/asterisk-chan-skinny.conffiles b/package/asterisk/ipkg/asterisk-chan-skinny.conffiles deleted file mode 100644 index eaf9b6d..0000000 --- a/package/asterisk/ipkg/asterisk-chan-skinny.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/asterisk/skinny.conf diff --git a/package/asterisk/ipkg/asterisk-chan-skinny.control b/package/asterisk/ipkg/asterisk-chan-skinny.control deleted file mode 100644 index 3933e33..0000000 --- a/package/asterisk/ipkg/asterisk-chan-skinny.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-chan-skinny -Priority: optional -Section: net -Description: a Skinny Client Control Protocol implementation for Asterisk -Depends: asterisk diff --git a/package/asterisk/ipkg/asterisk-codec-gsm.control b/package/asterisk/ipkg/asterisk-codec-gsm.control deleted file mode 100644 index f26044d..0000000 --- a/package/asterisk/ipkg/asterisk-codec-gsm.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-codec-gsm -Priority: optional -Section: net -Description: a GSM Codec Translator for Asterisk -Depends: asterisk diff --git a/package/asterisk/ipkg/asterisk-codec-speex.control b/package/asterisk/ipkg/asterisk-codec-speex.control deleted file mode 100644 index 61eb088..0000000 --- a/package/asterisk/ipkg/asterisk-codec-speex.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-codec-speex -Priority: optional -Section: net -Description: a Speex/PCM16 Codec Translator for Asterisk -Depends: asterisk, libspeex diff --git a/package/asterisk/ipkg/asterisk-meetme.conffiles b/package/asterisk/ipkg/asterisk-meetme.conffiles deleted file mode 100644 index 1caab1d..0000000 --- a/package/asterisk/ipkg/asterisk-meetme.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/asterisk/meetme.conf diff --git a/package/asterisk/ipkg/asterisk-meetme.control b/package/asterisk/ipkg/asterisk-meetme.control deleted file mode 100644 index 8b031d2..0000000 --- a/package/asterisk/ipkg/asterisk-meetme.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-meetme -Priority: optional -Section: net -Description: MeetMe support files for asterisk -Depends: asterisk diff --git a/package/asterisk/ipkg/asterisk-pbx-dundi.conffiles b/package/asterisk/ipkg/asterisk-pbx-dundi.conffiles deleted file mode 100644 index ab116b5..0000000 --- a/package/asterisk/ipkg/asterisk-pbx-dundi.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/asterisk/dundi.conf diff --git a/package/asterisk/ipkg/asterisk-pbx-dundi.control b/package/asterisk/ipkg/asterisk-pbx-dundi.control deleted file mode 100644 index 6579e25..0000000 --- a/package/asterisk/ipkg/asterisk-pbx-dundi.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-pbx-dundi -Priority: optional -Section: net -Description: Distributed Universal Number Discovery (DUNDi) support for Asterisk -Depends: asterisk diff --git a/package/asterisk/ipkg/asterisk-pgsql.conffiles b/package/asterisk/ipkg/asterisk-pgsql.conffiles deleted file mode 100644 index 8b5cffe..0000000 --- a/package/asterisk/ipkg/asterisk-pgsql.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/asterisk/cdr_pgsql.conf diff --git a/package/asterisk/ipkg/asterisk-pgsql.control b/package/asterisk/ipkg/asterisk-pgsql.control deleted file mode 100644 index beece08..0000000 --- a/package/asterisk/ipkg/asterisk-pgsql.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-pgsql -Priority: optional -Section: net -Description: PostgreSQL modules for Asterisk -Depends: asterisk, libpq, zlib diff --git a/package/asterisk/ipkg/asterisk-res-agi.control b/package/asterisk/ipkg/asterisk-res-agi.control deleted file mode 100644 index 44f7170..0000000 --- a/package/asterisk/ipkg/asterisk-res-agi.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-res-agi -Priority: optional -Section: net -Description: Asterisk Gateway Interface module -Depends: asterisk diff --git a/package/asterisk/ipkg/asterisk-sounds.control b/package/asterisk/ipkg/asterisk-sounds.control deleted file mode 100644 index a63bbef..0000000 --- a/package/asterisk/ipkg/asterisk-sounds.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-sounds -Priority: optional -Section: net -Description: a sounds collection for Asterisk -Depends: asterisk diff --git a/package/asterisk/ipkg/asterisk-sqlite.control b/package/asterisk/ipkg/asterisk-sqlite.control deleted file mode 100644 index 3968dd1..0000000 --- a/package/asterisk/ipkg/asterisk-sqlite.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-sqlite -Priority: optional -Section: net -Description: SQLite modules for Asterisk -Depends: asterisk, libsqlite diff --git a/package/asterisk/ipkg/asterisk-voicemail.conffiles b/package/asterisk/ipkg/asterisk-voicemail.conffiles deleted file mode 100644 index 1c80f05..0000000 --- a/package/asterisk/ipkg/asterisk-voicemail.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/asterisk/voicemail.conf diff --git a/package/asterisk/ipkg/asterisk-voicemail.control b/package/asterisk/ipkg/asterisk-voicemail.control deleted file mode 100644 index c7b5131..0000000 --- a/package/asterisk/ipkg/asterisk-voicemail.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk-voicemail -Priority: optional -Section: net -Description: VoiceMail related modules for Asterisk -Depends: asterisk diff --git a/package/asterisk/ipkg/asterisk.conffiles b/package/asterisk/ipkg/asterisk.conffiles deleted file mode 100644 index 5f805de..0000000 --- a/package/asterisk/ipkg/asterisk.conffiles +++ /dev/null @@ -1,21 +0,0 @@ -/etc/asterisk/asterisk.conf -/etc/asterisk/agents.conf -/etc/asterisk/alarmreceiver.conf -/etc/asterisk/cdr_manager.conf -/etc/asterisk/codecs.conf -/etc/asterisk/enum.conf -/etc/asterisk/extconfig.conf -/etc/asterisk/extensions.conf -/etc/asterisk/features.conf -/etc/asterisk/iax.conf -/etc/asterisk/iaxprov.conf -/etc/asterisk/indications.conf -/etc/asterisk/logger.conf -/etc/asterisk/manager.conf -/etc/asterisk/modules.conf -/etc/asterisk/musiconhold.conf -/etc/asterisk/osp.conf -/etc/asterisk/privacy.conf -/etc/asterisk/queues.conf -/etc/asterisk/rtp.conf -/etc/asterisk/sip.conf diff --git a/package/asterisk/ipkg/asterisk.control b/package/asterisk/ipkg/asterisk.control deleted file mode 100644 index 13075d7..0000000 --- a/package/asterisk/ipkg/asterisk.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: asterisk -Priority: optional -Section: net -Depends: libncurses, libpthread -Description: An open source PBX diff --git a/package/asterisk/ipkg/asterisk.postinst b/package/asterisk/ipkg/asterisk.postinst deleted file mode 100644 index 1186b26..0000000 --- a/package/asterisk/ipkg/asterisk.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf asterisk asterisk NO diff --git a/package/atftp/Makefile b/package/atftp/Makefile index 5c71f73..ec903cd 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -9,12 +9,17 @@ PKG_NAME:= atftp PKG_VERSION:= 0.7 PKG_RELEASE:= 2 PKG_MD5SUM:= 3b27365772d918050b2251d98a9c7c82 -MASTER_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ +PKG_DESCR:= TFTP client +PKG_SECTION:= net +PKG_DEPENDS:= libreadline libncurses +PKG_URL:= http://freshmeat.net/projects/atftp +PKG_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ +PKG_DESCR_1:= TFTP server include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) MAKE_FLAGS+= CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline" CONFIGURE_STYLE= gnu diff --git a/package/atftp/ipkg/atftp.control b/package/atftp/ipkg/atftp.control deleted file mode 100644 index 83b1858..0000000 --- a/package/atftp/ipkg/atftp.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: atftp -Priority: optional -Section: net -Description: tftp client -Depends: libreadline, libncurses diff --git a/package/atftp/ipkg/atftpd.control b/package/atftp/ipkg/atftpd.control deleted file mode 100644 index 94f49f3..0000000 --- a/package/atftp/ipkg/atftpd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: atftpd -Priority: optional -Section: net -Description: tftp server -Depends: libreadline, libpcre diff --git a/package/autossh/Makefile b/package/autossh/Makefile index 97e18dd..f39bec8 100644 --- a/package/autossh/Makefile +++ b/package/autossh/Makefile @@ -6,26 +6,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:= autossh -PKG_VERSION:= 1.3 +PKG_VERSION:= 1.4b PKG_RELEASE:= 1 -PKG_MD5SUM:= 0e7ec62eeca5d1b197f3ef2d0f0d417f -MASTER_SITES:= http://www.harding.motd.ca/autossh/ +PKG_MD5SUM:= 8f9aa006f6f69e912d3c2f504622d6f7 +PKG_DESCR:= Automatically restart SSH sessions and tunnels +PKG_SECTION:= net +PKG_DEPENDS:= openssh-client +PKG_URL:= http://www.harding.motd.ca/autossh +PKG_SITES:= http://www.harding.motd.ca/autossh/ + DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tgz include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,AUTOSSH,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE))) - -TCFLAGS+= -Wall -DSSH_PATH=\\\"/usr/bin/ssh\\\"\ \ - -DVER=\\\"$(PKG_VERSION)\\\"\" -MAKE_FLAGS+= CC="$(TARGET_CC)" BINDIR=/usr/bin MANDIR=/usr/man -BUILD_STYLE= auto +$(eval $(call PKG_template,AUTOSSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -do-configure: - cp $(WRKBUILD)/Makefile.linux $(WRKBUILD)/Makefile +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto do-install: - echo $(CC) $(INSTALL_DIR) $(IDIR_AUTOSSH)/usr/bin $(INSTALL_BIN) $(WRKBUILD)/autossh $(IDIR_AUTOSSH)/usr/bin/ diff --git a/package/autossh/ipkg/autossh.control b/package/autossh/ipkg/autossh.control deleted file mode 100644 index 2916e38..0000000 --- a/package/autossh/ipkg/autossh.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: autossh -Priority: optional -Section: net -Depends: openssh-client -Description: Autossh client diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 3397dc1..83834b8 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -6,22 +6,26 @@ include ${TOPDIR}/rules.mk PKG_NAME:= avahi -PKG_VERSION:= 0.6.16 -PKG_RELEASE:= 6 -PKG_MD5SUM:= 3cbc460bbd55bae35f7b57443c063640 -MASTER_SITES:= http://avahi.org/download/ +PKG_VERSION:= 0.6.25 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e +PKG_DESCR:= mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon +PKG_SECTION:= net +PKG_DEPENDS:= libavahi libdaemon libexpat +PKG_URL:= http://avahi.org +PKG_SITES:= http://avahi.org/download/ +PKG_DEPENDS_1:= libavahi libdaemon avahi-daemon +PKG_DESCR_1:= Unicast DNS server from mDNS/DNS-SD configuration daemon +PKG_DESCR_2:= DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) library +PKG_SECTION_2:= libs include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2})) -TCFLAGS+= -DNDEBUG CONFIGURE_STYLE= gnu -CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - ac_cv_func_memcmp_working=yes CONFIGURE_ARGS+= --disable-glib \ --disable-qt3 \ --disable-qt4 \ @@ -50,8 +54,6 @@ CONFIGURE_ARGS+= --disable-glib \ --with-avahi-group=avahi BUILD_STYLE= auto INSTALL_STYLE= auto -#XXX maybe unneeded? -#XAKE_FLAGS+= PKG_CONFIG_PATH=${STAGING_DIR}/usr/lib/pkgconfig post-install: # avahi daemon @@ -62,9 +64,6 @@ post-install: ${IDIR_AVAHI_DAEMON}/etc/avahi/services/http.service ${INSTALL_DATA} ./files/service-ssh \ ${IDIR_AVAHI_DAEMON}/etc/avahi/services/ssh.service - ${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/init.d - ${INSTALL_BIN} ./files/avahi-daemon.init \ - ${IDIR_AVAHI_DAEMON}/etc/init.d/avahi-daemon ${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/usr/sbin ${CP} ${WRKINST}/usr/sbin/avahi-daemon ${IDIR_AVAHI_DAEMON}/usr/sbin/ # avahi dnsconfd diff --git a/package/avahi/files/avahi-daemon.conffiles b/package/avahi/files/avahi-daemon.conffiles new file mode 100644 index 0000000..46379ed --- /dev/null +++ b/package/avahi/files/avahi-daemon.conffiles @@ -0,0 +1,3 @@ +/etc/avahi/avahi-daemon.conf +/etc/avahi/services/http.service +/etc/avahi/services/ssh.service diff --git a/package/avahi/files/avahi-daemon.init b/package/avahi/files/avahi-daemon.init index 06d0863..79170b8 100644 --- a/package/avahi/files/avahi-daemon.init +++ b/package/avahi/files/avahi-daemon.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 75 +#PKG avahi-daemon +#INIT 75 . /etc/rc.conf case $1 in diff --git a/package/avahi/files/avahi-daemon.postinst b/package/avahi/files/avahi-daemon.postinst new file mode 100644 index 0000000..0e3e139 --- /dev/null +++ b/package/avahi/files/avahi-daemon.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +gid=$(get_next_gid) +add_group avahi $gid +add_user avahi $(get_next_uid) $gid /tmp +add_rcconf avahi avahi NO diff --git a/package/avahi/ipkg/avahi-daemon.conffiles b/package/avahi/ipkg/avahi-daemon.conffiles deleted file mode 100644 index 46379ed..0000000 --- a/package/avahi/ipkg/avahi-daemon.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/avahi/avahi-daemon.conf -/etc/avahi/services/http.service -/etc/avahi/services/ssh.service diff --git a/package/avahi/ipkg/avahi-daemon.control b/package/avahi/ipkg/avahi-daemon.control deleted file mode 100644 index f68a690..0000000 --- a/package/avahi/ipkg/avahi-daemon.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: avahi-daemon -Priority: optional -Section: net -Depends: libavahi, libdaemon, libexpat -Description: an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon) diff --git a/package/avahi/ipkg/avahi-daemon.postinst b/package/avahi/ipkg/avahi-daemon.postinst deleted file mode 100644 index 0e3e139..0000000 --- a/package/avahi/ipkg/avahi-daemon.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group avahi $gid -add_user avahi $(get_next_uid) $gid /tmp -add_rcconf avahi avahi NO diff --git a/package/avahi/ipkg/avahi-dnsconfd.control b/package/avahi/ipkg/avahi-dnsconfd.control deleted file mode 100644 index 1213a0e..0000000 --- a/package/avahi/ipkg/avahi-dnsconfd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: avahi-dnsconfd -Priority: optional -Section: net -Depends: libavahi, libdaemon, avahi-daemon -Description: an Unicast DNS server from mDNS/DNS-SD configuration daemon diff --git a/package/avahi/ipkg/libavahi.control b/package/avahi/ipkg/libavahi.control deleted file mode 100644 index 4912296..0000000 --- a/package/avahi/ipkg/libavahi.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libavahi -Priority: optional -Section: libs -Description: an DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) implementation (library) diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 530ef0b..7f4f760 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -6,17 +6,25 @@ include ${TOPDIR}/rules.mk PKG_NAME:= axtls -PKG_VERSION:= 1.1.0 -PKG_RELEASE:= 8 -PKG_MD5SUM:= 4a834edc93f46fdca4f9c93ec665376e +PKG_VERSION:= 1.2.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 03471b5a5874e2ce86025f24b3fa0958 +PKG_DESCR:= small embedded webserver +PKG_SECTION:= net +PKG_DEPENDS:= libaxtls +PKG_URL:= http://axtls.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/} + +PKG_DESCR_1:= small tls library +PKG_SECTION_1:= libs + DISTFILES:= axTLS-${PKG_VERSION}.tar.gz -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/} WRKDIST= ${WRKDIR}/axTLS include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,AXHTTPD,axhttpd,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1})) BUILD_STYLE= auto XAKE_FLAGS+= STRIP='' \ @@ -33,11 +41,8 @@ do-install: ${INSTALL_DIR} ${IDIR_LIBAXTLS}/usr/lib $(CP) $(WRKBUILD)/_stage/libaxtls.so.* $(IDIR_LIBAXTLS)/usr/lib/ # awhttpd server - ${INSTALL_DIR} ${IDIR_AXHTTPD}/etc/init.d ${INSTALL_DIR} ${IDIR_AXHTTPD}/www ${INSTALL_DIR} ${IDIR_AXHTTPD}/usr/sbin ${INSTALL_BIN} $(WRKBUILD)/_stage/axhttpd $(IDIR_AXHTTPD)/usr/sbin/ - $(INSTALL_BIN) ./files/axhttpd.init \ - $(IDIR_AXHTTPD)/etc/init.d/axhttpd include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/axtls/files/axhttpd.init b/package/axtls/files/axhttpd.init index 70ccc48..bc11e0b 100644 --- a/package/axtls/files/axhttpd.init +++ b/package/axtls/files/axhttpd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 80 +#PKG axhttpd +#INIT 80 . /etc/rc.conf case $1 in diff --git a/package/axtls/files/axhttpd.postinst b/package/axtls/files/axhttpd.postinst new file mode 100644 index 0000000..d19a62e --- /dev/null +++ b/package/axtls/files/axhttpd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf axhttpd diff --git a/package/axtls/files/config b/package/axtls/files/config index caa5dc3..ed4e648 100644 --- a/package/axtls/files/config +++ b/package/axtls/files/config @@ -4,7 +4,6 @@ HAVE_DOT_CONFIG=y CONFIG_PLATFORM_LINUX=y # CONFIG_PLATFORM_CYGWIN is not set -# CONFIG_PLATFORM_SOLARIS is not set # CONFIG_PLATFORM_WIN32 is not set # @@ -12,10 +11,9 @@ CONFIG_PLATFORM_LINUX=y # PREFIX="/usr" CONFIG_DEBUG=y -# CONFIG_VISUAL_STUDIO_6_0 is not set +# CONFIG_STRIP_UNWANTED_SECTIONS is not set # CONFIG_VISUAL_STUDIO_7_0 is not set # CONFIG_VISUAL_STUDIO_8_0 is not set -CONFIG_VISUAL_STUDIO_6_0_BASE="" CONFIG_VISUAL_STUDIO_7_0_BASE="" CONFIG_VISUAL_STUDIO_8_0_BASE="" CONFIG_EXTRA_CFLAGS_OPTIONS="" @@ -33,15 +31,23 @@ CONFIG_SSL_ENABLE_CLIENT=y CONFIG_SSL_PROT_MEDIUM=y # CONFIG_SSL_PROT_HIGH is not set CONFIG_SSL_USE_DEFAULT_KEY=y +CONFIG_SSL_PRIVATE_KEY_LOCATION="" +CONFIG_SSL_PRIVATE_KEY_PASSWORD="" +CONFIG_SSL_X509_CERT_LOCATION="" +# CONFIG_SSL_GENERATE_X509_CERT is not set +CONFIG_SSL_X509_COMMON_NAME="" +CONFIG_SSL_X509_ORGANIZATION_NAME="" +CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME="" CONFIG_SSL_ENABLE_V23_HANDSHAKE=y CONFIG_SSL_HAS_PEM=y CONFIG_SSL_USE_PKCS12=y CONFIG_SSL_EXPIRY_TIME=24 CONFIG_X509_MAX_CA_CERTS=4 CONFIG_SSL_MAX_CERTS=2 -# CONFIG_SSLCTX_MUTEXING is not set +# CONFIG_SSL_CTX_MUTEXING is not set CONFIG_USE_DEV_URANDOM=y # CONFIG_WIN32_USE_CRYPTO_LIB is not set +# CONFIG_OPENSSL_COMPATIBLE is not set # CONFIG_PERFORMANCE_TESTING is not set # CONFIG_SSL_TEST is not set CONFIG_AXHTTPD=y @@ -50,17 +56,26 @@ CONFIG_AXHTTPD=y # Axhttpd Configuration # # CONFIG_HTTP_STATIC_BUILD is not set +CONFIG_HTTP_PORT=80 CONFIG_HTTP_HTTPS_PORT=443 CONFIG_HTTP_SESSION_CACHE_SIZE=5 CONFIG_HTTP_WEBROOT="/www" -CONFIG_HTTP_PORT=80 CONFIG_HTTP_TIMEOUT=0 + +# +# CGI +# CONFIG_HTTP_HAS_CGI=y -CONFIG_HTTP_CGI_EXTENSION=".cgi" +CONFIG_HTTP_CGI_EXTENSIONS=".lua,.lp" +# CONFIG_HTTP_ENABLE_LUA is not set +CONFIG_HTTP_LUA_PREFIX="" +CONFIG_HTTP_LUA_CGI_LAUNCHER="" +# CONFIG_HTTP_BUILD_LUA is not set CONFIG_HTTP_DIRECTORIES=y -# CONFIG_HTTP_PERM_CHECK is not set +CONFIG_HTTP_HAS_AUTHORIZATION=y # CONFIG_HTTP_HAS_IPV6 is not set -CONFIG_HTTP_ALL_MIME_TYPES=y +CONFIG_HTTP_ENABLE_DIFFERENT_USER=y +CONFIG_HTTP_USER="axhttp" CONFIG_HTTP_VERBOSE=y CONFIG_HTTP_IS_DAEMON=y @@ -76,6 +91,8 @@ CONFIG_JAVA_HOME="" # CONFIG_PERL_BINDINGS is not set CONFIG_PERL_CORE="" CONFIG_PERL_LIB="" +# CONFIG_LUA_BINDINGS is not set +CONFIG_LUA_CORE="" # # Samples @@ -86,6 +103,7 @@ CONFIG_PERL_LIB="" # CONFIG_VBNET_SAMPLES is not set # CONFIG_JAVA_SAMPLES is not set # CONFIG_PERL_SAMPLES is not set +# CONFIG_LUA_SAMPLES is not set # # BigInt Options diff --git a/package/axtls/ipkg/axhttpd.control b/package/axtls/ipkg/axhttpd.control deleted file mode 100644 index e19f3fc..0000000 --- a/package/axtls/ipkg/axhttpd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: axhttpd -Priority: optional -Section: net -Depends: libaxtls -Description: small embedded webserver diff --git a/package/axtls/ipkg/axhttpd.postinst b/package/axtls/ipkg/axhttpd.postinst deleted file mode 100644 index d19a62e..0000000 --- a/package/axtls/ipkg/axhttpd.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf axhttpd diff --git a/package/axtls/ipkg/libaxtls.control b/package/axtls/ipkg/libaxtls.control deleted file mode 100644 index b9c9d4b..0000000 --- a/package/axtls/ipkg/libaxtls.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libaxtls -Priority: optional -Section: libs -Description: an embedded client/server TLSv1 SSL implementation -Depends: diff --git a/package/axtls/patches/patch-httpd_main_c b/package/axtls/patches/patch-httpd_main_c deleted file mode 100644 index b401780..0000000 --- a/package/axtls/patches/patch-httpd_main_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id$ ---- axTLS.orig/httpd/main.c 2007-01-31 22:35:53.000000000 +0100 -+++ axTLS/httpd/main.c 2007-02-10 12:15:20.000000000 +0100 -@@ -98,11 +98,12 @@ int main(int argc, char *argv[]) - WSADATA wsaData; - WSAStartup(wVersionRequested,&wsaData); - #else -- if (getuid() == 0) /* change our uid if we are root */ -- { -- setgid(32767); -- setuid(32767); -- } -+ /* we can't bind to port 80/443 if we are nobody ?! */ -+ //if (getuid() == 0) /* change our uid if we are root */ -+ //{ -+ // setgid(32767); -+ // setuid(32767); -+ //} - - signal(SIGQUIT, die); - signal(SIGPIPE, SIG_IGN); diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 6f503b2..62eebd4 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -9,6 +9,9 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 PKG_RELEASE:= 5 +PKG_DESCR:= basic filesystem structure and scripts +PKG_SECTION:= base + WRKDIST= ${WRKDIR}/base-files NO_DISTFILES:= 1 ifeq ($(CPU_ARCH),x86_64) @@ -22,18 +25,11 @@ ICONTROL_ADDON_BASE_FILES= "Package: base-files-${PKG_ID}" include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE})) +$(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) $(TOPDIR)/target/$(DEVICE)/files/* $(IDIR_BASE_FILES) - typeset -i REV; \ - if fgrep xml .svn/entries >/dev/null 2>&1; then \ - let REV="$$(sed -n '/revision=/s/^.*"\([0-9]*\)".*$$/\1/p' \ - .svn/entries)"; \ - else \ - let REV="$$(head -n 4 .svn/entries | tail -1)"; \ - fi; ${SED} 's,$$R,'$$REV,g $(IDIR_BASE_FILES)/etc/banner $(SED) 's,@TARGET@,$(DEVICE),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf echo /bin/sh >${IDIR_BASE_FILES}/etc/shells diff --git a/package/base-files/files/base-files.conffiles b/package/base-files/files/base-files.conffiles new file mode 100644 index 0000000..2495e2e --- /dev/null +++ b/package/base-files/files/base-files.conffiles @@ -0,0 +1,13 @@ +/etc/banner +/etc/group +/etc/hosts +/etc/ipkg.conf +/etc/modules +/etc/passwd +/etc/profile +/etc/protocols +/etc/sysctl.conf +/etc/network/interfaces +/etc/rc.conf +/etc/sysctl.conf +/etc/shadow diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index c81d7ea..f71e462 100644 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -1,5 +1,5 @@ #!/bin/sh -#FWINIT 10 +#INIT 10 [[ $1 = autostart ]] || exit 0 . /etc/functions.sh diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done index 018d52a..e5b655b 100644 --- a/package/base-files/files/etc/init.d/done +++ b/package/base-files/files/etc/init.d/done @@ -1,4 +1,4 @@ #!/bin/sh -#FWINIT 98 +#INIT 98 [[ $1 = autostart ]] && sysctl -p >&- exit 0 diff --git a/package/base-files/files/etc/init.d/rcK b/package/base-files/files/etc/init.d/rcK index 3cf210f..e94d1a2 100755 --- a/package/base-files/files/etc/init.d/rcK +++ b/package/base-files/files/etc/init.d/rcK @@ -4,7 +4,7 @@ busybox reboot -d 60 -f & # just in case… { [[ -f /proc/diag/led/power ]] && echo f >/proc/diag/led/power test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1 - grep '^#FWINIT ' /etc/init.d/* | \ + grep '^#INIT ' /etc/init.d/* | \ sort -rnk2 | \ while read line; do shebang=$(sed -n '1s/^#![ ]*//p' ${line%%:*}) diff --git a/package/base-files/files/etc/init.d/rcS b/package/base-files/files/etc/init.d/rcS index f9c47e4..fd56fee 100755 --- a/package/base-files/files/etc/init.d/rcS +++ b/package/base-files/files/etc/init.d/rcS @@ -1,7 +1,7 @@ #!/bin/sh export PATH=/bin:/sbin:/usr/bin:/usr/sbin { - grep '^#FWINIT ' /etc/init.d/* | \ + grep '^#INIT ' /etc/init.d/* | \ sort -nk2 | \ while read line; do /bin/sh ${line%%:*} autostart 2>&1 diff --git a/package/base-files/ipkg/base-files.conffiles b/package/base-files/ipkg/base-files.conffiles deleted file mode 100644 index 2495e2e..0000000 --- a/package/base-files/ipkg/base-files.conffiles +++ /dev/null @@ -1,13 +0,0 @@ -/etc/banner -/etc/group -/etc/hosts -/etc/ipkg.conf -/etc/modules -/etc/passwd -/etc/profile -/etc/protocols -/etc/sysctl.conf -/etc/network/interfaces -/etc/rc.conf -/etc/sysctl.conf -/etc/shadow diff --git a/package/base-files/ipkg/base-files.control b/package/base-files/ipkg/base-files.control deleted file mode 100644 index 00e2d77..0000000 --- a/package/base-files/ipkg/base-files.control +++ /dev/null @@ -1,3 +0,0 @@ -Priority: base -Section: base -Description: basic filesystem structure and scripts diff --git a/package/bash/Makefile b/package/bash/Makefile index 46a5eba..28f4c13 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= bash PKG_VERSION:= 4.0 PKG_RELEASE:= 1 PKG_MD5SUM:= a90a1b5a6db4838483f05438e05e8eb9 -MASTER_SITES:= http://ftp.gnu.org/gnu/bash/ +PKG_DESCR:= Bourne-Again SHell +PKG_SECTION:= shells +PKG_URL:= http://www.gnu.org/software/bash +PKG_SITES:= http://ftp.gnu.org/gnu/bash/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,BASH,bash,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,BASH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= LIBS_FOR_BUILD='' CONFIGURE_STYLE= gnu diff --git a/package/bash/ipkg/bash.control b/package/bash/ipkg/bash.control deleted file mode 100644 index 46acdcd..0000000 --- a/package/bash/ipkg/bash.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: bash -Priority: optional -Section: shells -Description: bash shell diff --git a/package/bc/Makefile b/package/bc/Makefile index 63f91c2..f70adad 100644 --- a/package/bc/Makefile +++ b/package/bc/Makefile @@ -9,12 +9,15 @@ PKG_NAME:= bc PKG_VERSION:= 1.06 PKG_RELEASE:= 1 PKG_MD5SUM:= d44b5dddebd8a7a7309aea6c36fda117 -MASTER_SITES:= http://ftp.gnu.org/pub/gnu/bc/ +PKG_DESCR:= An arbitrary precision calculator language +PKG_SECTION:= util +PKG_URL:= http://www.gnu.org/software/bc +PKG_SITES:= http://ftp.gnu.org/pub/gnu/bc/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/bc/ipkg/bc.control b/package/bc/ipkg/bc.control deleted file mode 100644 index e22ed5b..0000000 --- a/package/bc/ipkg/bc.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: bc -Priority: optional -Section: util -Description: An arbitrary precision calculator language diff --git a/package/bc/ipkg/dc.control b/package/bc/ipkg/dc.control deleted file mode 100644 index 1ef8525..0000000 --- a/package/bc/ipkg/dc.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dc -Priority: optional -Section: util -Description: An arbitrary precision calculator diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile index 6ee40f2..56700a4 100644 --- a/package/bigreqsproto/Makefile +++ b/package/bigreqsproto/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= bigreqsproto PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 PKG_MD5SUM:= d43f7faa2aac2f0206ea19f031494af1 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/bigreqsproto/ipkg/bigreqsproto.control b/package/bigreqsproto/ipkg/bigreqsproto.control deleted file mode 100644 index f5fa1d6..0000000 --- a/package/bigreqsproto/ipkg/bigreqsproto.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: bigreqsproto -Priority: optional -Section: x11 -Description: Xproto headers diff --git a/package/bind/Config.in b/package/bind/Config.in index b9eef00..1286057 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -8,21 +8,6 @@ config ADK_DUMMY_BIND tristate default n -config ADK_PACKAGE_BIND_TOOLS - prompt "bind-tools........................ Bind administration tools" - tristate - default n - depends ADK_DUMMY_BIND - select ADK_COMPILE_BIND - select ADK_PACKAGE_LIBBIND - help - dig, host, nsupdate, dnssec-keygen, dnssec-signzone, named-checkconf, - named-checkzone, rndc, rndc-confgen - - http://www.isc.org/sw/bind/ - - Depends: libopenssl - config ADK_PACKAGE_BIND_RNDC prompt "bind-rndc......................... Bind administration tools (rndc & rndc-confgen only)" tristate @@ -32,11 +17,8 @@ config ADK_PACKAGE_BIND_RNDC select ADK_PACKAGE_LIBBIND help rndc, rndc-confgen - http://www.isc.org/sw/bind/ - Depends: libopenssl - config ADK_PACKAGE_BIND_CHECK prompt "bind-check........................ Bind administration tools (named-checkconf & named-checkzone only)" tristate @@ -46,11 +28,8 @@ config ADK_PACKAGE_BIND_CHECK select ADK_PACKAGE_LIBBIND help named-checkconf, named-checkzone - http://www.isc.org/sw/bind/ - Depends: libopenssl - config ADK_PACKAGE_BIND_DNSSEC prompt "bind-dnssec....................... Bind administration tools (dnssec-keygen & dnssec-signzone only)" tristate @@ -60,11 +39,8 @@ config ADK_PACKAGE_BIND_DNSSEC select ADK_PACKAGE_LIBBIND help dnssec-keygen, dnssec-signzone - http://www.isc.org/sw/bind/ - Depends: libopenssl - config ADK_PACKAGE_BIND_HOST prompt "bind-host......................... A simple DNS client" tristate @@ -73,11 +49,9 @@ config ADK_PACKAGE_BIND_HOST select ADK_COMPILE_BIND select ADK_PACKAGE_LIBBIND help - host - + host utility. http://www.isc.org/sw/bind/ - Depends: libopenssl config ADK_PACKAGE_BIND_DIG prompt "bind-dig.......................... A DNS client" @@ -87,12 +61,9 @@ config ADK_PACKAGE_BIND_DIG select ADK_COMPILE_BIND select ADK_PACKAGE_LIBBIND help - dig - + dig utility. http://www.isc.org/sw/bind/ - Depends: libopenssl - config ADK_PACKAGE_BIND_CLIENT prompt "bind-client....................... A dynamic DNS client" @@ -103,11 +74,8 @@ config ADK_PACKAGE_BIND_CLIENT select ADK_PACKAGE_LIBBIND help A DNS dynamic client (nsupdate) - http://www.isc.org/sw/bind/ - Depends: libopenssl - config ADK_PACKAGE_BIND_SERVER prompt "bind-server....................... A DNS server" tristate @@ -117,12 +85,8 @@ config ADK_PACKAGE_BIND_SERVER select ADK_PACKAGE_LIBBIND help A DNS server (named) - http://www.isc.org/sw/bind/ - Depends: libopenssl - - config ADK_PACKAGE_LIBBIND prompt "libbind........................... Support library for the bind tools and dns server/client." tristate @@ -131,6 +95,3 @@ config ADK_PACKAGE_LIBBIND select ADK_COMPILE_BIND help http://www.isc.org/sw/bind/ - - Depends: libopenssl - diff --git a/package/bind/Makefile b/package/bind/Makefile index 6e66800..b527e13 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -9,19 +9,32 @@ PKG_NAME:= bind PKG_VERSION:= 9.4.1 PKG_RELEASE:= 4 PKG_MD5SUM:= 09b54d35036cb0423b2e618f21766285 -MASTER_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/ +PKG_DESCR:= popular DNS server +PKG_SECTION:= net +PKG_DEPENDS:= libopenssl libbind +PKG_URL:= https://www.isc.org/software/bind +PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/ + +PKG_DESCR_1:= dynamic dns client (nsupdate utility) +PKG_DESCR_2:= Support library for the bind tools and dns server/client +PKG_DESCR_3:= rndc & rndc-confgen utilities +PKG_DESCR_4:= named-checkconf & named-checkzone utilities +PKG_DESCR_5:= dnssec-keygen & dnssec-signzone utilities +PKG_DESCR_6:= host utility +PKG_DESCR_7:= dig utility + +PKG_SECTION_2:= libs include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,BIND_TOOLS,bind-tools,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2})) +$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_7},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" @@ -42,26 +55,12 @@ pre-build: post-install: # bind server ${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin - ${INSTALL_DIR} ${IDIR_BIND_SERVER}/etc/init.d ${INSTALL_BIN} ${WRKINST}/usr/sbin/named ${IDIR_BIND_SERVER}/usr/sbin/ ${CP} ./files/bind ${IDIR_BIND_SERVER}/etc - ${INSTALL_BIN} ./files/named.init \ - ${IDIR_BIND_SERVER}/etc/init.d/named find ${IDIR_BIND_SERVER}/etc/bind -name ".svn" | xargs rm -rf # nsupdate ${INSTALL_DIR} ${IDIR_BIND_CLIENT}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_CLIENT}/usr/bin/ - # bind all tools - ${INSTALL_DIR} ${IDIR_BIND_TOOLS}/usr/bin - ${INSTALL_DIR} ${IDIR_BIND_TOOLS}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_TOOLS}/usr/bin/ - ${INSTALL_BIN} ${WRKINST}/usr/bin/host ${IDIR_BIND_TOOLS}/usr/bin/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen ${IDIR_BIND_TOOLS}/usr/sbin/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone ${IDIR_BIND_TOOLS}/usr/sbin/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf ${IDIR_BIND_TOOLS}/usr/sbin/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone ${IDIR_BIND_TOOLS}/usr/sbin/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_TOOLS}/usr/sbin/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen ${IDIR_BIND_TOOLS}/usr/sbin/ # rndc ${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_RNDC}/usr/sbin/ @@ -82,11 +81,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.30 ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libdns.so.32 ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libisccc.so.30 ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libisccfg.so.30 ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/libisc.so.32 ${IDIR_LIBBIND}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/lib/liblwres.so.30 ${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/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bind/files/bind-server.conffiles b/package/bind/files/bind-server.conffiles new file mode 100644 index 0000000..c4cfe37 --- /dev/null +++ b/package/bind/files/bind-server.conffiles @@ -0,0 +1,6 @@ +/etc/bind/named.conf.example +/etc/bind/db.0 +/etc/bind/db.127 +/etc/bind/db.255 +/etc/bind/db.local +/etc/bind/db.root diff --git a/package/bind/files/bind-server.postinst b/package/bind/files/bind-server.postinst new file mode 100644 index 0000000..bca89fd --- /dev/null +++ b/package/bind/files/bind-server.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf named named NO diff --git a/package/bind/files/named.init b/package/bind/files/named.init index 1838eef..ce0c0ab 100644 --- a/package/bind/files/named.init +++ b/package/bind/files/named.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG bind-server +#INIT 60 . /etc/rc.conf case $1 in diff --git a/package/bind/ipkg/bind-check.control b/package/bind/ipkg/bind-check.control deleted file mode 100644 index ba90d82..0000000 --- a/package/bind/ipkg/bind-check.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bind-check -Priority: optional -Section: net -Description: named-checkconf & named-checkzone utilities -Depends: libopenssl libbind diff --git a/package/bind/ipkg/bind-client.control b/package/bind/ipkg/bind-client.control deleted file mode 100644 index fa20c18..0000000 --- a/package/bind/ipkg/bind-client.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bind-client -Priority: optional -Section: net -Description: dynamic dns client -Depends: libopenssl libbind diff --git a/package/bind/ipkg/bind-dig.control b/package/bind/ipkg/bind-dig.control deleted file mode 100644 index e91e300..0000000 --- a/package/bind/ipkg/bind-dig.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bind-dig -Priority: optional -Section: net -Description: dig utility -Depends: libopenssl libbind diff --git a/package/bind/ipkg/bind-dnssec.control b/package/bind/ipkg/bind-dnssec.control deleted file mode 100644 index c7c2136..0000000 --- a/package/bind/ipkg/bind-dnssec.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bind-dnssec -Priority: optional -Section: net -Description: dnssec-keygen & dnssec-signzone utilities -Depends: libopenssl libbind diff --git a/package/bind/ipkg/bind-host.control b/package/bind/ipkg/bind-host.control deleted file mode 100644 index 2044038..0000000 --- a/package/bind/ipkg/bind-host.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: bind-host -Priority: optional -Section: net -Description: host utility -Depends: libopenssl libbind - diff --git a/package/bind/ipkg/bind-rndc.control b/package/bind/ipkg/bind-rndc.control deleted file mode 100644 index a0eee7e..0000000 --- a/package/bind/ipkg/bind-rndc.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bind-rndc -Priority: optional -Section: net -Description: rndc & rndc-confgen utilities -Depends: libopenssl libbind diff --git a/package/bind/ipkg/bind-server.conffiles b/package/bind/ipkg/bind-server.conffiles deleted file mode 100644 index c4cfe37..0000000 --- a/package/bind/ipkg/bind-server.conffiles +++ /dev/null @@ -1,6 +0,0 @@ -/etc/bind/named.conf.example -/etc/bind/db.0 -/etc/bind/db.127 -/etc/bind/db.255 -/etc/bind/db.local -/etc/bind/db.root diff --git a/package/bind/ipkg/bind-server.control b/package/bind/ipkg/bind-server.control deleted file mode 100644 index 73b10d2..0000000 --- a/package/bind/ipkg/bind-server.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: bind-server -Priority: optional -Section: net -Description: popular dns server -Depends: libopenssl libbind -Conflicts: dnsmasq diff --git a/package/bind/ipkg/bind-server.postinst b/package/bind/ipkg/bind-server.postinst deleted file mode 100644 index bca89fd..0000000 --- a/package/bind/ipkg/bind-server.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf named named NO diff --git a/package/bind/ipkg/bind-tools.control b/package/bind/ipkg/bind-tools.control deleted file mode 100644 index 623d0a5..0000000 --- a/package/bind/ipkg/bind-tools.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bind-tools -Priority: optional -Section: net -Description: dig, host, nslookup, nsupdate, dnssec-keygen, dnssec-signzone, named-checkconf, named-checkzone, rndc, rndc-confgen -Depends: libopenssl libbind diff --git a/package/bind/ipkg/libbind.control b/package/bind/ipkg/libbind.control deleted file mode 100644 index 5b4e866..0000000 --- a/package/bind/ipkg/libbind.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libbind -Priority: optional -Section: libs -Description: Support library for the bind tools and dns server/client. diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 9409ab0..57b564d 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -5,9 +5,13 @@ include ${TOPDIR}/rules.mk include ${TOPDIR}/toolchain/binutils/Makefile.inc + +PKG_DESCR:= binary utilities (nm, objdump, ar, as, ..) +PKG_SECTION:= comp + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BINUTILS,binutils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-werror @@ -16,7 +20,7 @@ INSTALL_STYLE= auto post-patch: ${PREVENT_PATCH} ${PATCH} ${WRKDIST} \ - ${TOPDIR}/toolchain/binutils/${BINUTILS_VERSION} \*.patch + ${TOPDIR}/toolchain/binutils/patches \*.patch post-install: ${INSTALL_DIR} ${IDIR_BINUTILS}/usr/lib diff --git a/package/binutils/ipkg/binutils.control b/package/binutils/ipkg/binutils.control deleted file mode 100644 index bf98f26..0000000 --- a/package/binutils/ipkg/binutils.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: binutils -Priority: optional -Section: comp -Description: binary utilities diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 364c084..ea158d1 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -9,14 +9,18 @@ PKG_NAME:= bitlbee PKG_VERSION:= 1.2.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 2b1674d98804970809de3da3edf0bed2 -MASTER_SITES:= http://get.bitlbee.org/src/ \ +PKG_DESCR:= IRC gateway to IM chat networks +PKG_SECTION:= net +PKG_DEPENDS:= glib2 libopenssl libiconv +PKG_URL:= http://www.bitlbee.org +PKG_SITES:= http://get.bitlbee.org/src/ \ http://get.bitlbee.be/src/ \ http://get.us.bitlbee.org/src/ \ http://ftp.snt.utwente.nl/pub/software/bitlbee/src/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_IPV6),y) IPV6+= --ipv6=1 else @@ -57,12 +61,8 @@ post-configure: ${WRKBUILD}/Makefile.settings post-install: - ${INSTALL_DIR} ${IDIR_BITLBEE}/etc/bitlbee - ${INSTALL_DIR} ${IDIR_BITLBEE}/etc/init.d - ${INSTALL_DIR} ${IDIR_BITLBEE}/usr/sbin + ${INSTALL_DIR} ${IDIR_BITLBEE}/etc/bitlbee ${IDIR_BITLBEE}/usr/sbin ${INSTALL_DATA} ${WRKINST}/etc/bitlbee/* ${IDIR_BITLBEE}/etc/bitlbee ${INSTALL_BIN} ${WRKINST}/usr/sbin/bitlbee ${IDIR_BITLBEE}/usr/sbin - ${INSTALL_BIN} ./files/bitlbee.init \ - ${IDIR_BITLBEE}/etc/init.d/bitlbee include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bitlbee/files/bitlbee.conffiles b/package/bitlbee/files/bitlbee.conffiles new file mode 100644 index 0000000..2ccc958 --- /dev/null +++ b/package/bitlbee/files/bitlbee.conffiles @@ -0,0 +1,2 @@ +/etc/bitlbee/motd.txt +/etc/bitlbee/bitlbee.conf diff --git a/package/bitlbee/files/bitlbee.init b/package/bitlbee/files/bitlbee.init index 3ff950a..1ff40c7 100644 --- a/package/bitlbee/files/bitlbee.init +++ b/package/bitlbee/files/bitlbee.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 80 +#PKG bitlbee +#INIT 80 . /etc/rc.conf case $1 in diff --git a/package/bitlbee/files/bitlbee.postinst b/package/bitlbee/files/bitlbee.postinst new file mode 100644 index 0000000..a8e3b2e --- /dev/null +++ b/package/bitlbee/files/bitlbee.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf bitlbee diff --git a/package/bitlbee/ipkg/bitlbee.conffiles b/package/bitlbee/ipkg/bitlbee.conffiles deleted file mode 100644 index 2ccc958..0000000 --- a/package/bitlbee/ipkg/bitlbee.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/bitlbee/motd.txt -/etc/bitlbee/bitlbee.conf diff --git a/package/bitlbee/ipkg/bitlbee.control b/package/bitlbee/ipkg/bitlbee.control deleted file mode 100644 index 37ca895..0000000 --- a/package/bitlbee/ipkg/bitlbee.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bitlbee -Priority: optional -Section: net -Depends: glib2, libopenssl, libiconv -Description: IRC gateway to IM chat networks diff --git a/package/bitlbee/ipkg/bitlbee.postinst b/package/bitlbee/ipkg/bitlbee.postinst deleted file mode 100644 index a8e3b2e..0000000 --- a/package/bitlbee/ipkg/bitlbee.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf bitlbee diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index fd8c9d3..67c7723 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= bluez-firmware PKG_VERSION:= 1.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 1cc3cefad872e937e05de5a0a2b390dd -MASTER_SITES:= http://bluez.sourceforge.net/download/ +PKG_DESCR:= Bluez firmware for BCM2033 +PKG_SECTION:= bluetooth +PKG_DEPENDS:= kmod-bluetooth bluez-libs bluez-utils +PKG_URL:= http://www.bluez.org +PKG_SITES:= http://bluez.sourceforge.net/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --libdir=/lib diff --git a/package/bluez-firmware/ipkg/bluez-firmware.control b/package/bluez-firmware/ipkg/bluez-firmware.control deleted file mode 100644 index 4b5a794..0000000 --- a/package/bluez-firmware/ipkg/bluez-firmware.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bluez-firmware -Priority: optional -Section: bluetooth -Description: Bluez firmware for BCM2033 -Depends: kmod-bluetooth, bluez-libs, bluez-utils diff --git a/package/bluez/Makefile b/package/bluez/Makefile index ff067cf..4dd1467 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -6,14 +6,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bluez -PKG_VERSION:= 4.12 +PKG_VERSION:= 4.40 PKG_RELEASE:= 1 -PKG_MD5SUM:= e599d7f4ed7e022c85e485934f29a340 -MASTER_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} +PKG_MD5SUM:= a25fa37c97c309338649f6a5fd4cea76 +PKG_DESCR:= bluetooth libraries and applications +PKG_SECTION:= bluetooth +PKG_DEPENDS:= kmod-bluetooth +PKG_URL:= http://www.bluez.org +PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BLUEZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-tools \ @@ -40,8 +44,5 @@ post-install: ${IDIR_BLUEZ}/etc/bluetooth/ $(INSTALL_DATA) $(WRKINST)/etc/dbus-1/system.d/bluetooth.conf \ $(IDIR_BLUEZ)/etc/dbus-1/system.d - ${INSTALL_DIR} ${IDIR_BLUEZ}/etc/init.d - ${INSTALL_BIN} ./files/bluez.init \ - ${IDIR_BLUEZ}/etc/init.d/bluez include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bluez/files/bluez.init b/package/bluez/files/bluez.init index 20c128a..6a61d38 100644 --- a/package/bluez/files/bluez.init +++ b/package/bluez/files/bluez.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 90 +#PKG bluez +#INIT 90 . /etc/rc.conf case $1 in diff --git a/package/bluez/ipkg/bluez.control b/package/bluez/ipkg/bluez.control deleted file mode 100644 index 0b32376..0000000 --- a/package/bluez/ipkg/bluez.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bluez -Priority: optional -Section: net -Description: Bluez libs and apps -Depends: kmod-bluetooth diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index 5962fb3..1390a7a 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -5,36 +5,31 @@ include ${TOPDIR}/rules.mk -PKG_NAME:= bogofilter -PKG_VERSION:= 1.1.3 +PKG_NAME:= bogofilter +PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= a816f509324ccb9946a4d89fefe525e1 -MASTER_SITES:= http://ftp.debian.org/debian/pool/main/b/bogofilter/ -DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz +PKG_MD5SUM:= 4bbc9adc30d4f8e3a547f9be18a1cb74 +PKG_DESCR:= mail filter +PKG_SECTION:= mail +PKG_DEPENDS:= libdb libiconv +PKG_URL:= http://bogofilter.sourceforge.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bogofilter/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BOGOFILTER,bogofilter,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -CONFIGURE_ENV+= ac_cv_c_bigendian=no \ - ac_cv_sizeof_off_t=8 \ - ac_cv_sizeof_int=4 \ - ac_cv_sizeof_long=4 \ - LIBS="-liconv" +CONFIGURE_STYLE= autotool gnu +CONFIGURE_ENV+= LIBS="-liconv" CONFIGURE_ARGS+= --without-libsqlite3-prefix \ - --without-libqdbm-prefix \ - --with-included-gsl \ - --with-libdb-prefix=${STAGING_DIR}/usr \ - --disable-transactions -# --without-libdb-prefix + --without-libqdbm-prefix \ + --with-included-gsl \ + --with-libdb-prefix=${STAGING_DIR}/usr \ + --disable-transactions BUILD_STYLE= auto INSTALL_STYLE= auto -PKG_DEPENDS:= libdb libiconv - post-install: - echo 'Depends: ${PKG_DEPENDS}' >>${IDIR_BOGOFILTER}/CONTROL/control ${INSTALL_DIR} ${IDIR_BOGOFILTER}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/${PKG_NAME} ${IDIR_BOGOFILTER}/usr/bin/ ifeq (${ADK_PACKAGE_BOGOFILTER_BOGOUTIL},y) diff --git a/package/bogofilter/ipkg/bogofilter.control b/package/bogofilter/ipkg/bogofilter.control deleted file mode 100644 index ef205f2..0000000 --- a/package/bogofilter/ipkg/bogofilter.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: bogofilter -Priority: optional -Section: mail -Description: Mail filter diff --git a/package/bogofilter/patches/patch-config_in b/package/bogofilter/patches/patch-config_in deleted file mode 100644 index 11648db..0000000 --- a/package/bogofilter/patches/patch-config_in +++ /dev/null @@ -1,14 +0,0 @@ -$Id$ ---- bogofilter-1.1.3.orig/config.in 2006-12-03 05:17:24.000000000 +0100 -+++ bogofilter-1.1.3/config.in 2007-03-29 19:28:01.000000000 +0200 -@@ -51,10 +51,6 @@ - /* Have suitable db.h header */ - #undef HAVE_DB_H - --/* Define to 1 if you have the declaration of `db_create', and to 0 if you -- don't. */ --#undef HAVE_DECL_DB_CREATE -- - /* Define to 1 if you have the declaration of `getopt', and to 0 if you don't. - */ - #undef HAVE_DECL_GETOPT diff --git a/package/bogofilter/patches/patch-configure b/package/bogofilter/patches/patch-configure deleted file mode 100644 index 165de84..0000000 --- a/package/bogofilter/patches/patch-configure +++ /dev/null @@ -1,281 +0,0 @@ -$Id$ ---- bogofilter-1.1.3.orig/configure 2006-12-03 05:17:15.000000000 +0100 -+++ bogofilter-1.1.3/configure 2007-03-29 19:27:35.000000000 +0200 -@@ -13464,238 +13464,55 @@ echo "${ECHO_T}$LIBDB" >&6; } - - saveLIBS="$LIBS" - LIBS="$LIBS $LIBDB" -- { echo "$as_me:$LINENO: checking if a program can be linked against Berkeley DB and run" >&5 --echo $ECHO_N "checking if a program can be linked against Berkeley DB and run... $ECHO_C" >&6; } -- if test "$cross_compiling" = yes; then -- { { 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; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- -+# AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run) -+# AC_RUN_IFELSE( -+# AC_LANG_PROGRAM([[ - #ifdef HAVE_INTTYPES_H - #include - #endif - #include -+# ]], [[ -+#return 0; -+# ]]),, -+# [AC_MSG_RESULT(no) -+# AC_MSG_ERROR([Cannot run a program linked against libdb. -+#Did you adjust your library search path to include your libdb?])],) -+# AC_MSG_RESULT(yes) - --int --main () --{ -- --return 0; -- -- ; -- return 0; --} --_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --{ echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -- { { echo "$as_me:$LINENO: error: Cannot run a program linked against libdb. --Did you adjust your library search path to include your libdb?" >&5 --echo "$as_me: error: Cannot run a program linked against libdb. --Did you adjust your library search path to include your libdb?" >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -- -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- -- { echo "$as_me:$LINENO: checking if Berkeley DB header and library versions match" >&5 --echo $ECHO_N "checking if Berkeley DB header and library versions match... $ECHO_C" >&6; } -- rm -r -f bfadtestdir -- mkdir bfadtestdir -- if test "$cross_compiling" = yes; then -- { { 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; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- -- #include -- #include -+# dnl check if header and library of DB library match -+# dnl ignore if cross compiling -+# AC_MSG_CHECKING(if Berkeley DB header and library versions match) -+# rm -r -f bfadtestdir -+# mkdir bfadtestdir -+# AC_RUN_IFELSE( -+# AC_LANG_PROGRAM([[ -+# #include -+# #include - #ifdef HAVE_INTTYPES_H - #include - #endif -- #include -- --int --main () --{ -- -- int maj, min; -- (void)db_version(&maj, &min, 0); -- (void)fprintf(stderr, "headers: %d.%d, library: %d.%d\n", -- DB_VERSION_MAJOR, DB_VERSION_MINOR, maj, min); -- if (maj != DB_VERSION_MAJOR) exit(1); -- if (min != DB_VERSION_MINOR) exit(1); -- exit(0); -- -- ; -- return 0; --} --_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --{ echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -- { { echo "$as_me:$LINENO: error: db.h header file and db library version do not match." >&5 --echo "$as_me: error: db.h header file and db library version do not match." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -- -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- { echo "$as_me:$LINENO: checking whether db_create is declared" >&5 --echo $ECHO_N "checking whether db_create is declared... $ECHO_C" >&6; } --if test "${ac_cv_have_decl_db_create+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef HAVE_INTTYPES_H -+# #include -+# ]], [[ -+# int maj, min; -+# (void)db_version(&maj, &min, 0); -+# (void)fprintf(stderr, "headers: %d.%d, library: %d.%d\n", -+# DB_VERSION_MAJOR, DB_VERSION_MINOR, maj, min); -+# if (maj != DB_VERSION_MAJOR) exit(1); -+# if (min != DB_VERSION_MINOR) exit(1); -+# exit(0); -+# ]]),, -+# [AC_MSG_RESULT(no) -+# AC_MSG_ERROR(db.h header file and db library version do not match.)],) -+# AC_MSG_RESULT(yes) -+# AC_CHECK_DECLS(db_create,, -+# AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file. -+#Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. -+#You can download Berkeley DB 4.3.x from http://www.sleepycat.com/]]), -+# [[#ifdef HAVE_INTTYPES_H - #include - #endif --#include -- -- --int --main () --{ --#ifndef db_create -- (void) db_create; --#endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_have_decl_db_create=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_have_decl_db_create=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_db_create" >&5 --echo "${ECHO_T}$ac_cv_have_decl_db_create" >&6; } --if test $ac_cv_have_decl_db_create = yes; then -- --cat >>confdefs.h <<_ACEOF --#define HAVE_DECL_DB_CREATE 1 --_ACEOF -- -- --else -- cat >>confdefs.h <<_ACEOF --#define HAVE_DECL_DB_CREATE 0 --_ACEOF -- --{ { echo "$as_me:$LINENO: error: Can not locate a suitable Berkeley DB db.h header file. --Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. --You can download Berkeley DB 4.3.x from http://www.sleepycat.com/" >&5 --echo "$as_me: error: Can not locate a suitable Berkeley DB db.h header file. --Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. --You can download Berkeley DB 4.3.x from http://www.sleepycat.com/" >&2;} -- { (exit 1); exit 1; }; } --fi -- -- -+#include ]] -+# ) - { echo "$as_me:$LINENO: checking if Berkeley DB supports shared environments" >&5 - echo $ECHO_N "checking if Berkeley DB supports shared environments... $ECHO_C" >&6; } - if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then diff --git a/package/bogofilter/patches/patch-configure_ac b/package/bogofilter/patches/patch-configure_ac new file mode 100644 index 0000000..8d79ed5 --- /dev/null +++ b/package/bogofilter/patches/patch-configure_ac @@ -0,0 +1,53 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- bogofilter-1.2.0.orig/configure.ac 2009-02-21 21:41:43.000000000 +0100 ++++ bogofilter-1.2.0/configure.ac 2009-05-28 19:47:00.466710794 +0200 +@@ -550,49 +550,6 @@ Cannot link against libdb? Try these ste + AH_TEMPLATE([HAVE_DB_H], [Have suitable db.h header]) + AC_SUBST(LIBDB) + +- dnl check if run-time link works +- saveLIBS="$LIBS" +- LIBS="$LIBS $LIBDB" +- AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run) +- AC_RUN_IFELSE( +- AC_LANG_PROGRAM([[ +-#ifdef HAVE_INTTYPES_H +-#include +-#endif +-#include +- ]], [[ +-return 0; +- ]]),, +- [AC_MSG_RESULT(no) +- AC_MSG_ERROR([Cannot run a program linked against libdb. +-Did you adjust your library search path to include your libdb?])],) +- AC_MSG_RESULT(yes) +- +- dnl check if header and library of DB library match +- dnl ignore if cross compiling +- AC_MSG_CHECKING(if Berkeley DB header and library versions match) +- rm -r -f bfadtestdir +- mkdir bfadtestdir +- AC_RUN_IFELSE( +- AC_LANG_PROGRAM([[ +- #include +- #include +-#ifdef HAVE_INTTYPES_H +-#include +-#endif +- #include +- ]], [[ +- int maj, min; +- (void)db_version(&maj, &min, 0); +- (void)fprintf(stderr, "headers: %d.%d, library: %d.%d\n", +- DB_VERSION_MAJOR, DB_VERSION_MINOR, maj, min); +- if (maj != DB_VERSION_MAJOR) exit(1); +- if (min != DB_VERSION_MINOR) exit(1); +- exit(0); +- ]]),, +- [AC_MSG_RESULT(no) +- AC_MSG_ERROR(db.h header file and db library version do not match.)],) +- AC_MSG_RESULT(yes) + AC_CHECK_DECLS(db_create,, + AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file. + Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile index f636363..6fbda28 100644 --- a/package/bridge-utils/Makefile +++ b/package/bridge-utils/Makefile @@ -6,16 +6,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bridge-utils -PKG_VERSION:= 1.0.6 +PKG_VERSION:= 1.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9b7dc52656f5cbec846a7ba3299f73bd -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/} +PKG_MD5SUM:= 0182fcac3a2b307113bbec34e5f1c673 +PKG_DESCR:= Ethernet bridging tools +PKG_SECTION:= net +PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE= autoconf gnu CONFIGURE_ARGS+= --with-linux-headers=${LINUX_DIR} BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/bridge-utils/ipkg/bridge-utils.control b/package/bridge-utils/ipkg/bridge-utils.control deleted file mode 100644 index da38f85..0000000 --- a/package/bridge-utils/ipkg/bridge-utils.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: bridge-utils -Priority: optional -Section: net -Description: Ethernet bridging tools diff --git a/package/busybox/Makefile b/package/busybox/Makefile index e8edcd1..94f756c 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -9,14 +9,14 @@ PKG_NAME:= busybox PKG_VERSION:= 1.13.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 6f86b4aa466f4b492c9468ba9500976a -MASTER_SITES:= http://www.busybox.net/downloads/ +PKG_DESCR:= Core utilities for embedded Linux systems +PKG_SECTION:= base +PKG_URL:= http://www.busybox.net +PKG_SITES:= http://www.busybox.net/downloads/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE))) - -#rebuild: -# @rm $(WRKBUILD)/.configure_done +$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-configure: grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \ @@ -56,14 +56,5 @@ ifeq ($(DEBUG),1) $(IDIR_BUSYBOX)/bin/busybox endif $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/ - $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d/ - $(INSTALL_BIN) ./files/syslog.init \ - $(IDIR_BUSYBOX)/etc/init.d/syslog - $(INSTALL_BIN) ./files/network.init \ - $(IDIR_BUSYBOX)/etc/init.d/network - $(INSTALL_BIN) ./files/crond.init \ - $(IDIR_BUSYBOX)/etc/init.d/crond - ${INSTALL_BIN} files/inetd.init \ - ${IDIR_BUSYBOX}/etc/init.d/inetd include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst new file mode 100644 index 0000000..97e83b7 --- /dev/null +++ b/package/busybox/files/busybox.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf network network YES +add_rcconf crond crond NO +add_rcconf 'use "-C16" normally, "NO" to disable' syslogd_flags '-C16' +add_rcconf inetd diff --git a/package/busybox/files/crond.init b/package/busybox/files/crond.init index c0b9da9..208479c 100644 --- a/package/busybox/files/crond.init +++ b/package/busybox/files/crond.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG busybox +#INIT 60 . /etc/rc.conf case $1 in diff --git a/package/busybox/files/inetd.init b/package/busybox/files/inetd.init index ad0527e..ff041ae 100644 --- a/package/busybox/files/inetd.init +++ b/package/busybox/files/inetd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 41 +#PKG busybox +#INIT 41 . /etc/rc.conf case $1 in autostart) diff --git a/package/busybox/files/network.init b/package/busybox/files/network.init index 0f3d4ed..ee70efc 100644 --- a/package/busybox/files/network.init +++ b/package/busybox/files/network.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 40 +#PKG busybox +#INIT 40 . /etc/rc.conf case $1 in autostart) diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init index e062834..9552dfe 100644 --- a/package/busybox/files/syslog.init +++ b/package/busybox/files/syslog.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 05 +#PKG busybox +#INIT 05 . /etc/rc.conf case $1 in diff --git a/package/busybox/ipkg/busybox.control b/package/busybox/ipkg/busybox.control deleted file mode 100644 index e7fc84a..0000000 --- a/package/busybox/ipkg/busybox.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: busybox -Priority: optional -Section: net -Description: Core utilities for embedded Linux systems diff --git a/package/busybox/ipkg/busybox.postinst b/package/busybox/ipkg/busybox.postinst deleted file mode 100644 index 97e83b7..0000000 --- a/package/busybox/ipkg/busybox.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf network network YES -add_rcconf crond crond NO -add_rcconf 'use "-C16" normally, "NO" to disable' syslogd_flags '-C16' -add_rcconf inetd diff --git a/package/bwm/Makefile b/package/bwm/Makefile index ebd8de3..3a89726 100644 --- a/package/bwm/Makefile +++ b/package/bwm/Makefile @@ -9,13 +9,16 @@ PKG_NAME:= bwm PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 51021a036acb92d2bda0c0c0483f9552 +PKG_DESCR:= A very tiny bandwidth monitor +PKG_SECTION:= net +PKG_SITES:= http://ftp.debian.org/debian/pool/main/b/bwm/ + DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz -MASTER_SITES:= http://ftp.debian.org/debian/pool/main/b/bwm/ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.orig include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-build: ${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/bwm.c -o ${WRKBUILD}/bwm diff --git a/package/bwm/ipkg/bwm.control b/package/bwm/ipkg/bwm.control deleted file mode 100644 index 4851a2d..0000000 --- a/package/bwm/ipkg/bwm.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: bwm -Priority: optional -Section: net -Description: A very tiny bandwidth monitor diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile index ec6ee34..db4a582 100644 --- a/package/cbtt/Makefile +++ b/package/cbtt/Makefile @@ -9,14 +9,30 @@ PKG_NAME:= cbtt PKG_VERSION:= 20060211 PKG_RELEASE:= 1 PKG_MD5SUM:= 19abea2817c49ccc9438e9671c402984 +PKG_DESCR:= Bittorrent tracker +PKG_SECTION:= net +PKG_DEPENDS:= zlib +PKG_URL:= http://bnbtusermods.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bnbtusermods/} + +PKG_DESCR_1:= Bittorrent tracker with mysql support +PKG_DEPENDS_1:= ${PKG_DEPENDS} libmysqlclient + DISTFILES:= ${PKG_NAME}80-${PKG_VERSION}-src.tar.gz -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=bnbtusermods/} WRKDIST= ${WRKDIR}/${PKG_NAME}80-${PKG_VERSION}-src include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE})) +ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y) +PKG_DEPENDS+= uclibc++ +PKG_DEPENDS_1+= uclibc++ +else +PKG_DEPENDS+= libstdcxx +PKG_DEPENDS_1+= libstdcxx +endif + +$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) BUILD_STYLE= auto TLDFLAGS+= -shared -L. -L${STAGING_DIR}/usr/lib/mysql \ diff --git a/package/cbtt/ipkg/cbtt-mysql.control b/package/cbtt/ipkg/cbtt-mysql.control deleted file mode 100644 index ef8b52a..0000000 --- a/package/cbtt/ipkg/cbtt-mysql.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: cbtt-mysql -Priority: optional -Section: net -Depends: zlib, libmysqlclient, uclibc++ -Description: Bittorrent tracker with mysql support diff --git a/package/cbtt/ipkg/cbtt.control b/package/cbtt/ipkg/cbtt.control deleted file mode 100644 index bc8b844..0000000 --- a/package/cbtt/ipkg/cbtt.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: cbtt -Priority: optional -Section: net -Depends: zlib, uclibc++ -Description: Bittorrent tracker diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index d990791..4ab5c6e 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -8,12 +8,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.6 PKG_RELEASE:= 2 +PKG_DESCR:= compressed config filesystem +PKG_SECTION:= base + WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto diff --git a/package/cfgfs/ipkg/cfgfs.control b/package/cfgfs/ipkg/cfgfs.control deleted file mode 100644 index 8ae5a79..0000000 --- a/package/cfgfs/ipkg/cfgfs.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: cfgfs -Priority: optional -Section: base -Description: compressed config filesystem - diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile index 163aad5..6b7cd9e 100644 --- a/package/cgilib/Makefile +++ b/package/cgilib/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= cgilib PKG_VERSION:= 0.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 2c7053f58dfb06f7a80a112797ed7e86 -MASTER_SITES:= http://www.infodrom.org/projects/cgilib/download/ +PKG_DESCR:= Simple CGI Library +PKG_SECTION:= libs +PKG_URL:= http://www.infodrom.org/projects/cgilib +PKG_SITES:= http://www.infodrom.org/projects/cgilib/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CGILIB,cgilib,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,CGILIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE= auto diff --git a/package/cgilib/ipkg/cgilib.control b/package/cgilib/ipkg/cgilib.control deleted file mode 100644 index eeed8be..0000000 --- a/package/cgilib/ipkg/cgilib.control +++ /dev/null @@ -1,7 +0,0 @@ -Package: cgilib -Priority: optional -Section: libs -Description: Simple CGI Library. - This library provides a simple programming API to the Common Gateway - Interface (CGI). It features HTTP Redirect, provides read access to - FORM variables, sets HTTP Cookies and reads them. diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index 3672492..65db006 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -9,23 +9,24 @@ PKG_NAME:= chillispot PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 9d2597756af3fa14d7331b4a3651fc9b -MASTER_SITES= http://www.chillispot.info/download/ +PKG_DESCR:= Wireless LAN Access Point Controller +PKG_SECTION:= net +PKG_DEPENDS:= kmod-tun +PKG_URL:= http://www.chillispot.info +PKG_SITES= http://www.chillispot.info/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,CHILLISPOT,${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_CHILLISPOT}/etc/init.d ${INSTALL_DIR} ${IDIR_CHILLISPOT}/usr/sbin ${INSTALL_BIN} ./files/chilli.conf \ ${IDIR_CHILLISPOT}/etc/ - ${INSTALL_BIN} ./files/${PKG_NAME}.init \ - ${IDIR_CHILLISPOT}/etc/init.d/chilli ${INSTALL_BIN} ${WRKINST}/usr/sbin/chilli ${IDIR_CHILLISPOT}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/chillispot/files/chillispot.conffiles b/package/chillispot/files/chillispot.conffiles new file mode 100644 index 0000000..0848516 --- /dev/null +++ b/package/chillispot/files/chillispot.conffiles @@ -0,0 +1 @@ +/etc/chilli.conf diff --git a/package/chillispot/files/chillispot.init b/package/chillispot/files/chillispot.init index c2a6cd4..308668f 100644 --- a/package/chillispot/files/chillispot.init +++ b/package/chillispot/files/chillispot.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 70 +#PKG chillispot +#INIT 70 . /etc/rc.conf case $1 in diff --git a/package/chillispot/files/chillispot.postinst b/package/chillispot/files/chillispot.postinst new file mode 100644 index 0000000..20ad12d --- /dev/null +++ b/package/chillispot/files/chillispot.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf chillispot chillispot NO diff --git a/package/chillispot/ipkg/chillispot.conffiles b/package/chillispot/ipkg/chillispot.conffiles deleted file mode 100644 index 0848516..0000000 --- a/package/chillispot/ipkg/chillispot.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/chilli.conf diff --git a/package/chillispot/ipkg/chillispot.control b/package/chillispot/ipkg/chillispot.control deleted file mode 100644 index 0bb2bad..0000000 --- a/package/chillispot/ipkg/chillispot.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: chillispot -Priority: optional -Section: net -Depends: kmod-tun -Description: ChilliSpot is a Wireless LAN Access Point Controller. diff --git a/package/chillispot/ipkg/chillispot.postinst b/package/chillispot/ipkg/chillispot.postinst deleted file mode 100644 index 20ad12d..0000000 --- a/package/chillispot/ipkg/chillispot.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf chillispot chillispot NO diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 529e8cf..2f9529b 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -6,14 +6,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= collectd -PKG_VERSION:= 4.6.2 +PKG_VERSION:= 4.7.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9eee46a6330780d6e6b41155b159f4f9 -MASTER_SITES:= http://verplant.org/collectd/files/ +PKG_MD5SUM:= b077e3398bd6fac0e53e9df4794db264 +PKG_DESCR:= System statistics collection daemon +PKG_SECTION:= console +PKG_DEPENDS:= libpthread +PKG_URL:= http://collectd.org +PKG_SITES:= http://collectd.org/files/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,COLLECTD,collectd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,COLLECTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifneq (${ADK_PACKAGE_COLLECTD_CPU},y) DISABLE_CPU:=--disable-cpu @@ -43,9 +47,12 @@ CONFIGURE_ARGS+= --disable-apache \ --disable-email \ --disable-entropy \ --disable-exec \ + --disable-filecount \ + --disable-fscache \ --disable-hddtemp \ --disable-interface \ --disable-iptables \ + --disable-ipvs \ --disable-irq \ ${DISABLE_LOAD} \ --disable-mbmon \ @@ -53,6 +60,7 @@ CONFIGURE_ARGS+= --disable-apache \ ${DISABLE_MEMORY} \ --disable-multimeter \ --disable-mysql \ + --disable-openvpn \ --disable-postgresql \ --disable-powerdns \ --disable-network \ @@ -69,7 +77,11 @@ CONFIGURE_ARGS+= --disable-apache \ --disable-swap \ --disable-syslog \ --disable-tape \ + --disable-target_notification \ + --disable-target_replace \ + --disable-target_set \ --disable-teamspeak2 \ + --disable-ted \ --disable-thermal \ --disable-unixsock \ --disable-users \ @@ -83,11 +95,7 @@ BUILD_STYLE= auto INSTALL_STYLE= auto post-install: - ${INSTALL_DIR} ${IDIR_COLLECTD}/etc/init.d - ${INSTALL_DIR} ${IDIR_COLLECTD}/usr/sbin - ${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd - ${INSTALL_BIN} ./files/collectd.init \ - ${IDIR_COLLECTD}/etc/init.d/collectd + ${INSTALL_DIR} ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/usr/lib/collectd ${CP} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/ ${CP} ${WRKINST}/usr/lib/collectd/*.so ${IDIR_COLLECTD}/usr/lib/collectd/ diff --git a/package/collectd/files/collectd.init b/package/collectd/files/collectd.init index 7d4f70b..601dd53 100644 --- a/package/collectd/files/collectd.init +++ b/package/collectd/files/collectd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 75 +#PKG collectd +#INIT 75 . /etc/rc.conf case $1 in diff --git a/package/collectd/files/collectd.postinst b/package/collectd/files/collectd.postinst new file mode 100644 index 0000000..7e44161 --- /dev/null +++ b/package/collectd/files/collectd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf collectd collectd NO diff --git a/package/collectd/ipkg/collectd.control b/package/collectd/ipkg/collectd.control deleted file mode 100644 index 790e0fd..0000000 --- a/package/collectd/ipkg/collectd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: collectd -Priority: optional -Section: console -Description: System statistics collection daemon -Depends: libpthread diff --git a/package/collectd/ipkg/collectd.postinst b/package/collectd/ipkg/collectd.postinst deleted file mode 100644 index 7e44161..0000000 --- a/package/collectd/ipkg/collectd.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf collectd collectd NO diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in deleted file mode 100644 index d563de4..0000000 --- a/package/collectd/patches/patch-src_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- collectd-4.6.2.orig/src/Makefile.in 2009-03-18 11:56:40.000000000 +0100 -+++ collectd-4.6.2/src/Makefile.in 2009-05-09 16:28:02.000000000 +0200 -@@ -1340,7 +1340,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) \ - $(am__append_3) --@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror -+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall - AM_CPPFLAGS = -DPREFIX='"${prefix}"' \ - -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ - -DLOCALSTATEDIR='"${localstatedir}"' \ diff --git a/package/comgt/Makefile b/package/comgt/Makefile index d9cd54f..06ff87f 100644 --- a/package/comgt/Makefile +++ b/package/comgt/Makefile @@ -9,20 +9,23 @@ PKG_NAME:= comgt PKG_VERSION:= 0.32 PKG_RELEASE:= 1 PKG_MD5SUM:= db2452680c3d953631299e331daf49ef +PKG_DESCR:= Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool +PKG_SECTION:= console +PKG_URL:= http://sourceforge.net/projects/comgt +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=comgt/} + DISTFILES:= ${PKG_NAME}.${PKG_VERSION}.tgz -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=comgt/} WRKDIST= ${WRKDIR}/${PKG_NAME}.${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto ALL_TARGET= comgt do-install: - ${INSTALL_DIR} ${IDIR_COMGT}/usr/bin - ${INSTALL_DIR} ${IDIR_COMGT}/etc/comgt + ${INSTALL_DIR} ${IDIR_COMGT}/usr/bin ${IDIR_COMGT}/etc/comgt ${INSTALL_BIN} ${WRKBUILD}/comgt ${IDIR_COMGT}/usr/bin/comgt ${INSTALL_DATA} ./files/dial.comgt ${IDIR_COMGT}/etc/comgt/dial.comgt diff --git a/package/comgt/ipkg/comgt.control b/package/comgt/ipkg/comgt.control deleted file mode 100644 index fe2c1cd..0000000 --- a/package/comgt/ipkg/comgt.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: comgt -Priority: optional -Section: console -Description: Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile index 9438a34..e84953a 100644 --- a/package/compositeproto/Makefile +++ b/package/compositeproto/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= compositeproto PKG_VERSION:= 0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 33a79f6ba950bc5b41e077c951871bd5 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 18bf007..58c2c4c 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -9,12 +9,17 @@ PKG_NAME:= cryptsetup PKG_VERSION:= 1.0.6 PKG_RELEASE:= 1 PKG_MD5SUM:= 00d452eb7a76e39f5749545d48934a10 +PKG_DESCR:= LUKS cryptsetup tools +PKG_SECTION:= crypto +PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt +PKG_URL:= http://cryptsetup.googlecode.com +PKG_SITES:= http://cryptsetup.googlecode.com/files/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= http://cryptsetup.googlecode.com/files/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CRYPTSETUP,cryptsetup,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-static @@ -22,8 +27,7 @@ BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin - ${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/lib + ${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib ${CP} ${WRKINST}/usr/lib/libcryptsetup.so.* \ ${IDIR_CRYPTSETUP}/usr/lib ${INSTALL_BIN} ${WRKINST}/usr/sbin/cryptsetup \ diff --git a/package/cryptsetup/ipkg/cryptsetup.control b/package/cryptsetup/ipkg/cryptsetup.control deleted file mode 100644 index f23b5bf..0000000 --- a/package/cryptsetup/ipkg/cryptsetup.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: cryptsetup -Priority: optional -Section: crypto -Depends: libgcrypt, device-mapper, libuuid, libpopt -Description: LUKS cryptsetup tools diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index c9cf607..44436bb 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -9,17 +9,22 @@ PKG_NAME:= ctorrent PKG_VERSION:= 1.3.4-dnh2 PKG_RELEASE:= 2 PKG_MD5SUM:= 6635e2d0d0ee21faeb85d95cd93c137b -MASTER_SITES:= http://www.rahul.net/dholmes/ctorrent/ +PKG_DESCR:= console-based BitTorrent client +PKG_SECTION:= net +PKG_URL:= http://www.rahul.net/dholmes/ctorrent +PKG_SITES:= http://www.rahul.net/dholmes/ctorrent/ + WRKDIST= ${WRKDIR}/${PKG_NAME}-dnh2 + ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) -PKG_DEPEND:= uclibc++ +PKG_DEPENDS:= uclibc++ else -PKG_DEPEND:= libstdcxx +PKG_DEPENDS:= libstdcxx endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND})) +$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ diff --git a/package/ctorrent/ipkg/ctorrent.control b/package/ctorrent/ipkg/ctorrent.control deleted file mode 100644 index 0b7d1d5..0000000 --- a/package/ctorrent/ipkg/ctorrent.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ctorrent -Priority: optional -Section: net -Description: console-based BitTorrent client diff --git a/package/cups/Makefile b/package/cups/Makefile index 9bb75ff..d17d58c 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -9,13 +9,18 @@ PKG_NAME:= cups PKG_VERSION:= 1.3.10 PKG_RELEASE:= 1 PKG_MD5SUM:= 84fffe96b8537c81a463faccead80026 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2 -MASTER_SITES:= http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${PKG_VERSION}/ \ +PKG_DESCR:= Common Unix Printing System +PKG_SECTION:= net +PKG_DEPENDS:= zlib libpthread +PKG_URL:= http://www.cups.org +PKG_SITES:= http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${PKG_VERSION}/ \ ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2 + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_func_sigset=no \ @@ -43,7 +48,6 @@ FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" XAKE_FLAGS+= OPTIM='' post-install: - ${INSTALL_DIR} ${IDIR_CUPS}/etc/init.d ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin ${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin @@ -71,7 +75,5 @@ post-install: ${IDIR_CUPS}/usr/share/cups/templates/ ${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/ ${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/ - ${INSTALL_BIN} ./files/cupsd.init \ - ${IDIR_CUPS}/etc/init.d/cupsd include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cups/files/cups.conffiles b/package/cups/files/cups.conffiles new file mode 100644 index 0000000..bed6faa --- /dev/null +++ b/package/cups/files/cups.conffiles @@ -0,0 +1,4 @@ +/etc/cups/classes.conf +/etc/cups/client.conf +/etc/cups/cupsd.conf +/etc/cups/printers.conf diff --git a/package/cups/files/cups.postinst b/package/cups/files/cups.postinst new file mode 100644 index 0000000..fa191be --- /dev/null +++ b/package/cups/files/cups.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +gid=$(get_next_gid) +add_user cups $(get_next_uid) $gid /tmp +add_group cups $gid +add_rcconf cups cups NO diff --git a/package/cups/files/cupsd.init b/package/cups/files/cupsd.init index d22f55c..03be330 100644 --- a/package/cups/files/cupsd.init +++ b/package/cups/files/cupsd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG cups +#INIT 60 . /etc/rc.conf case $1 in diff --git a/package/cups/ipkg/cups.conffiles b/package/cups/ipkg/cups.conffiles deleted file mode 100644 index bed6faa..0000000 --- a/package/cups/ipkg/cups.conffiles +++ /dev/null @@ -1,4 +0,0 @@ -/etc/cups/classes.conf -/etc/cups/client.conf -/etc/cups/cupsd.conf -/etc/cups/printers.conf diff --git a/package/cups/ipkg/cups.control b/package/cups/ipkg/cups.control deleted file mode 100644 index de3d142..0000000 --- a/package/cups/ipkg/cups.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: cups -Priority: optional -Section: net -Depends: zlib, libpthread -Description: Common Unix Printing System diff --git a/package/cups/ipkg/cups.postinst b/package/cups/ipkg/cups.postinst deleted file mode 100644 index fa191be..0000000 --- a/package/cups/ipkg/cups.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_user cups $(get_next_uid) $gid /tmp -add_group cups $gid -add_rcconf cups cups NO diff --git a/package/curl/Makefile b/package/curl/Makefile index 192a3f2..82e07c8 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -9,7 +9,10 @@ PKG_NAME:= curl PKG_VERSION:= 7.19.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 35f51ac7bcff689b2d2d6e38a3c4d1ae -MASTER_SITES:= http://curl.haxx.se/download/ \ +PKG_DESCR:= a client-side URL transfer tool +PKG_SECTION:= net +PKG_URL:= http://curl.haxx.se +PKG_SITES:= http://curl.haxx.se/download/ \ http://www.mirrorspace.org/curl/ \ http://curl.mirror.internet.tp/download/ \ ftp://ftp.sunet.se/pub/www/utilities/curl/ \ @@ -17,12 +20,17 @@ MASTER_SITES:= http://curl.haxx.se/download/ \ http://www.mirrormonster.com/curl/download/ \ http://curl.mirrors.cyberservers.net/download/ +PKG_DESCR_1:= a client-side URL transfer library +PKG_SECTION_1:= libs +PKG_DEPENDS_1:= libopenssl zlib + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1})) CONFIGURE_STYLE= gnu +CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t CONFIGURE_ARGS+= --disable-thread \ --enable-cookies \ --enable-crypto-auth \ @@ -47,9 +55,8 @@ BUILD_STYLE= auto INSTALL_STYLE= auto post-install: - ${INSTALL_DIR} ${IDIR_CURL}/usr/bin + ${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib ${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/ - ${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib ${CP} ${WRKINST}/usr/lib/libcurl.so.* ${IDIR_LIBCURL}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/curl/ipkg/curl.control b/package/curl/ipkg/curl.control deleted file mode 100644 index 2678e04..0000000 --- a/package/curl/ipkg/curl.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: curl -Priority: optional -Section: net -Description: a client-side URL transfer tool -Depends: libcurl diff --git a/package/curl/ipkg/libcurl.control b/package/curl/ipkg/libcurl.control deleted file mode 100644 index 435a319..0000000 --- a/package/curl/ipkg/libcurl.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libcurl -Priority: optional -Section: libs -Description: a client-side URL transfer library -Depends: libopenssl, zlib diff --git a/package/cutter/Makefile b/package/cutter/Makefile index e83cc41..79660c0 100755 --- a/package/cutter/Makefile +++ b/package/cutter/Makefile @@ -9,15 +9,19 @@ PKG_NAME:= cutter PKG_VERSION:= 1.03 PKG_RELEASE:= 1 PKG_MD5SUM:= 50093db9b64277643969ee75b83ebbd1 +PKG_DESCR:= Abort TCP/IP connections routed over a firewall +PKG_SECTION:= net +PKG_URL:= http://www.lowth.com/cutter/software/ +PKG_SITES:= http://www.lowth.com/cutter/software/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz -MASTER_SITES:= http://www.lowth.com/cutter/software/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-build: - ${TARGET_CC} ${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter + ${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter do-install: ${INSTALL_DIR} ${IDIR_CUTTER}/usr/sbin diff --git a/package/cutter/ipkg/cutter.control b/package/cutter/ipkg/cutter.control deleted file mode 100644 index 6c91692..0000000 --- a/package/cutter/ipkg/cutter.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: cutter -Architecture: mipsel -Section: net -Description: "Cutter" is an open source program that allows Linux firewall administrators to abort TCP/IP connections routed over the firewall or router on which it is run. -Priority: optional diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 8458b77..392581c 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -9,19 +9,27 @@ PKG_NAME:= cxxtools PKG_VERSION:= 1.4.8 PKG_RELEASE:= 1 PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af -MASTER_SITES:= http://www.tntnet.org/download/ +PKG_DESCR:= a collection of general-purpose C++ classes +PKG_SECTION:= net +PKG_DEPENDS:= libiconv +PKG_URL:= http://www.tntnet.org +PKG_SITES:= http://www.tntnet.org/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE})) +ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) +PKG_DEPENDS+= uclibc++ +else +PKG_DEPENDS+= libstdcxx +endif + +$(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) TCXXFLAGS+= -fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs -DEPENDS= "libgcc, uclibc++, libiconv" else TLDFLAGS+= -liconv -shared -DEPENDS= "libgcc, libiconv, libstdcxx" endif CONFIGURE_STYLE:= gnu @@ -39,6 +47,5 @@ endif post-install: ${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib ${CP} ${WRKINST}/usr/lib/libcxxtools.so.* ${IDIR_CXXTOOLS}/usr/lib/ - echo Depends: ${DEPENDS} >>${IDIR_CXXTOOLS}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cxxtools/ipkg/cxxtools.control b/package/cxxtools/ipkg/cxxtools.control deleted file mode 100644 index 1302362..0000000 --- a/package/cxxtools/ipkg/cxxtools.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: cxxtools -Priority: optional -Section: net -Description: cxxtools diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index 64322c7..bce77f2 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= cyrus-sasl PKG_VERSION:= 2.1.22 PKG_RELEASE:= 1 PKG_MD5SUM:= 45dde9d19193ae9dd388eb68b2027bc9 -MASTER_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/ +PKG_DESCR:= a general purpose authentication library +PKG_SECTION:= libs +PKG_URL:= http://asg.web.cmu.edu/sasl +PKG_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-sample \ diff --git a/package/cyrus-sasl/ipkg/libsasl2.control b/package/cyrus-sasl/ipkg/libsasl2.control deleted file mode 100644 index 82e0f0a..0000000 --- a/package/cyrus-sasl/ipkg/libsasl2.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libsasl2 -Priority: optional -Section: libs -Description: a general purpose authentication library diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile index 6b7f45e..4ffd21e 100644 --- a/package/damageproto/Makefile +++ b/package/damageproto/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= damageproto PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= bce4477a6edd774dfca175ea46e1ba76 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index 4e90b1a..d84ae0f 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -9,11 +9,22 @@ PKG_NAME= davfs2 PKG_VERSION= 1.3.3 PKG_RELEASE= 1 PKG_MD5SUM= 57def26e4d6d63527e01612d10fd0515 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} +PKG_DESCR:= WebDAV filesystem +PKG_SECTION:= admin +PKG_URL:= http://savannah.nongnu.org/projects/davfs2 +PKG_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE})) +ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) +PKG_DEPENDS:= fuse-utils, kmod-fuse, libfuse, libiconv, neon +else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y) +PKG_DEPENDS:= kmod-fs-coda, libiconv, neon +else +PKG_DEPENDS:= kmod-fs-coda, fuse-utils, kmod-fuse, libfuse, libiconv, neon +endif + +$(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-neon @@ -21,14 +32,6 @@ CONFIGURE_ENV+= LIBS=-liconv BUILD_STYLE= auto INSTALL_STYLE= auto -ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) -DEPS= fuse-utils, kmod-fuse, libfuse, libiconv, neon -else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y) -DEPS= kmod-fs-coda, libiconv, neon -else -DEPS= kmod-fs-coda, fuse-utils, kmod-fuse, libfuse, libiconv, neon -endif - post-install: ${INSTALL_DIR} ${IDIR_DAVFS2}/etc/davfs2 ${INSTALL_DIR} ${IDIR_DAVFS2}/usr/sbin @@ -38,6 +41,5 @@ post-install: ${IDIR_DAVFS2}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/umount.davfs \ ${IDIR_DAVFS2}/usr/sbin - echo 'Depends: ${DEPS}' >>${IDIR_DAVFS2}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/davfs2/files/davfs2.conffiles b/package/davfs2/files/davfs2.conffiles new file mode 100644 index 0000000..c831d9d --- /dev/null +++ b/package/davfs2/files/davfs2.conffiles @@ -0,0 +1,2 @@ +/etc/davfs2/davfs2.conf +/etc/davfs2/secrets diff --git a/package/davfs2/files/davfs2.postinst b/package/davfs2/files/davfs2.postinst new file mode 100644 index 0000000..1d333c4 --- /dev/null +++ b/package/davfs2/files/davfs2.postinst @@ -0,0 +1,5 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +gid=$(get_next_gid) +add_group davfs2 $gid +add_user davfs2 $(get_next_uid) $gid /nonexistent diff --git a/package/davfs2/ipkg/davfs2.conffiles b/package/davfs2/ipkg/davfs2.conffiles deleted file mode 100644 index c831d9d..0000000 --- a/package/davfs2/ipkg/davfs2.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/davfs2/davfs2.conf -/etc/davfs2/secrets diff --git a/package/davfs2/ipkg/davfs2.control b/package/davfs2/ipkg/davfs2.control deleted file mode 100644 index 87d85e9..0000000 --- a/package/davfs2/ipkg/davfs2.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: davfs2 -Priority: optional -Section: admin -Description: WebDAV filesystem diff --git a/package/davfs2/ipkg/davfs2.postinst b/package/davfs2/ipkg/davfs2.postinst deleted file mode 100644 index 1d333c4..0000000 --- a/package/davfs2/ipkg/davfs2.postinst +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group davfs2 $gid -add_user davfs2 $(get_next_uid) $gid /nonexistent diff --git a/package/dbus/Makefile b/package/dbus/Makefile index ec8b297..b240bc0 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -6,14 +6,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dbus -PKG_VERSION:= 1.0.2 -PKG_RELEASE:= 7 -PKG_MD5SUM:= 0552a9b54beb4a044951b7cdbc8fc855 -MASTER_SITES:= http://dbus.freedesktop.org/releases/dbus/ +PKG_VERSION:= 1.0.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ce328423db5743fe9006d39113b5324d +PKG_DESCR:= DBUS library +PKG_SECTION:= net +PKG_DEPENDS:= libexpat +PKG_URL:= http://dbus.freedesktop.org +PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-tests \ @@ -30,9 +34,7 @@ BUILD_STYLE:= auto INSTALL_STYLE:= confprog auto post-install: - ${INSTALL_DIR} ${IDIR_DBUS}/etc - ${INSTALL_DIR} ${IDIR_DBUS}/usr/lib - ${INSTALL_DIR} ${IDIR_DBUS}/usr/bin + ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib ${IDIR_DBUS}/usr/bin ${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus ${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/ ${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/ @@ -40,8 +42,5 @@ post-install: $(STAGING_DIR)/usr/include/dbus-1.0/dbus/ ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/ - ${INSTALL_DIR} ${IDIR_DBUS}/etc/init.d - ${INSTALL_BIN} ./files/dbus.init \ - ${IDIR_DBUS}/etc/init.d/dbus include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init index dd17612..3484c45 100644 --- a/package/dbus/files/dbus.init +++ b/package/dbus/files/dbus.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG dbus +#INIT 60 . /etc/rc.conf case $1 in diff --git a/package/dbus/files/dbus.postinst b/package/dbus/files/dbus.postinst new file mode 100644 index 0000000..8dd0a50 --- /dev/null +++ b/package/dbus/files/dbus.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +gid=$(get_next_gid) +add_group messagebus $gid +add_user messagebus $(get_next_uid) $gid /var/run/dbus +add_rcconf dbus dbus NO diff --git a/package/dbus/ipkg/dbus.control b/package/dbus/ipkg/dbus.control deleted file mode 100644 index d1cecbd..0000000 --- a/package/dbus/ipkg/dbus.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: dbus -Priority: optional -Section: net -Description: DBUS library -Depends: libexpat diff --git a/package/dbus/ipkg/dbus.postinst b/package/dbus/ipkg/dbus.postinst deleted file mode 100644 index 8dd0a50..0000000 --- a/package/dbus/ipkg/dbus.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group messagebus $gid -add_user messagebus $(get_next_uid) $gid /var/run/dbus -add_rcconf dbus dbus NO diff --git a/package/deco/Makefile b/package/deco/Makefile index b6717db..3611bb8 100644 --- a/package/deco/Makefile +++ b/package/deco/Makefile @@ -9,20 +9,23 @@ PKG_NAME:= deco PKG_VERSION:= 39 PKG_RELEASE:= 1 PKG_MD5SUM:= f77f60e8be0cae1f814cba1ef61bf4d0 +PKG_DESCR:= Text-based, full featured file manager +PKG_SECTION:= misc +PKG_DEPENDS:= libncurses +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=deco/} + DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tgz -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=deco/} WRKDIST= ${WRKDIR}/${PKG_NAME}${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto do-install: - ${INSTALL_DIR} ${IDIR_DECO}/usr/bin - ${INSTALL_DIR} ${IDIR_DECO}/usr/lib/deco + ${INSTALL_DIR} ${IDIR_DECO}/usr/bin ${IDIR_DECO}/usr/lib/deco ${INSTALL_BIN} ${WRKBUILD}/deco ${IDIR_DECO}/usr/bin/deco ${INSTALL_DATA} ${WRKBUILD}/profile ${IDIR_DECO}/usr/lib/deco/profile ${INSTALL_DATA} ${WRKBUILD}/menu ${IDIR_DECO}/usr/lib/deco/menu diff --git a/package/deco/ipkg/deco.control b/package/deco/ipkg/deco.control deleted file mode 100644 index f7e8c43..0000000 --- a/package/deco/ipkg/deco.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: deco -Priority: optional -Section: misc -Depends: libncurses -Description: Text-based, full featured file manager diff --git a/package/device-mapper/Makefile b/package/device-mapper/Makefile index 38b738c..b0e48e7 100644 --- a/package/device-mapper/Makefile +++ b/package/device-mapper/Makefile @@ -9,20 +9,17 @@ PKG_NAME:= device-mapper PKG_VERSION:= 1.02.28 PKG_RELEASE:= 1 PKG_MD5SUM:= c9ae0776994a419f9e1ba842164bb626 -DISTFILES:= ${PKG_NAME}.${PKG_VERSION}.tgz -MASTER_SITES:= ftp://sources.redhat.com/pub/dm/ +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,device-mapper,${PKG_VERSION}-${PKG_RELEASE})) - -ifeq ($(DEBUG),1) -CONFIGURE_ARGS+= --enable-debug -else -CONFIGURE_ARGS+= --disable-debug -endif +$(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="" \ @@ -33,8 +30,7 @@ INSTALL_STYLE:= auto INSTALL_TARGET+= install_static_lib post-install: - ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin - ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/lib + ${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 \ diff --git a/package/device-mapper/ipkg/device-mapper.control b/package/device-mapper/ipkg/device-mapper.control deleted file mode 100644 index cb6cdda..0000000 --- a/package/device-mapper/ipkg/device-mapper.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: device-mapper -Priority: optional -Section: utils -Description: device mapper tools and libs diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index e0aa1dc..02d6b2c 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -6,30 +6,30 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dhcp-forwarder -PKG_VERSION:= 0.7 -PKG_RELEASE:= 12 -PKG_MD5SUM:= e7f876e615ebc3f96418f6477b4451e2 +PKG_VERSION:= 0.8 +PKG_RELEASE:= 1 +PKG_MD5SUM:= fb3670dee9f71af1e55ac5dcd64e213e +PKG_DESCR:= DHCP relay agent +PKG_SECTION:= net +PKG_URL:= http://www.nongnu.org/dhcp-fwd +PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DHCP_FORWARDER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DHCP_FORWARDER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu -CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull="yes" CONFIGURE_ARGS+= --disable-dietlibc BUILD_STYLE= auto INSTALL_STYLE= auto XAKE_FLAGS+= cfg_filename="/etc/dhcp-fwd.conf" post-install: - ${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/etc/init.d - ${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/usr/sbin + ${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/usr/sbin ${IDIR_DHCP_FORWARDER}/etc ${INSTALL_DATA} ${WRKBUILD}/contrib/dhcp-fwd.conf \ ${IDIR_DHCP_FORWARDER}/etc/ - ${INSTALL_BIN} ./files/dhcp-fwd.init \ - ${IDIR_DHCP_FORWARDER}/etc/init.d/dhcp-fwd ${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcp-fwd \ ${IDIR_DHCP_FORWARDER}/usr/sbin/ diff --git a/package/dhcp-forwarder/files/dhcp-forwarder.conffiles b/package/dhcp-forwarder/files/dhcp-forwarder.conffiles new file mode 100644 index 0000000..70be85a --- /dev/null +++ b/package/dhcp-forwarder/files/dhcp-forwarder.conffiles @@ -0,0 +1 @@ +/etc/dhcp-fwd.conf diff --git a/package/dhcp-forwarder/files/dhcp-forwarder.postinst b/package/dhcp-forwarder/files/dhcp-forwarder.postinst new file mode 100644 index 0000000..9ba16f5 --- /dev/null +++ b/package/dhcp-forwarder/files/dhcp-forwarder.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf dhcp_fwd dhcp_fwd NO diff --git a/package/dhcp-forwarder/files/dhcp-fwd.init b/package/dhcp-forwarder/files/dhcp-fwd.init index 1481095..70d499a 100644 --- a/package/dhcp-forwarder/files/dhcp-fwd.init +++ b/package/dhcp-forwarder/files/dhcp-fwd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 80 +#PKG dhcp-forwarder +#INIT 80 . /etc/rc.conf case $1 in diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles b/package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles deleted file mode 100644 index 70be85a..0000000 --- a/package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/dhcp-fwd.conf diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder.control b/package/dhcp-forwarder/ipkg/dhcp-forwarder.control deleted file mode 100644 index 9958ddb..0000000 --- a/package/dhcp-forwarder/ipkg/dhcp-forwarder.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dhcp-forwarder -Priority: optional -Section: net -Description: a DHCP relay agent diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder.postinst b/package/dhcp-forwarder/ipkg/dhcp-forwarder.postinst deleted file mode 100644 index 9ba16f5..0000000 --- a/package/dhcp-forwarder/ipkg/dhcp-forwarder.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf dhcp_fwd dhcp_fwd NO diff --git a/package/dhcp-forwarder/patches/00-big_endian.patch b/package/dhcp-forwarder/patches/00-big_endian.patch deleted file mode 100644 index add157d..0000000 --- a/package/dhcp-forwarder/patches/00-big_endian.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dhcp-forwarder-0.7/src/dhcp.h 2004-06-22 03:46:56.000000000 -0700 -+++ dhcp-forwarder-0.7-x/src/dhcp.h 2005-10-06 17:04:14.000000000 -0700 -@@ -89,7 +89,7 @@ - optDHCP_COOKIE = 0x63538263u, - flgDHCP_BCAST = 0x0080u - #else -- DHCP_COOKIE = 0x63825363u, -+ optDHCP_COOKIE = 0x63825363u, - flgDHCP_BCAST = 0x8000u - #endif - }; diff --git a/package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch b/package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch deleted file mode 100644 index ef84913..0000000 --- a/package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -pur dhcp-forwarder-0.7-orig/src/wrappers.h dhcp-forwarder-0.7-patched/src/wrappers.h ---- dhcp-forwarder-0.7-orig/src/wrappers.h 2004-06-22 12:46:56.000000000 +0200 -+++ dhcp-forwarder-0.7-patched/src/wrappers.h 2005-12-27 12:28:10.464289435 +0100 -@@ -65,7 +65,14 @@ Egetgrnam(char const *name) - /*@*/ - { - /*@observer@*/struct group const *res = getgrnam(name); -- FatalErrnoError(res==0, 1, "getgrnam()"); -+ -+ FatalErrnoError((res == NULL) && (errno != 0), 1, "getgrnam()"); -+ -+ if (res == NULL) -+ { -+ fprintf (stderr, "No such group: `%s'\n", name); -+ exit (1); -+ } - - /*@-freshtrans@*/ - /*@-mustfreefresh@*/ -@@ -80,7 +87,14 @@ Egetpwnam(char const *name) - /*@*/ - { - struct passwd const *res = getpwnam(name); -- FatalErrnoError(res==0, 1, "getpwnam()"); -+ -+ FatalErrnoError((res == NULL) && (errno != 0), 1, "getpwnam()"); -+ -+ if (res == NULL) -+ { -+ fprintf (stderr, "No such user: `%s'\n", name); -+ exit (1); -+ } - - return res; - } diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in index 37d2aa7..42fbf67 100644 --- a/package/dhcp/Config.in +++ b/package/dhcp/Config.in @@ -1,5 +1,3 @@ -#menu "dhcp.............................. ISC DHCP (Dynamic Host Configuration Protocol) implementation" - config ADK_COMPILE_DHCP tristate default n @@ -13,7 +11,6 @@ config ADK_PACKAGE_DHCP_RELAY help ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration Protocol) relay daemon. - http://www.isc.org/ config ADK_PACKAGE_DHCP_SERVER @@ -24,7 +21,4 @@ config ADK_PACKAGE_DHCP_SERVER help ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration Protocol) server daemon. - http://www.isc.org/ - -#endmenu diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index de038d8..adaa35c 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -9,12 +9,17 @@ PKG_NAME:= dhcp PKG_VERSION:= 3.0.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 426bfa1712ababaff4be6dadee9c1982 -MASTER_SITES:= ftp://ftp.isc.org/isc/dhcp/ +PKG_DESCR:= ISC DHCP server +PKG_SECTION:= net +PKG_URL:= https://www.isc.org/software/dhcp +PKG_SITES:= ftp://ftp.isc.org/isc/dhcp/ + +PKG_DESCR_1:= ISC DHCP relay server include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) do-configure: (cd ${WRKBUILD} ; \ @@ -27,11 +32,8 @@ INSTALL_STYLE= auto post-install: ${INSTALL_DIR} ${IDIR_DHCP_RELAY}/usr/sbin - ${CP} ${WRKINST}/usr/sbin/dhcrelay ${IDIR_DHCP_RELAY}/usr/sbin/ - ${INSTALL_DIR} ${IDIR_DHCP_SERVER}/etc/init.d + ${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcrelay ${IDIR_DHCP_RELAY}/usr/sbin/ ${INSTALL_DIR} ${IDIR_DHCP_SERVER}/usr/sbin - ${INSTALL_BIN} ./files/dhcpd.init \ - ${IDIR_DHCP_SERVER}/etc/init.d/dhcpd ${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcpd ${IDIR_DHCP_SERVER}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dhcp/files/dhcp-server.postinst b/package/dhcp/files/dhcp-server.postinst new file mode 100644 index 0000000..592120c --- /dev/null +++ b/package/dhcp/files/dhcp-server.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf 'e.g. "eth0.1 eth1"' dhcpd_flags diff --git a/package/dhcp/files/dhcpd.init b/package/dhcp/files/dhcpd.init index 31c1829..6ba76df 100644 --- a/package/dhcp/files/dhcpd.init +++ b/package/dhcp/files/dhcpd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG dhcp-server +#INIT 60 . /etc/rc.conf case $1 in diff --git a/package/dhcp/ipkg/dhcp-relay.control b/package/dhcp/ipkg/dhcp-relay.control deleted file mode 100644 index fbd3d20..0000000 --- a/package/dhcp/ipkg/dhcp-relay.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dhcp-relay -Priority: optional -Section: net -Description: ISC DHCP relay diff --git a/package/dhcp/ipkg/dhcp-server.control b/package/dhcp/ipkg/dhcp-server.control deleted file mode 100644 index a9b86a1..0000000 --- a/package/dhcp/ipkg/dhcp-server.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dhcp-server -Priority: optional -Section: net -Description: ISC DHCP server diff --git a/package/dhcp/ipkg/dhcp-server.postinst b/package/dhcp/ipkg/dhcp-server.postinst deleted file mode 100644 index 592120c..0000000 --- a/package/dhcp/ipkg/dhcp-server.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf 'e.g. "eth0.1 eth1"' dhcpd_flags diff --git a/package/dhcp6/Config.in b/package/dhcp6/Config.in deleted file mode 100644 index cbb5bcc..0000000 --- a/package/dhcp6/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_PACKAGE_DHCP6 - prompt "dhcp6............................. IPv6 DHCP server and client" - depends on ADK_IPV6 - tristate - default n - select ADK_PACKAGE_LIBNCURSES - help - This is the first ever open source implementation of Dynamic - Host Configuration Protocol for IPv6 (DHCPv6) server and client - on Linux Operating System. The server provides leases - (durations or lifetimes) on IPv6 addresses to the clients who - request for it diff --git a/package/dhcp6/Makefile b/package/dhcp6/Makefile deleted file mode 100644 index 58f305b..0000000 --- a/package/dhcp6/Makefile +++ /dev/null @@ -1,32 +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:= dhcp6 -PKG_VERSION:= 1.0 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 86193dfa62137db3ea459543db4f1102 -DISTFILES:= dhcpv6-linux-${PKG_VERSION}.zip -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=dhcpv6-linux/} -WRKDIST= ${WRKDIR} - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,DHCP6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) - -do-build: - ${MAKE} CC="${TARGET_CC}" STAGING_DIR=${STAGING_DIR} -C ${WRKBUILD}/server - ${MAKE} CC="${TARGET_CC}" STAGING_DIR=${STAGING_DIR} -C ${WRKBUILD}/client - -do-install: - ${INSTALL_DIR} ${IDIR_DHCP6}/usr/sbin - ${INSTALL_DIR} ${IDIR_DHCP6}/etc/dhcp{d6,6} - ${INSTALL_BIN} ${WRKBUILD}/client/cli ${IDIR_DHCP6}/usr/sbin/dhcp6client - ${INSTALL_BIN} ${WRKBUILD}/server/serv ${IDIR_DHCP6}/usr/sbin/dhcpd6 - ${CP} ${WRKBUILD}/server/*.conf ${IDIR_DHCP6}/etc/dhcpd6/ - ${CP} ${WRKBUILD}/client/*.conf ${IDIR_DHCP6}/etc/dhcp6/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dhcp6/ipkg/dhcp6.control b/package/dhcp6/ipkg/dhcp6.control deleted file mode 100755 index cc030a0..0000000 --- a/package/dhcp6/ipkg/dhcp6.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: dhcp6 -Section: net -Architecture: mipsel -Priority: optional -Description: This is the first ever open source implementation of Dynamic Host Configuration Protocol for IPv6 (DHCPv6) server and client on Linux Operating System. The server provides leases (durations or lifetimes) on IPv6 addresses to the clients who request for it. diff --git a/package/dhcp6/ipkg/files/conffiles b/package/dhcp6/ipkg/files/conffiles deleted file mode 100644 index 267baa9..0000000 --- a/package/dhcp6/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/dhcp6/patches/patch-client_Makefile b/package/dhcp6/patches/patch-client_Makefile deleted file mode 100644 index 6004a35..0000000 --- a/package/dhcp6/patches/patch-client_Makefile +++ /dev/null @@ -1,58 +0,0 @@ -$Id$ ---- w-dhcp6-1.0-1.orig/client/Makefile 2025-06-28 23:21:40.000000000 +0200 -+++ w-dhcp6-1.0-1/client/Makefile 2008-10-20 13:29:40.000000000 +0200 -@@ -1,42 +1,40 @@ -- --CC = gcc - STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h states.h timer_val.h constants.h macros.h status_codes.h - OBJECT_FILES = client.o solicit.o clilib.o parse.o request.o decline.o renew.o rebind.o release.o - HEADER_FILES = solicit.h clilib.h parse.h request.h decline.h renew.h rebind.h release.h -- -+IFLAGS = -I$(STAGING_DIR)/usr/include - - dhcpv6_client : dhcpv6_client.c cli -- $(CC) -g3 dhcpv6_client.c -o dhcpv6_client -+ $(CC) $(IFLAGS) dhcpv6_client.c -o dhcpv6_client - - cli : $(OBJECT_FILES) -- $(CC) -g3 $(OBJECT_FILES) -o cli -lncurses -+ $(CC) $(IFLAGS) $(OBJECT_FILES) -o cli -L$(STAGING_DIR)/usr/lib -lncurses - - client.o : client.c $(STD_HEADERS) $(HEADER_FILES) -- $(CC) -g3 -c client.c -o client.o -+ $(CC) $(IFLAGS) -c client.c -o client.o - - release.o : release.c release.h clilib.h -- $(CC) -g3 -c release.c -o release.o -+ $(CC) $(IFLAGS) -c release.c -o release.o - - rebind.o : rebind.c rebind.h clilib.h -- $(CC) -g3 -c rebind.c -o rebind.o -+ $(CC) $(IFLAGS) -c rebind.c -o rebind.o - - renew.o : renew.c renew.h clilib.h -- $(CC) -g3 -c renew.c -o renew.o -+ $(CC) $(IFLAGS) -c renew.c -o renew.o - - request.o : request.c request.h clilib.h -- $(CC) -g3 -c request.c -o request.o -+ $(CC) $(IFLAGS) -c request.c -o request.o - - decline.o : decline.c decline.h clilib.h parse.h solicit.h -- $(CC) -g3 -c decline.c -o decline.o -+ $(CC) $(IFLAGS) -c decline.c -o decline.o - - solicit.o : solicit.c solicit.h clilib.h parse.h -- $(CC) -g3 -c solicit.c -o solicit.o -+ $(CC) $(IFLAGS) -c solicit.c -o solicit.o - - clilib.o : clilib.c clilib.h parse.h -- $(CC) -g3 -c clilib.c -o clilib.o -+ $(CC) $(IFLAGS) -c clilib.c -o clilib.o - - parse.o : parse.c parse.h clilib.h -- $(CC) -g3 -c parse.c -o parse.o -+ $(CC) $(IFLAGS) -c parse.c -o parse.o - - clean : - rm -f *.o cli dhcpv6_client diff --git a/package/dhcp6/patches/patch-client_clilib_c b/package/dhcp6/patches/patch-client_clilib_c deleted file mode 100644 index a9f416f..0000000 --- a/package/dhcp6/patches/patch-client_clilib_c +++ /dev/null @@ -1,22 +0,0 @@ -$Id$ ---- w-dhcp6-1.0-1.orig/client/clilib.c Sat Jun 28 23:21:17 2025 -+++ w-dhcp6-1.0-1/client/clilib.c Tue Jul 25 10:37:06 2006 -@@ -554,7 +554,7 @@ u_int8_t convert_character_to_hex (char - - void generate_trans_id (u_int32_t *trans_id) - { -- extern u_int32_t g_trans_id; -+ extern int g_trans_id; - time_t t; - srand (time (&t)); - *trans_id = 0; -@@ -890,9 +890,7 @@ void read_option (char *m, int index, in - break; - - default : --#if DEBUG == 3 - printf ("Unrecognized DUID type\n"); --#endif - } - - next_opt = (struct OPTIONS *) malloc (sizeof (struct OPTIONS)); diff --git a/package/dhcp6/patches/patch-client_macros_h b/package/dhcp6/patches/patch-client_macros_h deleted file mode 100644 index f918cd5..0000000 --- a/package/dhcp6/patches/patch-client_macros_h +++ /dev/null @@ -1,10 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- w-dhcp6-1.0-1.orig/client/macros.h 2025-06-28 23:21:40.000000000 +0200 -+++ w-dhcp6-1.0-1/client/macros.h 2008-10-20 15:31:08.000000000 +0200 -@@ -1,5 +1,5 @@ - #define INITIALIZE_SOCKADDR(x){ \ -- bzero((char *) &(x), sizeof((x))); \ -+ memset((char *) &(x), 0, sizeof((x))); \ - (x).sin6_family = AF_INET6; \ - (x).sin6_flowinfo = htonl(0); \ - (x).sin6_scope_id = 0; \ diff --git a/package/dhcp6/patches/patch-client_solicit_c b/package/dhcp6/patches/patch-client_solicit_c deleted file mode 100644 index 7214598..0000000 --- a/package/dhcp6/patches/patch-client_solicit_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ ---- w-dhcp6-1.0-1.orig/client/solicit.c Sat Jun 28 23:21:17 2025 -+++ w-dhcp6-1.0-1/client/solicit.c Tue Jul 25 10:37:07 2006 -@@ -18,7 +18,7 @@ struct DHCP_MESSAGE * create_solicit_mes - dhcp_message_ptr -> opt = add_client_id_option (interface_details); - - opt_ptr = (struct OPTIONS *) dhcp_message_ptr -> opt; -- (struct OPTIONS *) ((struct DUID *) opt_ptr -> opt_data) -> opt = add_ia_option (interface_details); -+ ((struct DUID *) opt_ptr -> opt_data) -> opt = add_ia_option (interface_details); - return dhcp_message_ptr; - } - diff --git a/package/dhcp6/patches/patch-server_Makefile b/package/dhcp6/patches/patch-server_Makefile deleted file mode 100644 index 0ae2e48..0000000 --- a/package/dhcp6/patches/patch-server_Makefile +++ /dev/null @@ -1,38 +0,0 @@ -$Id$ ---- w-dhcp6-1.0-1.orig/server/Makefile Fri Jun 28 14:49:42 2002 -+++ w-dhcp6-1.0-1/server/Makefile Tue Jul 25 10:37:06 2006 -@@ -1,27 +1,26 @@ --CC = gcc - STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h macros.h status_codes.h constants.h - OBJECT_FILES = server.o lib.o advertise.o parse.o leases.o reply.o - - serv: $(OBJECT_FILES) -- $(CC) -g3 $(OBJECT_FILES) -o serv -+ $(CC) $(OBJECT_FILES) -o serv - - lib.o: lib.c lib.h $(STD_HEADERS) -- $(CC) -g3 -c lib.c -o lib.o -+ $(CC) -c lib.c -o lib.o - - parse.o: parse.c parse.h $(STD_HEADERS) -- $(CC) -g3 -c parse.c -o parse.o -+ $(CC) -c parse.c -o parse.o - - leases.o: leases.c leases.h $(STD_HEADERS) -- $(CC) -g3 -c leases.c -o leases.o -+ $(CC) -c leases.c -o leases.o - - advertise.o: advertise.c advertise.h $(STD_HEADERS) -- $(CC) -g3 -c advertise.c -o advertise.o -+ $(CC) -c advertise.c -o advertise.o - - reply.o: reply.c reply.h $(STD_HEADERS) -- $(CC) -g3 -c reply.c -o reply.o -+ $(CC) -c reply.c -o reply.o - - server.o: server.c lib.h advertise.h reply.h leases.h parse.h $(STD_HEADERS) -- $(CC) -g3 -c server.c -o server.o -+ $(CC) -c server.c -o server.o - - clean: - rm -f *.o serv diff --git a/package/dhcp6/patches/patch-server_macros_h b/package/dhcp6/patches/patch-server_macros_h deleted file mode 100644 index 916e4c7..0000000 --- a/package/dhcp6/patches/patch-server_macros_h +++ /dev/null @@ -1,10 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- w-dhcp6-1.0-1.orig/server/macros.h 2002-06-28 14:50:04.000000000 +0200 -+++ w-dhcp6-1.0-1/server/macros.h 2008-10-20 15:30:53.000000000 +0200 -@@ -1,5 +1,5 @@ - #define INITIALIZE_SOCKADDR(x){ \ -- bzero((char *) &(x), sizeof((x))); \ -+ memset((char *) &(x), 0, sizeof((x))); \ - (x).sin6_family = AF_INET6; \ - (x).sin6_flowinfo = htonl(0); \ - (x).sin6_scope_id = 0; \ diff --git a/package/dhcp6/patches/patch-server_reply_c b/package/dhcp6/patches/patch-server_reply_c deleted file mode 100644 index bafca5a..0000000 --- a/package/dhcp6/patches/patch-server_reply_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- w-dhcp6-1.0-1.orig/server/reply.c 2002-06-28 14:50:04.000000000 +0200 -+++ w-dhcp6-1.0-1/server/reply.c 2008-10-20 15:29:52.000000000 +0200 -@@ -147,7 +147,7 @@ struct DHCP_MESSAGE * create_dummy_reply - opt_ptr -> u_opt_len.opt_len = opt_src_ptr -> u_opt_len.opt_len; - ia_ptr = (struct IA *) malloc (sizeof (struct IA)); - opt_ptr -> opt_data = ia_ptr; -- bzero (ia_ptr, sizeof (struct IA)); -+ memset (ia_ptr, 0, sizeof (struct IA)); - ia_ptr -> u_iaid.iaid = ia_src_ptr -> u_iaid.iaid; - - // set IAADDR option with values set to null -@@ -159,7 +159,7 @@ struct DHCP_MESSAGE * create_dummy_reply - opt_ptr -> u_opt_len.opt_len = opt_src_ptr -> u_opt_len.opt_len; - iaaddr_ptr = (struct IA_ADDRESS *) malloc (sizeof (struct IA_ADDRESS)); - opt_ptr -> opt_data = iaaddr_ptr; -- bzero (iaaddr_ptr, sizeof (struct IA_ADDRESS)); -+ memset (iaaddr_ptr, 0, sizeof (struct IA_ADDRESS)); - - return dhcp_message_ptr; - } diff --git a/package/dhcpv6/Config.in b/package/dhcpv6/Config.in new file mode 100644 index 0000000..569320f --- /dev/null +++ b/package/dhcpv6/Config.in @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000..6fdeaca --- /dev/null +++ b/package/dhcpv6/Makefile @@ -0,0 +1,29 @@ +# $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 new file mode 100644 index 0000000..267baa9 --- /dev/null +++ b/package/dhcpv6/ipkg/files/conffiles @@ -0,0 +1,4 @@ +/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 new file mode 100644 index 0000000..2ef218d --- /dev/null +++ b/package/dhcpv6/patches/patch-configure @@ -0,0 +1,26 @@ +$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 new file mode 100644 index 0000000..8ba5a08 --- /dev/null +++ b/package/dhcpv6/patches/patch-configure.orig @@ -0,0 +1,25 @@ +$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 new file mode 100644 index 0000000..3ca204c --- /dev/null +++ b/package/dhcpv6/patches/patch-configure_ac @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 0000000..b5ad3d3 --- /dev/null +++ b/package/dhcpv6/patches/patch-configure_ac.orig @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 0000000..c5f37d9 --- /dev/null +++ b/package/dhcpv6/patches/patch-src_relay6_socket_c @@ -0,0 +1,48 @@ +$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 7cd2691..ea99684 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= digitemp PKG_VERSION:= 3.3.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 0b6cfb36d198767836de54d9fb11bbdb -MASTER_SITES:= http://www.digitemp.com/software/linux/ +PKG_DESCR:= simple to use program for reading values from 1-wire devices +PKG_SECTION:= app +PKG_DEPENDS:= libusb +PKG_URL:= http://www.digitemp.com/software/linux +PKG_SITES:= http://www.digitemp.com/software/linux/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ALL_TARGET= ds2490 BUILD_STYLE= auto diff --git a/package/digitemp/ipkg/digitemp.control b/package/digitemp/ipkg/digitemp.control deleted file mode 100644 index a1aff9b..0000000 --- a/package/digitemp/ipkg/digitemp.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: digitemp -Priority: optional -Section: app -Depends: libusb -Description: DigiTemp is a simple to use program for reading values from 1-wire devices. diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index ba09c4e..10fb0b2 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= dnsmasq PKG_VERSION:= 2.47 PKG_RELEASE:= 1 PKG_MD5SUM:= 4524081e56d0b935717d493e8e8d3e11 -MASTER_SITES:= http://thekelleys.org.uk/dnsmasq/ +PKG_DESCR:= A lightweight DNS and DHCP server +PKG_SECTION:= net +PKG_URL:= http://thekelleys.org.uk/dnsmasq +PKG_SITES:= http://thekelleys.org.uk/dnsmasq/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto INSTALL_STYLE= manual @@ -23,9 +26,8 @@ MAKE_FLAGS+= COPTS="${TCFLAGS} -DNO_IPV6" endif do-install: - ${INSTALL_DIR} ${IDIR_DNSMASQ}/{etc/init.d,usr/sbin} + ${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc ${INSTALL_BIN} ${WRKBUILD}/src/dnsmasq ${IDIR_DNSMASQ}/usr/sbin/ ${INSTALL_DATA} files/dnsmasq.conf ${IDIR_DNSMASQ}/etc/dnsmasq.conf - ${INSTALL_BIN} files/dnsmasq.init ${IDIR_DNSMASQ}/etc/init.d/dnsmasq include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dnsmasq/files/dnsmasq.conffiles b/package/dnsmasq/files/dnsmasq.conffiles new file mode 100644 index 0000000..e30eba8 --- /dev/null +++ b/package/dnsmasq/files/dnsmasq.conffiles @@ -0,0 +1 @@ +/etc/dnsmasq.conf diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index e92ad3a..be9218b 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -1,10 +1,11 @@ #!/bin/sh -#FWINIT 50 +#PKG dnsmasq +#INIT 50 . /etc/rc.conf case $1 in -(autostop) ;; -(autostart) +autostop) ;; +autostart) [[ $dns_dhcp = NO ]] && exit 0 exec sh $0 start ;; @@ -12,14 +13,14 @@ start) [ -f /etc/dnsmasq.conf ] || exit /usr/sbin/dnsmasq ;; -(stop) +stop) killall dnsmasq ;; -(restart) +restart) sh $0 stop sh $0 start ;; -(*) +*) echo "Usage: $0 {start | stop | restart}" ;; esac diff --git a/package/dnsmasq/files/dnsmasq.postinst b/package/dnsmasq/files/dnsmasq.postinst new file mode 100644 index 0000000..f2ff69e --- /dev/null +++ b/package/dnsmasq/files/dnsmasq.postinst @@ -0,0 +1,7 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh + +gid=$(get_next_gid) +add_user dnsmasq $(get_next_uid) $gid /tmp +add_group dnsmasq $gid +add_rcconf dnsmasq dns_dhcp NO diff --git a/package/dnsmasq/ipkg/dnsmasq.conffiles b/package/dnsmasq/ipkg/dnsmasq.conffiles deleted file mode 100644 index e30eba8..0000000 --- a/package/dnsmasq/ipkg/dnsmasq.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/dnsmasq.conf diff --git a/package/dnsmasq/ipkg/dnsmasq.control b/package/dnsmasq/ipkg/dnsmasq.control deleted file mode 100644 index 6f61edc..0000000 --- a/package/dnsmasq/ipkg/dnsmasq.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dnsmasq -Priority: essential -Section: net -Description: A lightweight DNS and DHCP server diff --git a/package/dnsmasq/ipkg/dnsmasq.postinst b/package/dnsmasq/ipkg/dnsmasq.postinst deleted file mode 100644 index f2ff69e..0000000 --- a/package/dnsmasq/ipkg/dnsmasq.postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh - -gid=$(get_next_gid) -add_user dnsmasq $(get_next_uid) $gid /tmp -add_group dnsmasq $gid -add_rcconf dnsmasq dns_dhcp NO diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index efda070..ce5a0d4 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= dosfstools PKG_VERSION:= 3.0.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 94c2ea84b191de958f765ee239457bd9 -MASTER_SITES:= http://www.daniel-baumann.ch/software/dosfstools/ +PKG_DESCR:= Utilities to create and check MS-DOS FAT filesystems +PKG_SECTION:= admin +PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools +PKG_SITES:= http://www.daniel-baumann.ch/software/dosfstools/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/dosfstools/ipkg/dosfstools.control b/package/dosfstools/ipkg/dosfstools.control deleted file mode 100644 index 4ec52a0..0000000 --- a/package/dosfstools/ipkg/dosfstools.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dosfstools -Priority: optional -Section: admin -Description: Utilities to create and check MS-DOS FAT filesystems diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile index 794af70..7f69e2d 100644 --- a/package/dovecot/Makefile +++ b/package/dovecot/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= dovecot PKG_VERSION:= 1.1.14 PKG_RELEASE:= 1 PKG_MD5SUM:= 60b1deccc0ae77e5669060d2b1894e5e -MASTER_SITES:= http://www.dovecot.org/releases/1.1/ +PKG_DESCR:= A minimal and secure imap server +PKG_SECTION:= net +PKG_URL:= http://www.dovecot.org +PKG_SITES:= http://www.dovecot.org/releases/1.1/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DOVECOT,dovecot,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DOVECOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ignore_signed_size=1 \ diff --git a/package/dovecot/ipkg/dovecot.control b/package/dovecot/ipkg/dovecot.control deleted file mode 100644 index 23e9882..0000000 --- a/package/dovecot/ipkg/dovecot.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dovecot -Priority: optional -Section: net -Description: A minimal and secure imap server diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index a717738..186dae9 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -9,13 +9,18 @@ PKG_NAME:= dropbear PKG_VERSION:= 0.52 PKG_RELEASE:= 1 PKG_MD5SUM:= 1c69ec674481d7745452f68f2ea5597e -MASTER_SITES:= http://matt.ucc.asn.au/dropbear/releases/ \ +PKG_DESCR:= SSH 2 server/client designed for small memory environments +PKG_SECTION:= net +PKG_URL:= http://matt.ucc.asn.au/dropbear +PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/ \ http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/ +PKG_DESCR_1:= Utility for converting SSH keys + include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-pam \ @@ -44,7 +49,6 @@ do-build: do-install: # main package - $(INSTALL_DIR) $(IDIR_DROPBEAR)/etc/init.d $(INSTALL_DIR) $(IDIR_DROPBEAR)/usr/bin $(INSTALL_DIR) $(IDIR_DROPBEAR)/usr/sbin $(INSTALL_BIN) $(WRKBUILD)/dropbearmulti \ @@ -53,8 +57,6 @@ do-install: ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/ssh ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey - $(INSTALL_DATA) ./files/dropbear.init \ - $(IDIR_DROPBEAR)/etc/init.d/dropbear # subpackage dropbearconvert $(INSTALL_DIR) $(IDIR_DBCONVERT)/usr/bin $(INSTALL_BIN) $(WRKBUILD)/dropbearconvert \ diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init index cb1408f..b1623c9 100644 --- a/package/dropbear/files/dropbear.init +++ b/package/dropbear/files/dropbear.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 50 +#PKG dropbear +#INIT 50 . /etc/rc.conf bothlog() { diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst new file mode 100644 index 0000000..1e45f39 --- /dev/null +++ b/package/dropbear/files/dropbear.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf '"NO" to disable' dropbear_flags "" diff --git a/package/dropbear/ipkg/dropbear.control b/package/dropbear/ipkg/dropbear.control deleted file mode 100644 index 0aa8cc5..0000000 --- a/package/dropbear/ipkg/dropbear.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dropbear -Priority: optional -Section: net -Description: a small SSH 2 server/client designed for small memory environments. diff --git a/package/dropbear/ipkg/dropbear.postinst b/package/dropbear/ipkg/dropbear.postinst deleted file mode 100644 index 30a86fe..0000000 --- a/package/dropbear/ipkg/dropbear.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf '"NO" to disable, "@OPTIONS@" otherwise' dropbear_flags "@OPTIONS@" diff --git a/package/dropbear/ipkg/dropbearconvert.control b/package/dropbear/ipkg/dropbearconvert.control deleted file mode 100644 index 2b352ce..0000000 --- a/package/dropbear/ipkg/dropbearconvert.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dropbearconvert -Priority: optional -Section: net -Description: Utility for converting SSH keys diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile index 352160d..e15d98e 100644 --- a/package/dsniff/Makefile +++ b/package/dsniff/Makefile @@ -9,12 +9,17 @@ PKG_NAME:= dsniff PKG_VERSION:= 2.4b1 PKG_RELEASE:= 2 PKG_MD5SUM:= 2f761fa3475682a7512b0b43568ee7d6 -MASTER_SITES:= http://www.monkey.org/~dugsong/dsniff/beta/ +PKG_DESCR:= collection of tools for network auditing and penetration testing +PKG_SECTION:= net +PKG_DEPENDS:= libnet libpcap libnids libopenssl libgdbm +PKG_URL:= http://www.monkey.org/~dugsong/dsniff +PKG_SITES:= http://www.monkey.org/~dugsong/dsniff/beta/ + WRKDIST= ${WRKDIR}/${PKG_NAME}-2.4 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DSNIFF,dsniff,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DSNIFF,dsniff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-db \ @@ -29,8 +34,7 @@ INSTALL_STYLE= auto FAKE_FLAGS+= install_prefix="${WRKINST}" post-install: - ${INSTALL_DIR} ${IDIR_DSNIFF}/usr/lib - ${INSTALL_DIR} ${IDIR_DSNIFF}/usr/sbin + ${INSTALL_DIR} ${IDIR_DSNIFF}/usr/lib ${IDIR_DSNIFF}/usr/sbin ${CP} ${WRKINST}/usr/sbin/* ${IDIR_DSNIFF}/usr/sbin ${CP} ${WRKINST}/usr/lib/* ${IDIR_DSNIFF}/usr/lib diff --git a/package/dsniff/ipkg/dsniff.control b/package/dsniff/ipkg/dsniff.control deleted file mode 100644 index 5f1591a..0000000 --- a/package/dsniff/ipkg/dsniff.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: dsniff -Priority: optional -Section: admin -Depends: libnet, libpcap, libnids, libopenssl, libgdbm -Description: collection of tools for network auditing and penetration testing diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 2677e32..12abd58 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -6,16 +6,24 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.41.3 +PKG_VERSION:= 1.41.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= b21d26fc46c584021dc9c444933ee1c2 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} +PKG_MD5SUM:= e218df6c84fc17c1126d31de9472a76c +PKG_DESCR:= Ext2/3/4 filesystem utilities +PKG_SECTION:= admin +PKG_URL:= http://e2fsprogs.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} + +PKG_DESCR_1:= UUID library +PKG_SECTION_1:= libs +PKG_DESCR_2:= Common error library +PKG_SECTION_2:= libs include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION_1})) +$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION_2})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-elf-shlibs \ @@ -34,8 +42,7 @@ pre-build: subst post-install: - ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib - ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/sbin + ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin/ diff --git a/package/e2fsprogs/ipkg/e2fsprogs.control b/package/e2fsprogs/ipkg/e2fsprogs.control deleted file mode 100644 index 73e023d..0000000 --- a/package/e2fsprogs/ipkg/e2fsprogs.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: e2fsprogs -Priority: optional -Section: admin -Description: Ext2/3 filesystem utilities diff --git a/package/e2fsprogs/ipkg/libcom-err.control b/package/e2fsprogs/ipkg/libcom-err.control deleted file mode 100644 index 4e8d022..0000000 --- a/package/e2fsprogs/ipkg/libcom-err.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libcom-err -Priority: optional -Section: admin -Description: Common error library diff --git a/package/e2fsprogs/ipkg/libuuid.control b/package/e2fsprogs/ipkg/libuuid.control deleted file mode 100644 index b0f7388..0000000 --- a/package/e2fsprogs/ipkg/libuuid.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libuuid -Priority: optional -Section: admin -Description: UUID library diff --git a/package/elinks/Makefile b/package/elinks/Makefile index 1221158..77f1b5e 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= elinks PKG_VERSION:= 0.11.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 11547e054d7afb1f5ac9e9f65728cc6a -MASTER_SITES:= http://elinks.or.cz/download/ +PKG_DESCR:= advanced text web browser +PKG_SECTION:= text +PKG_DEPENDS:= libopenssl +PKG_URL:= http://elinks.or.cz +PKG_SITES:= http://elinks.or.cz/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes diff --git a/package/elinks/ipkg/elinks.control b/package/elinks/ipkg/elinks.control deleted file mode 100644 index bbcb216..0000000 --- a/package/elinks/ipkg/elinks.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: elinks -Priority: optional -Section: text -Description: An advanced text web browser -Depends: libopenssl diff --git a/package/em28xx/Makefile b/package/em28xx/Makefile index 6a1048b..9a0067a 100644 --- a/package/em28xx/Makefile +++ b/package/em28xx/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= em28xx PKG_VERSION:= 20081206 PKG_RELEASE:= 1 PKG_MD5SUM:= 8467a1b1d495fa712c8beb617ef5f5dd -MASTER_SITES:= http://waldemar-brodkorb.de/openadk/distfiles/ +PKG_SITES:= http://www.openadk.org/distfiles/ WRKDIST= ${WRKDIR}/${PKG_NAME} diff --git a/package/em28xx/ipkg/kmod-em28xx.control b/package/em28xx/ipkg/kmod-em28xx.control deleted file mode 100644 index 6d525bf..0000000 --- a/package/em28xx/ipkg/kmod-em28xx.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: kmod-em28xx -Priority: optional -Section: net -Description: Driver for EM28xx based TV video cards diff --git a/package/esound/Makefile b/package/esound/Makefile index 119532e..6da76d2 100644 --- a/package/esound/Makefile +++ b/package/esound/Makefile @@ -6,25 +6,26 @@ include ${TOPDIR}/rules.mk PKG_NAME:= esound -PKG_VERSION:= 0.2.38 -PKG_RELEASE:= 5 -PKG_MD5SUM:= 77c4e9805a017fba06552487df3c6662 -MASTER_SITES:= ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/ +PKG_VERSION:= 0.2.41 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688 +PKG_DESCR:= Enlightened Sound Daemon +PKG_SECTION:= net +PKG_DEPENDS:= libaudiofile +PKG_URL:= http://www.tux.org/~ricdude/EsounD.html +PKG_SITES:= ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ESOUND,${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_ESOUND}/etc/init.d - ${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin - ${INSTALL_DIR} ${IDIR_ESOUND}/usr/lib + ${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin ${IDIR_ESOUND}/usr/lib ${INSTALL_BIN} ${WRKINST}/usr/bin/esd ${IDIR_ESOUND}/usr/bin/ $(CP) $(WRKINST)/usr/lib/libesd.so.* $(IDIR_ESOUND)/usr/lib/ - $(INSTALL_DATA) ./files/esd.init $(IDIR_ESOUND)/etc/init.d/esd include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/esound/files/esd.init b/package/esound/files/esd.init index b6acdb5..0f60c59 100644 --- a/package/esound/files/esd.init +++ b/package/esound/files/esd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 75 +#PKG esound +#INIT 75 . /etc/rc.conf case $1 in diff --git a/package/esound/files/esound.postinst b/package/esound/files/esound.postinst new file mode 100644 index 0000000..866b0f8 --- /dev/null +++ b/package/esound/files/esound.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf esd diff --git a/package/esound/ipkg/esound.control b/package/esound/ipkg/esound.control deleted file mode 100644 index aa1a8f3..0000000 --- a/package/esound/ipkg/esound.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: esound -Version: 0.2.8 -Section: net -Priority: optional -Depends: libaudiofile -Description: Enlightened Sound Daemon diff --git a/package/esound/ipkg/esound.postinst b/package/esound/ipkg/esound.postinst deleted file mode 100644 index 866b0f8..0000000 --- a/package/esound/ipkg/esound.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf esd diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile index 5a4aeac..fba2d46 100644 --- a/package/ether-wake/Makefile +++ b/package/ether-wake/Makefile @@ -8,11 +8,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ether-wake PKG_VERSION:= 1.09 PKG_RELEASE:= 1 +PKG_DESCR:= A Wake-On-LAN (WOL) client +PKG_SECTION:= net + NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ETHER_WAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ETHER_WAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-build: ${TARGET_CC} ${TARGET_CFLAGS} -o ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/${PKG_NAME}.c diff --git a/package/ether-wake/ipkg/ether-wake.control b/package/ether-wake/ipkg/ether-wake.control deleted file mode 100644 index 2c736f1..0000000 --- a/package/ether-wake/ipkg/ether-wake.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ether-wake -Priority: optional -Section: net -Description: A Wake-On-LAN (WOL) client, - send a magic packet to wake up sleeping networked machines. diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile index b68ec17..e37c590 100644 --- a/package/ethtool/Makefile +++ b/package/ethtool/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= ethtool PKG_VERSION:= 5 PKG_RELEASE:= 1 PKG_MD5SUM:= 5df7f165974e096e2de890e099f87a12 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/} +PKG_DESCR:= Display or change ethernet card settings +PKG_SECTION:= net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/ethtool/ipkg/ethtool.control b/package/ethtool/ipkg/ethtool.control deleted file mode 100644 index 2cc3f06..0000000 --- a/package/ethtool/ipkg/ethtool.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ethtool -Priority: optional -Section: net -Description: Display or change ethernet card settings diff --git a/package/evieext/Makefile b/package/evieext/Makefile index 41b38ca..49eae31 100644 --- a/package/evieext/Makefile +++ b/package/evieext/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= evieext PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 PKG_MD5SUM:= cff7b68b228d255f582cb64879619a44 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/exmap/Makefile b/package/exmap/Makefile index c515e45..8ce3c2b 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -9,16 +9,18 @@ PKG_NAME:= exmap PKG_VERSION:= 0.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 55aec784e214037e61400287a55b5426 +PKG_DESCR:= memory analysing tool +PKG_SECTION:= utils +PKG_SITES:= http://labs.o-hand.com/sources/exmap-console/ DISTFILES:= ${PKG_NAME}-console-${PKG_VERSION}.tgz -MASTER_SITES:= http://labs.o-hand.com/sources/exmap-console/ WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) CONFIGURE_STYLE:= gnu diff --git a/package/exmap/ipkg/exmap.control b/package/exmap/ipkg/exmap.control deleted file mode 100644 index 23c5131..0000000 --- a/package/exmap/ipkg/exmap.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: exmap -Priority: optional -Section: utils -Description: memory analysing tool diff --git a/package/exmap/ipkg/exmapd.control b/package/exmap/ipkg/exmapd.control deleted file mode 100644 index dbfe932..0000000 --- a/package/exmap/ipkg/exmapd.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: exmapd -Priority: optional -Section: utils -Description: memory analysing tool diff --git a/package/exmap/ipkg/exmapserver.control b/package/exmap/ipkg/exmapserver.control deleted file mode 100644 index 8d33fb5..0000000 --- a/package/exmap/ipkg/exmapserver.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: exmapserver -Priority: optional -Section: utils -Description: memory analysing tool diff --git a/package/exmap/ipkg/kmod-exmap.control b/package/exmap/ipkg/kmod-exmap.control deleted file mode 100644 index afae492..0000000 --- a/package/exmap/ipkg/kmod-exmap.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: kmod-exmap -Priority: optional -Section: utils -Description: kernel module for a memory analysing tool diff --git a/package/expat/Makefile b/package/expat/Makefile index fbc0441..c74b8a3 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -6,15 +6,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= expat -PKG_VERSION:= 1.95.8 +PKG_VERSION:= 2.0.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= aff487543845a82fe262e6e2922b4c8e - -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} +PKG_MD5SUM:= ee8b492592568805593f81f8cdf2a04c +PKG_DESCR:= a fast, non-validating, stream-oriented XML parsing library +PKG_SECTION:= libs +PKG_URL:= http://expat.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/expat/ipkg/libexpat.control b/package/expat/ipkg/libexpat.control deleted file mode 100644 index 9fe78fa..0000000 --- a/package/expat/ipkg/libexpat.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libexpat -Priority: optional -Section: net -Description: a fast, non-validating, stream-oriented XML parsing library diff --git a/package/expat/patches/001-destdir.patch b/package/expat/patches/001-destdir.patch deleted file mode 100644 index 0116f97..0000000 --- a/package/expat/patches/001-destdir.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ruN expat-1.95.8-orig/Makefile.in expat-1.95.8-1/Makefile.in ---- expat-1.95.8.orig/Makefile.in 2004-05-07 22:00:48.000000000 +0200 -+++ expat-1.95.8/Makefile.in 2009-05-09 13:40:57.000000000 +0200 -@@ -34,6 +34,8 @@ man1dir = @mandir@/man1 - - top_builddir = . - -+DESTDIR = -+ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -73,22 +75,22 @@ check: tests/runtests - tests/runtests - - install: xmlwf/xmlwf installlib -- $(mkinstalldirs) $(bindir) $(man1dir) -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf -- $(INSTALL_DATA) $(MANFILE) $(man1dir) -+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)$(bindir)/xmlwf -+ $(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir) - - installlib: $(LIBRARY) $(APIHEADER) -- $(mkinstalldirs) $(libdir) $(includedir) -- $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY) -- $(INSTALL_DATA) $(APIHEADER) $(includedir) -+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) -+ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY) -+ $(INSTALL_DATA) $(APIHEADER) $(DESTDIR)$(includedir) - - uninstall: uninstalllib -- $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf - rm -f $(man1dir)/xmlwf.1 - - uninstalllib: -- $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY) -- rm -f $(includedir)/$(APIHEADER) -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY) -+ rm -f $(DESTDIR)$(includedir)/$(APIHEADER) - - # for VPATH builds (invoked by configure) - mkdir-init: diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile index 02cf176..f0f46b7 100644 --- a/package/ez-ipupdate/Makefile +++ b/package/ez-ipupdate/Makefile @@ -9,24 +9,24 @@ PKG_NAME:= ez-ipupdate PKG_VERSION:= 3.0.11b8 PKG_RELEASE:= 10 PKG_MD5SUM:= 000211add4c4845ffa4211841bff4fb0 -DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz -MASTER_SITES:= http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ \ +PKG_DESCR:= a client for dynamic DNS services +PKG_SECTION:= net +PKG_URL:= http://ez-ipupdate.com +PKG_SITES:= http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ \ http://ftp.de.debian.org/debian/pool/main/e/ez-ipupdate/ +DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz + include ${TOPDIR}/mk/package.mk -${eval ${call PKG_template,EZIPUPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}}} +$(eval $(call PKG_template,EZIPUPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto do-install: - ${INSTALL_DIR} ${IDIR_EZIPUPDATE}/etc + ${INSTALL_DIR} ${IDIR_EZIPUPDATE}/etc ${IDIR_EZIPUPDATE}/usr/sbin install -m0600 ./files/${PKG_NAME}.conf ${IDIR_EZIPUPDATE}/etc/ - ${INSTALL_DIR} ${IDIR_EZIPUPDATE}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/${PKG_NAME} ${IDIR_EZIPUPDATE}/usr/sbin/ - ${INSTALL_DIR} ${IDIR_EZIPUPDATE}/etc/init.d - ${INSTALL_SCRIPT} ./files/ez-ipupdate.init \ - ${IDIR_EZIPUPDATE}/etc/init.d/ez-ipupdate include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ez-ipupdate/files/ez-ipupdate.conffiles b/package/ez-ipupdate/files/ez-ipupdate.conffiles new file mode 100644 index 0000000..3a9041e --- /dev/null +++ b/package/ez-ipupdate/files/ez-ipupdate.conffiles @@ -0,0 +1 @@ +/etc/ez-ipupdate.conf diff --git a/package/ez-ipupdate/files/ez-ipupdate.init b/package/ez-ipupdate/files/ez-ipupdate.init index 36cfa7d..c6fbfc3 100644 --- a/package/ez-ipupdate/files/ez-ipupdate.init +++ b/package/ez-ipupdate/files/ez-ipupdate.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 50 +#PKG ez-ipupdate +#INIT 50 . /etc/rc.conf case $1 in diff --git a/package/ez-ipupdate/files/ez-ipupdate.postinst b/package/ez-ipupdate/files/ez-ipupdate.postinst new file mode 100644 index 0000000..c8094c1 --- /dev/null +++ b/package/ez-ipupdate/files/ez-ipupdate.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf ezipupdate ezipupdate NO diff --git a/package/ez-ipupdate/ipkg/ez-ipupdate.conffiles b/package/ez-ipupdate/ipkg/ez-ipupdate.conffiles deleted file mode 100644 index 3a9041e..0000000 --- a/package/ez-ipupdate/ipkg/ez-ipupdate.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/ez-ipupdate.conf diff --git a/package/ez-ipupdate/ipkg/ez-ipupdate.control b/package/ez-ipupdate/ipkg/ez-ipupdate.control deleted file mode 100644 index 1b7dff8..0000000 --- a/package/ez-ipupdate/ipkg/ez-ipupdate.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ez-ipupdate -Priority: optional -Section: net -Description: a client for dynamic DNS services diff --git a/package/ez-ipupdate/ipkg/ez-ipupdate.postinst b/package/ez-ipupdate/ipkg/ez-ipupdate.postinst deleted file mode 100644 index c8094c1..0000000 --- a/package/ez-ipupdate/ipkg/ez-ipupdate.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf ezipupdate ezipupdate NO diff --git a/package/faad2/Makefile b/package/faad2/Makefile index c4052b2..ed707cc 100644 --- a/package/faad2/Makefile +++ b/package/faad2/Makefile @@ -6,27 +6,29 @@ include ${TOPDIR}/rules.mk PKG_NAME:= faad2 -PKG_VERSION:= 2.6.1 +PKG_VERSION:= 2.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 74e92df40c270f216a8305fc87603c8a -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/} -WRKDIST= ${WRKDIR}/faad2 +PKG_MD5SUM:= ee1b4d67ea2d76ee52c5621bc6dbf61e +PKG_DESCR:= A mp4 decoding library +PKG_SECTION:= libs +PKG_URL:= http://sourceforge.net/projects/faac/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= autotool gnu +CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-mpeg4ip \ --without-xmms BUILD_STYLE= auto INSTALL_STYLE= auto -pre-install: - ${INSTALL_DIR} ${WRKINST}/usr/lib - ${INSTALL_DIR} ${WRKINST}/usr/include - ${CP} ${WRKBUILD}/common/mp4ff/libmp4ff.a ${WRKINST}/usr/lib - ${CP} ${WRKBUILD}/common/mp4ff/mp4ff.h ${WRKINST}/usr/include +#pre-install: +# ${INSTALL_DIR} ${WRKINST}/usr/lib +# ${INSTALL_DIR} ${WRKINST}/usr/include +# ${CP} ${WRKBUILD}/common/mp4ff/libmp4ff.a ${WRKINST}/usr/lib +# ${CP} ${WRKBUILD}/common/mp4ff/mp4ff.h ${WRKINST}/usr/include post-install: ${INSTALL_DIR} ${IDIR_LIBFAAD2}/usr/lib diff --git a/package/faad2/ipkg/libfaad2.control b/package/faad2/ipkg/libfaad2.control deleted file mode 100644 index 81fa375..0000000 --- a/package/faad2/ipkg/libfaad2.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libfaad2 -Priority: optional -Section: libs -Description: A mp4 decoding library diff --git a/package/faad2/patches/patch-common_mp4ff_Makefile_am b/package/faad2/patches/patch-common_mp4ff_Makefile_am deleted file mode 100644 index 3e471d6..0000000 --- a/package/faad2/patches/patch-common_mp4ff_Makefile_am +++ /dev/null @@ -1,16 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- faad2.orig/common/mp4ff/Makefile.am 2006-05-07 20:09:00.000000000 +0200 -+++ faad2/common/mp4ff/Makefile.am 2009-01-11 17:15:38.138931843 +0100 -@@ -1,8 +1,9 @@ --noinst_LTLIBRARIES = libmp4ff.la -+lib_LIBRARIES = libmp4ff.a -+include_HEADERS = mp4ff.h mp4ffint.h - --libmp4ff_la_CFLAGS = -DUSE_TAGGING=1 -+libmp4ff_a_CFLAGS = -DUSE_TAGGING=1 - --libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ -+libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ - mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \ - drms.h drms.c drmstables.h - diff --git a/package/faad2/patches/patch-common_mp4ff_mp4ff_h b/package/faad2/patches/patch-common_mp4ff_mp4ff_h deleted file mode 100644 index cfca4f5..0000000 --- a/package/faad2/patches/patch-common_mp4ff_mp4ff_h +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- faad2.orig/common/mp4ff/mp4ff.h 2007-11-01 13:33:29.000000000 +0100 -+++ faad2/common/mp4ff/mp4ff.h 2009-01-11 16:52:07.174753204 +0100 -@@ -35,7 +35,7 @@ - extern "C" { - #endif /* __cplusplus */ - --#include "mp4ff_int_types.h" -+#include - - /* file callback structure */ - typedef struct diff --git a/package/faad2/patches/patch-configure_in b/package/faad2/patches/patch-configure_in deleted file mode 100644 index be4b205..0000000 --- a/package/faad2/patches/patch-configure_in +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- faad2.orig/configure.in 2006-09-25 21:52:53.000000000 +0200 -+++ faad2/configure.in 2009-01-08 16:50:34.056700106 +0100 -@@ -16,6 +16,7 @@ AC_SUBST(LIBTOOL_DEPS) - - dnl Checks for programs. - AC_PROG_CC -+AC_PROG_CXX - AC_PROG_CPP - dnl disable for mpeg4ip plugin - dnl AC_PROG_CXX diff --git a/package/faad2/patches/patch-frontend_Makefile_am b/package/faad2/patches/patch-frontend_Makefile_am deleted file mode 100644 index e0efa1a..0000000 --- a/package/faad2/patches/patch-frontend_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- faad2.orig/frontend/Makefile.am 2006-05-07 20:09:00.000000000 +0200 -+++ faad2/frontend/Makefile.am 2009-01-11 17:16:19.901544559 +0100 -@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(t - -I$(top_srcdir)/common/mp4ff - - faad_LDADD = $(top_builddir)/libfaad/libfaad.la \ -- $(top_builddir)/common/mp4ff/libmp4ff.la -+ $(top_builddir)/common/mp4ff/libmp4ff.a - - faad_SOURCES = main.c \ - audio.c audio.h \ diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile index f3341ed..3026df3 100644 --- a/package/fakeidentd/Makefile +++ b/package/fakeidentd/Makefile @@ -9,23 +9,22 @@ PKG_NAME:= fakeidentd PKG_VERSION:= 2.5 PKG_RELEASE:= 1 PKG_MD5SUM:= ebf398bd1843a1fd8c71f5fcf4a6e4f7 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= http://distfiles.gentoo.org/distfiles/ +PKG_DESCR:= A static, secure identd +PKG_SECTION:= net +PKG_SITES:= http://distfiles.gentoo.org/distfiles/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 WRKDIST= ${WRKDIR} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FAKEIDENTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FAKEIDENTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-build: - ${TARGET_CC} -o ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/identd.c + ${TARGET_CC} ${TARGET_CFLAGS} -o ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/identd.c do-install: ${INSTALL_DIR} ${IDIR_FAKEIDENTD}/usr/sbin - ${INSTALL_DIR} ${IDIR_FAKEIDENTD}/etc/init.d ${INSTALL_BIN} ${WRKBUILD}/fakeidentd ${IDIR_FAKEIDENTD}/usr/sbin/ - ${CP} ./files/${PKG_NAME}.init \ - ${IDIR_FAKEIDENTD}/etc/init.d/${PKG_NAME} include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fakeidentd/files/fakeidentd.init b/package/fakeidentd/files/fakeidentd.init index 284940a..d145a69 100644 --- a/package/fakeidentd/files/fakeidentd.init +++ b/package/fakeidentd/files/fakeidentd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 75 +#PKG fakeidentd +#INIT 75 . /etc/rc.conf case $1 in diff --git a/package/fakeidentd/files/fakeidentd.postinst b/package/fakeidentd/files/fakeidentd.postinst new file mode 100644 index 0000000..1a65cf2 --- /dev/null +++ b/package/fakeidentd/files/fakeidentd.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf fakeidentd fakeidentd NO +add_rcconf fakeidentd_flags fakeidentd_flags "username" diff --git a/package/fakeidentd/ipkg/fakeidentd.control b/package/fakeidentd/ipkg/fakeidentd.control deleted file mode 100644 index 6c528b2..0000000 --- a/package/fakeidentd/ipkg/fakeidentd.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: fakeidentd -Description: A static, secure identd. -Section: net -Priority: optional diff --git a/package/fakeidentd/ipkg/fakeidentd.postinst b/package/fakeidentd/ipkg/fakeidentd.postinst deleted file mode 100644 index 1a65cf2..0000000 --- a/package/fakeidentd/ipkg/fakeidentd.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf fakeidentd fakeidentd NO -add_rcconf fakeidentd_flags fakeidentd_flags "username" diff --git a/package/fbset/Makefile b/package/fbset/Makefile index 0fd9bf9..23819e5 100644 --- a/package/fbset/Makefile +++ b/package/fbset/Makefile @@ -9,12 +9,13 @@ PKG_NAME:= fbset PKG_VERSION:= 2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= e547cfcbb8c1a4f2a6b8ba4acb8b7164 - -MASTER_SITES:= http://users.telenet.be/geertu/Linux/fbdev/ +PKG_DESCR:= framebuffer utility +PKG_SECTION:= utils +PKG_SITES:= http://users.telenet.be/geertu/Linux/fbdev/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FBSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/fbset/ipkg/fbset.control b/package/fbset/ipkg/fbset.control deleted file mode 100644 index b449b1d..0000000 --- a/package/fbset/ipkg/fbset.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: fbset -Priority: optional -Section: net -Description: framebuffer utility diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 7e90d1a..f35bc9f 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -9,32 +9,33 @@ PKG_NAME:= fetchmail PKG_VERSION:= 6.3.9 PKG_RELEASE:= 1 PKG_MD5SUM:= 72c20ad2b9629f1a109668b05a84d823 -MASTER_SITES:= http://download.berlios.de/fetchmail/ +PKG_DESCR:= fetch mail from a POP, IMAP, ETRN, or ODMR-capable server +PKG_SECTION:= text +PKG_URL:= http://fetchmail.berlios.de/ +PKG_SITES:= http://download.berlios.de/fetchmail/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE})) +ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y) +PKG_DEPENDS:= libopenssl +endif + +$(eval $(call PKG_template,FETCHMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu -CONFIGURE_ENV+= ac_cv_c_bigendian=no \ - ac_cv_sizeof_off_t=8 \ - ac_cv_sizeof_int=4 \ - ac_cv_sizeof_long=4 CONFIGURE_ARGS+= --without-hesiod BUILD_STYLE= auto INSTALL_STYLE= auto ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y) CONFIGURE_ARGS+= --with-ssl='${STAGING_DIR}/usr' -PKG_DEPENDS:= openssl else CONFIGURE_ARGS+= --without-ssl -PKG_DEPENDS:= endif post-install: - echo 'Depends: ${PKG_DEPENDS}' >>${IDIR_FETCHMAIL}/CONTROL/control ${INSTALL_DIR} ${IDIR_FETCHMAIL}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/${PKG_NAME} ${IDIR_FETCHMAIL}/usr/bin/ diff --git a/package/fetchmail/ipkg/fetchmail.control b/package/fetchmail/ipkg/fetchmail.control deleted file mode 100644 index 1e2a464..0000000 --- a/package/fetchmail/ipkg/fetchmail.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: fetchmail -Priority: optional -Section: text -Description: Mail text client diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index e79d1cd..d38b28a 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -9,12 +9,16 @@ PKG_NAME:= ffmpeg PKG_VERSION:= 0.5 PKG_RELEASE:= 2 PKG_MD5SUM:= be8503f15c3b81ba00eb8379ca8dcf33 -MASTER_SITES:= http://www.ffmpeg.org/releases/ +PKG_DESCR:= cross-platform solution to record, convert and stream audio and video +PKG_SECTION:= sound +PKG_URL:= http://www.ffmpeg.org +PKG_SITES:= http://www.ffmpeg.org/releases/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FFMPEG,ffmpeg,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= manual BUILD_STYLE:= auto diff --git a/package/ffmpeg/ipkg/ffmpeg.control b/package/ffmpeg/ipkg/ffmpeg.control deleted file mode 100644 index 0389ef9..0000000 --- a/package/ffmpeg/ipkg/ffmpeg.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ffmpeg -Priority: optional -Section: sound -Description: cross-platform solution to record, convert and stream audio and video diff --git a/package/file/Makefile b/package/file/Makefile index a3a6c17..1c2797e 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -6,27 +6,28 @@ include ${TOPDIR}/rules.mk PKG_NAME:= file -PKG_VERSION:= 4.26 +PKG_VERSION:= 5.03 PKG_RELEASE:= 1 -PKG_MD5SUM:= 74cd5466416136da30a4e69f74dbc7a0 -MASTER_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \ +PKG_MD5SUM:= d05f08a53e5c2f51f8ee6a4758c0cc53 +PKG_DESCR:= a file type guesser +PKG_SECTION:= utils +PKG_URL:= http://www.darwinsys.com/file +PKG_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \ ftp://ftp.astron.com/pub/file/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FILE,${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_FILE}/usr/bin - ${INSTALL_DIR} ${IDIR_FILE}/usr/lib - ${INSTALL_DIR} ${IDIR_FILE}/usr/share/file + ${INSTALL_DIR} ${IDIR_FILE}/usr/bin ${IDIR_FILE}/usr/lib ${IDIR_FILE}/usr/share/misc ${INSTALL_BIN} ${WRKINST}/usr/bin/file ${IDIR_FILE}/usr/bin - ${INSTALL_DATA} ${WRKINST}/usr/share/file/magic.mgc \ - ${IDIR_FILE}/usr/share/file + ${INSTALL_DATA} ${WRKINST}/usr/share/misc/magic.mgc \ + ${IDIR_FILE}/usr/share/misc ${CP} ${WRKINST}/usr/lib/libmagic.so.* ${IDIR_FILE}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/file/ipkg/file.control b/package/file/ipkg/file.control deleted file mode 100644 index f454a01..0000000 --- a/package/file/ipkg/file.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: file -Priority: optional -Section: net -Description: a file type guesser diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile index 8a11ab8..ecf7857 100644 --- a/package/fixesproto/Makefile +++ b/package/fixesproto/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= fixesproto PKG_VERSION:= 4.0 PKG_RELEASE:= 1 PKG_MD5SUM:= ed4af7fbf04a51aca684c259784520f3 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/flac/Makefile b/package/flac/Makefile index 223fd62..ed43436 100644 --- a/package/flac/Makefile +++ b/package/flac/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= flac PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 153c8b15a54da428d1f0fadc756c22c7 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=flac/} +PKG_DESCR:= Free Lossless Audio Codec library +PKG_SECTION:= libs +PKG_URL:= http://flac.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=flac/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-asm-optimizations \ diff --git a/package/flac/ipkg/libflac.control b/package/flac/ipkg/libflac.control deleted file mode 100644 index ea50795..0000000 --- a/package/flac/ipkg/libflac.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libflac -Priority: optional -Section: libs -Description: Free Lossless Audio Codec library diff --git a/package/fontcacheproto/Makefile b/package/fontcacheproto/Makefile index 7107679..6bd625d 100644 --- a/package/fontcacheproto/Makefile +++ b/package/fontcacheproto/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= fontcacheproto PKG_VERSION:= 0.1.2 PKG_RELEASE:= 1 PKG_MD5SUM:= dc8c34a8c3559bf3b008bcdf7ba5a743 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile index e2ba9df..7e71263 100644 --- a/package/fontsproto/Makefile +++ b/package/fontsproto/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= fontsproto PKG_VERSION:= 2.0.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 6c1efa12ae50262b45c91e9a120632b7 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/fping/Makefile b/package/fping/Makefile index 7b794d5..212b5ee 100644 --- a/package/fping/Makefile +++ b/package/fping/Makefile @@ -9,20 +9,24 @@ PKG_NAME:= fping PKG_VERSION:= 2.4b2_to PKG_RELEASE:= 1 PKG_MD5SUM:= d5e8be59e307cef76bc479e1684df705 +PKG_DESCR:= A program to ping hosts in parallel +PKG_SECTION:= net +PKG_URL:= http://fping.sourceforge.net +PKG_SITES:= http://fping.sourceforge.net/download/ + DISTFILES:= ${PKG_NAME}.tar.gz -MASTER_SITES:= http://fping.sourceforge.net/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu do-build: - ${MAKE} -j1 CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS}" -C ${WRKBUILD} clean ${PKG_NAME} + ${MAKE} CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS}" -C ${WRKBUILD} clean ${PKG_NAME} mv ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/${PKG_NAME}4 ifeq ($(ADK_IPV6),y) - ${MAKE} -j1 CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS} -DIPV6=1" -C ${WRKBUILD} clean ${PKG_NAME} + ${MAKE} CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS} -DIPV6=1" -C ${WRKBUILD} clean ${PKG_NAME} mv ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/${PKG_NAME}6 endif diff --git a/package/fping/ipkg/fping.control b/package/fping/ipkg/fping.control deleted file mode 100644 index 964c8db..0000000 --- a/package/fping/ipkg/fping.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: fping -Priority: optional -Section: net -Description: A program to ping hosts in parallel diff --git a/package/fprobe-ulog/Makefile b/package/fprobe-ulog/Makefile index 574f873..31b7596 100644 --- a/package/fprobe-ulog/Makefile +++ b/package/fprobe-ulog/Makefile @@ -9,12 +9,16 @@ PKG_NAME:= fprobe-ulog PKG_VERSION:= 1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= cdb2e4edc47e8a3d5479eeabfb979ebc +PKG_DESCR:= NetFlow probe +PKG_SECTION:= net +PKG_DEPENDS:= libpcap libpthread +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/} + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FPROBE_ULOG,fprobe-ulog,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FPROBE_ULOG,fprobe-ulog,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-piddir=/var \ diff --git a/package/fprobe-ulog/ipkg/fprobe-ulog.control b/package/fprobe-ulog/ipkg/fprobe-ulog.control deleted file mode 100644 index ac1b35e..0000000 --- a/package/fprobe-ulog/ipkg/fprobe-ulog.control +++ /dev/null @@ -1,8 +0,0 @@ -Package: fprobe-ulog -Priority: optional -Section: net -Depends: libpthread -Description: NetFlow probe - networking tool obtaining packets through linux netfilter code - (iptables ULOG target) and emit it as NetFlow flows towards the - specified collector diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile index 959c9a1..53691c1 100644 --- a/package/fprobe/Makefile +++ b/package/fprobe/Makefile @@ -9,12 +9,16 @@ PKG_NAME:= fprobe PKG_VERSION:= 1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 65850d0470078269b33eee58cba77ac2 +PKG_DESCR:= NetFlow probe +PKG_SECTION:= net +PKG_DEPENDS:= libpcap libpthread +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/} + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-piddir=/var \ diff --git a/package/fprobe/ipkg/fprobe.control b/package/fprobe/ipkg/fprobe.control deleted file mode 100644 index 9776366..0000000 --- a/package/fprobe/ipkg/fprobe.control +++ /dev/null @@ -1,7 +0,0 @@ -Package: fprobe -Priority: optional -Section: net -Depends: libpcap, libpthread -Description: NetFlow probe - libpcap-based tool that collect network traffic data - and emit it as NetFlow flows towards the specified collector diff --git a/package/freeradius/Makefile b/package/freeradius/Makefile index f6fece1..f6e4a29 100644 --- a/package/freeradius/Makefile +++ b/package/freeradius/Makefile @@ -9,7 +9,11 @@ PKG_NAME:= freeradius PKG_VERSION:= 2.1.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 07837a2e78028a0fcf5fc3bb5ca292e9 -MASTER_SITES:= ftp://ftp.freeradius.org/pub/radius/ \ +PKG_DESCR:= a flexible RADIUS server +PKG_SECTION:= net +PKG_DEPENDS:= libltdl libopenssl libpthread +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/ @@ -18,7 +22,6 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-server-${PKG_VERSION} PKG_CONFIGURE_OPTIONS:= -# disabled, problems exist when libldap is installed on hostsystem ifneq (${ADK_PACKAGE_FREERADIUS_MOD_LDAP},) PKG_CONFIGURE_LIBS+= -lcrypto -lssl PKG_CONFIGURE_OPTIONS+= \ @@ -66,28 +69,28 @@ ${2}-install: done endef -$(eval $(call PKG_template,FREERADIUS,freeradius,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP,freeradius-mod-eap,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_GTC,freeradius-mod-eap-gtc,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MD5,freeradius-mod-eap-md5,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MSCHAPV2,freeradius-mod-eap-mschapv2,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_PEAP,freeradius-mod-eap-peap,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TLS,freeradius-mod-eap-tls,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TTLS,freeradius-mod-eap-ttls,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FREERADIUS,freeradius,${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})) +$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_mod_template,FREERADIUS_MOD_CHAP,rlm_chap,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_DETAIL,rlm_detail,)) @@ -155,9 +158,6 @@ FAKE_FLAGS+= R="${WRKINST}" \ INSTALLSTRIP="" post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} - ${INSTALL_DIR} ${IDIR_FREERADIUS}/etc/init.d - install -m0755 ./files/radiusd.init \ - ${IDIR_FREERADIUS}/etc/init.d/radiusd ${INSTALL_DIR} ${IDIR_FREERADIUS}/etc/freeradius ${CP} ./files/users ${IDIR_FREERADIUS}/etc/freeradius/ ${INSTALL_DATA} ./files/radiusd.conf ${IDIR_FREERADIUS}/etc/freeradius diff --git a/package/freeradius/files/freeradius-mod-eap.conffiles b/package/freeradius/files/freeradius-mod-eap.conffiles new file mode 100644 index 0000000..7e0e30e --- /dev/null +++ b/package/freeradius/files/freeradius-mod-eap.conffiles @@ -0,0 +1 @@ +/etc/freeradius/eap.conf diff --git a/package/freeradius/files/freeradius-mod-files.conffiles b/package/freeradius/files/freeradius-mod-files.conffiles new file mode 100644 index 0000000..4fcd92b --- /dev/null +++ b/package/freeradius/files/freeradius-mod-files.conffiles @@ -0,0 +1,3 @@ +/etc/freeradius/acct_users +/etc/freeradius/preproxy_users +/etc/freeradius/users diff --git a/package/freeradius/files/freeradius-mod-ldap.conffiles b/package/freeradius/files/freeradius-mod-ldap.conffiles new file mode 100644 index 0000000..ada9faf --- /dev/null +++ b/package/freeradius/files/freeradius-mod-ldap.conffiles @@ -0,0 +1 @@ +/etc/freeradius/ldap.attrmap diff --git a/package/freeradius/files/freeradius-mod-preprocess.conffiles b/package/freeradius/files/freeradius-mod-preprocess.conffiles new file mode 100644 index 0000000..b29cca8 --- /dev/null +++ b/package/freeradius/files/freeradius-mod-preprocess.conffiles @@ -0,0 +1,2 @@ +/etc/freeradius/hints +/etc/freeradius/huntgroups diff --git a/package/freeradius/files/freeradius-mod-realm.conffiles b/package/freeradius/files/freeradius-mod-realm.conffiles new file mode 100644 index 0000000..a4d4126 --- /dev/null +++ b/package/freeradius/files/freeradius-mod-realm.conffiles @@ -0,0 +1 @@ +/etc/freeradius/proxy.conf diff --git a/package/freeradius/files/freeradius-mod-sql.conffiles b/package/freeradius/files/freeradius-mod-sql.conffiles new file mode 100644 index 0000000..8ab119d --- /dev/null +++ b/package/freeradius/files/freeradius-mod-sql.conffiles @@ -0,0 +1 @@ +/etc/freeradius/sql.conf diff --git a/package/freeradius/files/freeradius.conffiles b/package/freeradius/files/freeradius.conffiles new file mode 100644 index 0000000..56552e6 --- /dev/null +++ b/package/freeradius/files/freeradius.conffiles @@ -0,0 +1,2 @@ +/etc/freeradius/clients.conf +/etc/freeradius/radiusd.conf diff --git a/package/freeradius/files/freeradius.postinst b/package/freeradius/files/freeradius.postinst new file mode 100644 index 0000000..c65fa19 --- /dev/null +++ b/package/freeradius/files/freeradius.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf radiusd radiusd NO +gid=$(get_next_gid) +add_group radius $gid +add_user radius $(get_next_uid) $gid /usr/lib/radius diff --git a/package/freeradius/files/radiusd.init b/package/freeradius/files/radiusd.init index 4e47678..818f803 100644 --- a/package/freeradius/files/radiusd.init +++ b/package/freeradius/files/radiusd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 75 +#PKG freeradius +#INIT 75 . /etc/rc.conf case $1 in diff --git a/package/freeradius/ipkg/freeradius-democerts.control b/package/freeradius/ipkg/freeradius-democerts.control deleted file mode 100644 index c77c62a..0000000 --- a/package/freeradius/ipkg/freeradius-democerts.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-democerts -Priority: optional -Section: net -Description: a set of certificates to test FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-chap.control b/package/freeradius/ipkg/freeradius-mod-chap.control deleted file mode 100644 index 36f9453..0000000 --- a/package/freeradius/ipkg/freeradius-mod-chap.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-chap -Priority: optional -Section: net -Description: a CHAP module for FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-detail.control b/package/freeradius/ipkg/freeradius-mod-detail.control deleted file mode 100644 index 8254c00..0000000 --- a/package/freeradius/ipkg/freeradius-mod-detail.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-detail -Priority: optional -Section: net -Description: a detailed accounting module for FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-digest.control b/package/freeradius/ipkg/freeradius-mod-digest.control deleted file mode 100644 index aec5243..0000000 --- a/package/freeradius/ipkg/freeradius-mod-digest.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-digest -Priority: optional -Section: net -Description: digest authentication for FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-eap-gtc.control b/package/freeradius/ipkg/freeradius-mod-eap-gtc.control deleted file mode 100644 index 16fd01a..0000000 --- a/package/freeradius/ipkg/freeradius-mod-eap-gtc.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-eap-gtc -Priority: optional -Section: net -Description: an EAP/GTC module for FreeRADIUS -Depends: freeradius, freeradius-mod-eap diff --git a/package/freeradius/ipkg/freeradius-mod-eap-md5.control b/package/freeradius/ipkg/freeradius-mod-eap-md5.control deleted file mode 100644 index 7c060b4..0000000 --- a/package/freeradius/ipkg/freeradius-mod-eap-md5.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-eap-md5 -Priority: optional -Section: net -Description: an EAP/MD5 module for FreeRADIUS -Depends: freeradius, freeradius-mod-eap diff --git a/package/freeradius/ipkg/freeradius-mod-eap-mschapv2.control b/package/freeradius/ipkg/freeradius-mod-eap-mschapv2.control deleted file mode 100644 index b4e23f4..0000000 --- a/package/freeradius/ipkg/freeradius-mod-eap-mschapv2.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-eap-mschapv2 -Priority: optional -Section: net -Description: an EAP/MS-CHAPv2 module for FreeRADIUS -Depends: freeradius, freeradius-mod-eap diff --git a/package/freeradius/ipkg/freeradius-mod-eap-peap.control b/package/freeradius/ipkg/freeradius-mod-eap-peap.control deleted file mode 100644 index cfd8aec..0000000 --- a/package/freeradius/ipkg/freeradius-mod-eap-peap.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-eap-peap -Priority: optional -Section: net -Description: an EAP/PEAP module for FreeRADIUS -Depends: freeradius, freeradius-mod-eap, freeradius-mod-eap-tls diff --git a/package/freeradius/ipkg/freeradius-mod-eap-tls.control b/package/freeradius/ipkg/freeradius-mod-eap-tls.control deleted file mode 100644 index 3f09ceb..0000000 --- a/package/freeradius/ipkg/freeradius-mod-eap-tls.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-eap-tls -Priority: optional -Section: net -Description: an EAP/TLS module for FreeRADIUS -Depends: freeradius, freeradius-mod-eap diff --git a/package/freeradius/ipkg/freeradius-mod-eap-ttls.control b/package/freeradius/ipkg/freeradius-mod-eap-ttls.control deleted file mode 100644 index 84be74c..0000000 --- a/package/freeradius/ipkg/freeradius-mod-eap-ttls.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-eap-ttls -Priority: optional -Section: net -Description: an EAP/TTLS module for FreeRADIUS -Depends: freeradius, freeradius-mod-eap, freeradius-mod-eap-tls diff --git a/package/freeradius/ipkg/freeradius-mod-eap.conffiles b/package/freeradius/ipkg/freeradius-mod-eap.conffiles deleted file mode 100644 index 7e0e30e..0000000 --- a/package/freeradius/ipkg/freeradius-mod-eap.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/freeradius/eap.conf diff --git a/package/freeradius/ipkg/freeradius-mod-eap.control b/package/freeradius/ipkg/freeradius-mod-eap.control deleted file mode 100644 index f01a045..0000000 --- a/package/freeradius/ipkg/freeradius-mod-eap.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-eap -Priority: optional -Section: net -Description: an EAP module for FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-files.conffiles b/package/freeradius/ipkg/freeradius-mod-files.conffiles deleted file mode 100644 index 4fcd92b..0000000 --- a/package/freeradius/ipkg/freeradius-mod-files.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/freeradius/acct_users -/etc/freeradius/preproxy_users -/etc/freeradius/users diff --git a/package/freeradius/ipkg/freeradius-mod-files.control b/package/freeradius/ipkg/freeradius-mod-files.control deleted file mode 100644 index 5126aa1..0000000 --- a/package/freeradius/ipkg/freeradius-mod-files.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-files -Priority: optional -Section: net -Description: a module for FreeRADIUS, using local files for authorization -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-ldap.conffiles b/package/freeradius/ipkg/freeradius-mod-ldap.conffiles deleted file mode 100644 index ada9faf..0000000 --- a/package/freeradius/ipkg/freeradius-mod-ldap.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/freeradius/ldap.attrmap diff --git a/package/freeradius/ipkg/freeradius-mod-ldap.control b/package/freeradius/ipkg/freeradius-mod-ldap.control deleted file mode 100644 index 7649e6e..0000000 --- a/package/freeradius/ipkg/freeradius-mod-ldap.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-ldap -Priority: optional -Section: net -Description: an LDAP module for FreeRADIUS -Depends: freeradius, libopenldap, libopenssl, libsasl2 diff --git a/package/freeradius/ipkg/freeradius-mod-mschap.control b/package/freeradius/ipkg/freeradius-mod-mschap.control deleted file mode 100644 index 69edfd6..0000000 --- a/package/freeradius/ipkg/freeradius-mod-mschap.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-mschap -Priority: optional -Section: net -Description: an MS-CHAP and MS-CHAPv2 module for FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-pap.control b/package/freeradius/ipkg/freeradius-mod-pap.control deleted file mode 100644 index e094b6a..0000000 --- a/package/freeradius/ipkg/freeradius-mod-pap.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-pap -Priority: optional -Section: net -Description: a PAP module for FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-preprocess.conffiles b/package/freeradius/ipkg/freeradius-mod-preprocess.conffiles deleted file mode 100644 index b29cca8..0000000 --- a/package/freeradius/ipkg/freeradius-mod-preprocess.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/freeradius/hints -/etc/freeradius/huntgroups diff --git a/package/freeradius/ipkg/freeradius-mod-preprocess.control b/package/freeradius/ipkg/freeradius-mod-preprocess.control deleted file mode 100644 index 7adc171..0000000 --- a/package/freeradius/ipkg/freeradius-mod-preprocess.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-preprocess -Priority: optional -Section: net -Description: a request preprocessing module for FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-realm.conffiles b/package/freeradius/ipkg/freeradius-mod-realm.conffiles deleted file mode 100644 index a4d4126..0000000 --- a/package/freeradius/ipkg/freeradius-mod-realm.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/freeradius/proxy.conf diff --git a/package/freeradius/ipkg/freeradius-mod-realm.control b/package/freeradius/ipkg/freeradius-mod-realm.control deleted file mode 100644 index 3f84e36..0000000 --- a/package/freeradius/ipkg/freeradius-mod-realm.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-realm -Priority: optional -Section: net -Description: a realm module for FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-mod-sql-mysql.control b/package/freeradius/ipkg/freeradius-mod-sql-mysql.control deleted file mode 100644 index 532cbd0..0000000 --- a/package/freeradius/ipkg/freeradius-mod-sql-mysql.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-sql-mysql -Priority: optional -Section: net -Description: a MySQL module for FreeRADIUS -Depends: freeradius, freeradius-mod-sql, libmysqlclient diff --git a/package/freeradius/ipkg/freeradius-mod-sql-pgsql.control b/package/freeradius/ipkg/freeradius-mod-sql-pgsql.control deleted file mode 100644 index 31e3080..0000000 --- a/package/freeradius/ipkg/freeradius-mod-sql-pgsql.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-sql-pgsql -Priority: optional -Section: net -Description: a PostgreSQL module for FreeRADIUS -Depends: freeradius, freeradius-mod-sql, libpq diff --git a/package/freeradius/ipkg/freeradius-mod-sql.conffiles b/package/freeradius/ipkg/freeradius-mod-sql.conffiles deleted file mode 100644 index 8ab119d..0000000 --- a/package/freeradius/ipkg/freeradius-mod-sql.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/freeradius/sql.conf diff --git a/package/freeradius/ipkg/freeradius-mod-sql.control b/package/freeradius/ipkg/freeradius-mod-sql.control deleted file mode 100644 index e4040ac..0000000 --- a/package/freeradius/ipkg/freeradius-mod-sql.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-mod-sql -Priority: optional -Section: net -Description: an SQL module for FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius-utils.control b/package/freeradius/ipkg/freeradius-utils.control deleted file mode 100644 index b29c94d..0000000 --- a/package/freeradius/ipkg/freeradius-utils.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius-utils -Priority: optional -Section: net -Description: some client utilities for FreeRADIUS -Depends: freeradius diff --git a/package/freeradius/ipkg/freeradius.conffiles b/package/freeradius/ipkg/freeradius.conffiles deleted file mode 100644 index 56552e6..0000000 --- a/package/freeradius/ipkg/freeradius.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/freeradius/clients.conf -/etc/freeradius/radiusd.conf diff --git a/package/freeradius/ipkg/freeradius.control b/package/freeradius/ipkg/freeradius.control deleted file mode 100644 index 329d329..0000000 --- a/package/freeradius/ipkg/freeradius.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: freeradius -Priority: optional -Section: net -Description: a flexible RADIUS server -Depends: libltdl, libopenssl, libpthread diff --git a/package/freeradius/ipkg/freeradius.postinst b/package/freeradius/ipkg/freeradius.postinst deleted file mode 100644 index c65fa19..0000000 --- a/package/freeradius/ipkg/freeradius.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf radiusd radiusd NO -gid=$(get_next_gid) -add_group radius $gid -add_user radius $(get_next_uid) $gid /usr/lib/radius diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 6d14697..d9cd8bf 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -6,16 +6,21 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libfreetype -PKG_VERSION:= 2.1.9 +PKG_VERSION:= 2.3.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= ec1b903e4be5f073caa72458ea58c29c +PKG_MD5SUM:= d76233108aca9c9606cdbd341562ad9a +PKG_DESCR:= A free, high-quality and portable font engine +PKG_SECTION:= libs +PKG_DEPENDS:= zlib +PKG_URL:= http://www.freetype.org +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/} + DISTFILES:= freetype-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/} WRKDIST= ${WRKDIR}/freetype-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/freetype/ipkg/libfreetype.control b/package/freetype/ipkg/libfreetype.control deleted file mode 100644 index c1e0ec5..0000000 --- a/package/freetype/ipkg/libfreetype.control +++ /dev/null @@ -1,16 +0,0 @@ -Package: libfreetype -Priority: optional -Section: libs -Depends: zlib -Description: A free, high-quality and portable font engine. - The FreeType project is a team of volunteers who develop free, - portable and high-quality software solutions for digital typography. - They specifically target embedded systems and focus on bringing small, - efficient and ubiquitous products. - . - The FreeType 2 library is their new software font engine. It has been - designed to provide the following important features: - * A universal and simple API to manage font files - * Support for several font formats through loadable modules - * High-quality anti-aliasing - * High portability & performance diff --git a/package/frickin/Makefile b/package/frickin/Makefile index 1b4fe10..2e30b66 100644 --- a/package/frickin/Makefile +++ b/package/frickin/Makefile @@ -9,19 +9,18 @@ PKG_NAME:= frickin PKG_VERSION:= 1.3 PKG_RELEASE:= 9 PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/} +PKG_DESCR:= PPTP proxy +PKG_SECTION: net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FRICKIN,frickin,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FRICKIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto do-install: - ${INSTALL_DIR} ${IDIR_FRICKIN}/etc/init.d ${INSTALL_DIR} ${IDIR_FRICKIN}/usr/sbin - ${INSTALL_BIN} ./files/frickin.init \ - ${IDIR_FRICKIN}/etc/init.d/frickin ${INSTALL_BIN} ${WRKBUILD}/frickin ${IDIR_FRICKIN}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/frickin/files/frickin.init b/package/frickin/files/frickin.init index 2c3a117..4e63232 100644 --- a/package/frickin/files/frickin.init +++ b/package/frickin/files/frickin.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 75 +#PKG frickin +#INIT 75 . /etc/rc.conf case $1 in diff --git a/package/frickin/files/frickin.postinst b/package/frickin/files/frickin.postinst new file mode 100644 index 0000000..e7dfd06 --- /dev/null +++ b/package/frickin/files/frickin.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf frickin frickin NO +add_rcconf frickin_flags frickin_flags "" diff --git a/package/frickin/ipkg/frickin.control b/package/frickin/ipkg/frickin.control deleted file mode 100644 index a8b3fb4..0000000 --- a/package/frickin/ipkg/frickin.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: frickin -Priority: optional -Section: net -Description: PPTP (Point-to-Point Tunneling Protocol) proxy diff --git a/package/frickin/ipkg/frickin.postinst b/package/frickin/ipkg/frickin.postinst deleted file mode 100644 index e7dfd06..0000000 --- a/package/frickin/ipkg/frickin.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf frickin frickin NO -add_rcconf frickin_flags frickin_flags "" diff --git a/package/fuse/Makefile b/package/fuse/Makefile index e3cf2d1..e7acd10 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= fuse PKG_VERSION:= 2.7.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 4879f06570d2225667534c37fea04213 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} +PKG_DESCR:= Filesystem in Userspace (utilities) +PKG_SECTION:= admin +PKG_DEPENDS:= kmod-fuse libfuse +PKG_URL:= http://fuse.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-lib \ @@ -26,8 +30,6 @@ CONFIGURE_ARGS+= --enable-lib \ --disable-kernel-module BUILD_STYLE= auto INSTALL_STYLE= auto confprog -XAKE_FLAGS+= ARCH='${KERNEL_ARCH}' \ - CROSS_COMPILE='${TARGET_CROSS}' post-install: ${INSTALL_DIR} ${IDIR_FUSE_UTILS}/usr/bin diff --git a/package/fuse/ipkg/fuse-utils.control b/package/fuse/ipkg/fuse-utils.control deleted file mode 100644 index cfbd7bb..0000000 --- a/package/fuse/ipkg/fuse-utils.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: fuse-utils -Priority: optional -Section: admin -Depends: kmod-fuse, libfuse -Description: Filesystem in Userspace (utilities) diff --git a/package/fuse/ipkg/libfuse.control b/package/fuse/ipkg/libfuse.control deleted file mode 100644 index 9c3bcb5..0000000 --- a/package/fuse/ipkg/libfuse.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libfuse -Priority: optional -Section: libs -Depends: libpthread -Description: Filesystem in Userspace (library) diff --git a/package/gatling/Makefile b/package/gatling/Makefile index 0030131..7e6b407 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -6,16 +6,20 @@ include ${TOPDIR}/rules.mk PKG_NAME= gatling -PKG_VERSION= 0.8 +PKG_VERSION= 0.10 PKG_RELEASE= 1 -PKG_MD5SUM= 75e04c0821622ac7c35236bb2a50c31c +PKG_MD5SUM= 04e8434156d91657c77a8a038c5b27cf +PKG_DESCR:= small non-forking webserver +PKG_SECTION:= net +PKG_DEPENDS:= libiconv +PKG_URL:= http://www.fefe.de/gatling +PKG_SITES= http://dl.fefe.de/ -MASTER_SITES= http://dl.fefe.de/ DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GATLING,gatling,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GATLING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto MAKE_FILE= GNUmakefile diff --git a/package/gatling/ipkg/gatling.control b/package/gatling/ipkg/gatling.control deleted file mode 100644 index 13bd592..0000000 --- a/package/gatling/ipkg/gatling.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: gatling -Priority: optional -Section: net -Description: non-forking webserver -Depends: libiconv diff --git a/package/gatling/patches/patch-gatling_c b/package/gatling/patches/patch-gatling_c deleted file mode 100644 index cd70416..0000000 --- a/package/gatling/patches/patch-gatling_c +++ /dev/null @@ -1,73 +0,0 @@ -$Id$ ---- gatling-0.8.orig/gatling.c 2005-05-20 17:32:27.000000000 +0200 -+++ gatling-0.8/gatling.c 2007-07-06 17:55:56.000000000 +0200 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -865,24 +866,6 @@ static inline int issafe(unsigned char c - return (c!='"' && c!='%' && c>=' ' && c!='+'); - } - --unsigned long fmt_urlencoded(char* dest,const char* src,unsigned long len) { -- register const unsigned char* s=(const unsigned char*) src; -- unsigned long written=0,i; -- for (i=0; i>4); -- dest[written+2]=fmt_tohex(s[i]&15); -- } -- written+=3; -- } else { -- if (dest) dest[written]=s[i]; ++written; -- } -- } -- return written; --} -- - void catencoded(array* a,char* s) { - unsigned int len=str_len(s); - char* buf=alloca(fmt_urlencoded(0,s,len)); -@@ -1011,7 +994,7 @@ username2:password2 - * authentication was OK or -1 if authentication is needed (the HTTP - * response was then already written to the iob). */ - int http_dohtaccess(struct http_data* h) { -- unsigned long filesize; -+ size_t filesize; - char* map; - char* s; - char* auth; -@@ -1031,7 +1014,8 @@ int http_dohtaccess(struct http_data* h) - char* username,* password; - char* decoded; - int i; -- unsigned long l,dl,ul; -+ unsigned long l,ul; -+ size_t dl; - auth+=6; - while (*auth==' ' || *auth=='\t') ++auth; - i=str_chr(auth,'\n'); -@@ -1103,7 +1087,7 @@ int64 http_openfile(struct http_data* h, - char* dir=0; - char* s; - char* args; -- unsigned long i; -+ size_t i; - int64 fd; - int doesgzip,doesbzip2; - -@@ -2948,7 +2932,7 @@ void forkslave(int fd,buffer* in) { - j=str_chr(x,'\n'); if (j && x[j-1]=='\r') { --j; } - k=str_chr(x,' '); - if (k> ${IDIR_HEIMDAL_SERVER}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/heimdal/files/heimdal-server.postinst b/package/heimdal/files/heimdal-server.postinst new file mode 100644 index 0000000..401d7bf --- /dev/null +++ b/package/heimdal/files/heimdal-server.postinst @@ -0,0 +1,8 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf "heimdal kdc" kdc NO +add_service kerberos 88/tcp +add_service kerberos 88/udp +add_service kerberos-adm 749/tcp +add_service kpasswd 464/tcp +add_service kpasswd 464/udp diff --git a/package/heimdal/files/heimdal.init b/package/heimdal/files/heimdal.init index fad5a78..2e87f49 100644 --- a/package/heimdal/files/heimdal.init +++ b/package/heimdal/files/heimdal.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 70 +#PKG heimdal-server +#INIT 70 . /etc/rc.conf case $1 in diff --git a/package/heimdal/ipkg/heimdal-client-libs.control b/package/heimdal/ipkg/heimdal-client-libs.control deleted file mode 100644 index 550a6bb..0000000 --- a/package/heimdal/ipkg/heimdal-client-libs.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: heimdal-client-libs -Priority: optional -Section: net -Depends: libopenssl, libpthread -Description: heimdal kerberos client tool libraries diff --git a/package/heimdal/ipkg/heimdal-libs.control b/package/heimdal/ipkg/heimdal-libs.control deleted file mode 100644 index 5a16125..0000000 --- a/package/heimdal/ipkg/heimdal-libs.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: heimdal-libs -Priority: optional -Section: net -Depends: libopenssl, libpthread -Description: heimdal kerberos libraries diff --git a/package/heimdal/ipkg/heimdal-server.control b/package/heimdal/ipkg/heimdal-server.control deleted file mode 100644 index 81c33a9..0000000 --- a/package/heimdal/ipkg/heimdal-server.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: heimdal-server -Priority: optional -Section: net -Description: heimdal kerberos server diff --git a/package/heimdal/ipkg/heimdal-server.postinst b/package/heimdal/ipkg/heimdal-server.postinst deleted file mode 100644 index 401d7bf..0000000 --- a/package/heimdal/ipkg/heimdal-server.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf "heimdal kdc" kdc NO -add_service kerberos 88/tcp -add_service kerberos 88/udp -add_service kerberos-adm 749/tcp -add_service kpasswd 464/tcp -add_service kpasswd 464/udp diff --git a/package/heyu/Makefile b/package/heyu/Makefile index a87affd..7e9efc5 100644 --- a/package/heyu/Makefile +++ b/package/heyu/Makefile @@ -6,15 +6,20 @@ include ${TOPDIR}/rules.mk PKG_NAME:= heyu -PKG_VERSION:= 2.3.2 +PKG_VERSION:= 2.6.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= af3eeeaa8c432e5b3510f4df6dd39f4f +PKG_MD5SUM:= 9c7624b61ea39bbfa70336dc703cd5f1 +PKG_DESCR:= X10 home automation control using the CM11A +PKG_SECTION:= misc +PKG_DEPENDS:= setserial +PKG_URL:= http://heyu.tanj.com +PKG_SITES:= http://heyu.tanj.com/download/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz -MASTER_SITES:= http://heyu.tanj.com/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-build: (cd ${WRKBUILD} && ${BASH} ./Configure); diff --git a/package/heyu/files/files/heyu.conffiles b/package/heyu/files/files/heyu.conffiles new file mode 100644 index 0000000..f3c36bc --- /dev/null +++ b/package/heyu/files/files/heyu.conffiles @@ -0,0 +1 @@ +/etc/heyu/x10.conf diff --git a/package/heyu/ipkg/files/heyu.conffiles b/package/heyu/ipkg/files/heyu.conffiles deleted file mode 100644 index f3c36bc..0000000 --- a/package/heyu/ipkg/files/heyu.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/heyu/x10.conf diff --git a/package/heyu/ipkg/heyu.control b/package/heyu/ipkg/heyu.control deleted file mode 100644 index e888f23..0000000 --- a/package/heyu/ipkg/heyu.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: heyu -Priority: optional -Section: misc -Source: buildroot internal -Description: X10 home automation control using the CM11A -Depends: setserial diff --git a/package/heyu/patches/patch-tty_c b/package/heyu/patches/patch-tty_c index d5a83ff..cb8acf6 100644 --- a/package/heyu/patches/patch-tty_c +++ b/package/heyu/patches/patch-tty_c @@ -1,8 +1,8 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- heyu-2.3.2.orig/tty.c 2008-04-14 00:40:24.000000000 +0200 -+++ heyu-2.3.2/tty.c 2008-10-09 14:57:18.000000000 +0200 -@@ -396,7 +396,7 @@ char *make_lock_name ( char *ttydev ) - char err_string[200]; +--- heyu-2.6.0.orig/tty.c 2009-01-19 03:57:00.000000000 +0100 ++++ heyu-2.6.0/tty.c 2009-05-29 14:08:06.087764489 +0200 +@@ -395,7 +395,7 @@ char *make_lock_name ( char *ttydev ) + struct stat stat_buf; /* strip the leading path name */ - ptr = rindex(ttydev, '/'); diff --git a/package/heyu/patches/patch-x10state_c b/package/heyu/patches/patch-x10state_c new file mode 100644 index 0000000..c56f248 --- /dev/null +++ b/package/heyu/patches/patch-x10state_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- heyu-2.6.0.orig/x10state.c 2009-04-21 00:45:51.000000000 +0200 ++++ heyu-2.6.0/x10state.c 2009-05-29 14:17:51.812378291 +0200 +@@ -5601,7 +5601,7 @@ char **create_noenv_environment ( LAUNCH + + // launcherp = configp->launcherp; + +- if ( daemon == D_RELAY || (index >= 0 && launcherp && launcherp->type == L_POWERFAIL) ) ++ if ( daemon == D_RELAY || (launcherp && launcherp->type == L_POWERFAIL) ) + putenv("HEYU_PARENT=RELAY"); + else + putenv("HEYU_PARENT=ENGINE"); diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index f33a61f..faf9fbd 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -9,17 +9,20 @@ PKG_NAME:= hostapd PKG_VERSION:= 0.6.9 PKG_RELEASE:= 1 PKG_MD5SUM:= 83630d11fa66ade9091f1b304fccd74c -MASTER_SITES:= http://hostap.epitest.fi/releases/ +PKG_DESCR:= an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator +PKG_SECTION:= net +PKG_DEPENDS:= libopenssl +PKG_URL:= http://hostap.epitest.fi +PKG_SITES:= http://hostap.epitest.fi/releases/ WRKSRC= ${WRKDIST}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto -#MAKE_FLAGS+= OPTFLAGS="${TARGET_CFLAGS}" do-configure: ${CP} ./files/hostapd.config ${WRKBUILD}/.config diff --git a/package/hostapd/files/hostapd.conffiles b/package/hostapd/files/hostapd.conffiles new file mode 100644 index 0000000..f619800 --- /dev/null +++ b/package/hostapd/files/hostapd.conffiles @@ -0,0 +1 @@ +/etc/hostapd.conf diff --git a/package/hostapd/ipkg/hostapd-utils.control b/package/hostapd/ipkg/hostapd-utils.control deleted file mode 100644 index 5f8d82d..0000000 --- a/package/hostapd/ipkg/hostapd-utils.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: hostapd-utils -Priority: optional -Section: net -Depends: hostapd -Description: an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator (CLI utility) diff --git a/package/hostapd/ipkg/hostapd.conffiles b/package/hostapd/ipkg/hostapd.conffiles deleted file mode 100644 index f619800..0000000 --- a/package/hostapd/ipkg/hostapd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/hostapd.conf diff --git a/package/hostapd/ipkg/hostapd.control b/package/hostapd/ipkg/hostapd.control deleted file mode 100644 index cb2dac6..0000000 --- a/package/hostapd/ipkg/hostapd.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: hostapd -Priority: optional -Section: net -Depends: kmod-madwifi, libopenssl -Provides: hostpad -Description: an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile index 2f2e32c..628ddca 100644 --- a/package/htpdate/Makefile +++ b/package/htpdate/Makefile @@ -6,21 +6,21 @@ include ${TOPDIR}/rules.mk PKG_NAME:= htpdate -PKG_VERSION:= 0.9.0 -PKG_RELEASE:= 9 -PKG_MD5SUM:= 12cf883c5619cf4c13a62f77f1a55b54 -MASTER_SITES:= http://www.clevervest.com/htp/archive/c/ +PKG_VERSION:= 1.0.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 82953fe72d2f40411585222f85f2afab +PKG_DESCR:= an HTP (Hypertext Time Protocol) implementation +PKG_SECTION:= net +PKG_URL:= http://www.clevervest.com/twiki/bin/view/HTP +PKG_SITES:= http://www.clevervest.com/htp/archive/c/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,HTPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto do-install: - ${INSTALL_DIR} ${IDIR_HTPDATE}/etc/init.d/ - ${INSTALL_BIN} ./files/htpdate.init \ - ${IDIR_HTPDATE}/etc/init.d/htpdate ${INSTALL_DIR} ${IDIR_HTPDATE}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/htpdate ${IDIR_HTPDATE}/usr/sbin/ diff --git a/package/htpdate/files/htpdate.init b/package/htpdate/files/htpdate.init index 3c291ef..4457e43 100644 --- a/package/htpdate/files/htpdate.init +++ b/package/htpdate/files/htpdate.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG htpdate +#INIT 60 + . /etc/rc.conf case $1 in @@ -21,6 +23,5 @@ restart) *) echo "usage: $0 {start | stop | restart}" exit 1 - esac exit $? diff --git a/package/htpdate/files/htpdate.postinst b/package/htpdate/files/htpdate.postinst new file mode 100644 index 0000000..baf1496 --- /dev/null +++ b/package/htpdate/files/htpdate.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf htpdate htpdate NO +add_rcconf htpdate_flags htpdate_flags "www.google.com www.yahoo.com www.linux.org www.freebsd.org" diff --git a/package/htpdate/ipkg/htpdate.control b/package/htpdate/ipkg/htpdate.control deleted file mode 100644 index cdb470c..0000000 --- a/package/htpdate/ipkg/htpdate.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: htpdate -Priority: optional -Section: net -Description: an HTP (Hypertext Time Protocol) implementation diff --git a/package/htpdate/ipkg/htpdate.postinst b/package/htpdate/ipkg/htpdate.postinst deleted file mode 100644 index baf1496..0000000 --- a/package/htpdate/ipkg/htpdate.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf htpdate htpdate NO -add_rcconf htpdate_flags htpdate_flags "www.google.com www.yahoo.com www.linux.org www.freebsd.org" diff --git a/package/htpdate/patches/patch-Makefile b/package/htpdate/patches/patch-Makefile index edd5b9c..46b1a9c 100644 --- a/package/htpdate/patches/patch-Makefile +++ b/package/htpdate/patches/patch-Makefile @@ -1,14 +1,14 @@ -$Id$ ---- htpdate-0.9.0.orig/Makefile Sun Dec 11 22:34:35 2005 -+++ htpdate-0.9.0/Makefile Tue Jan 16 23:47:33 2007 +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- htpdate-1.0.3.orig/Makefile 2008-09-02 22:24:09.000000000 +0200 ++++ htpdate-1.0.3/Makefile 2009-05-29 14:24:39.045810534 +0200 @@ -2,8 +2,8 @@ prefix = /usr bindir = ${prefix}/bin mandir = ${prefix}/share/man -CC = gcc --CFLAGS += -Wall -ansi -Os -DDEBUG +-CFLAGS += -Wall -pedantic -ansi -O2 +CC ?= gcc -+CFLAGS ?= -Wall -ansi -Os -DDEBUG ++CFLAGS ?= -Wall -pedantic -ansi -O2 + #CFLAGS += -Wall -ansi -O2 INSTALL = /usr/bin/install -c - STRIP = /usr/bin/strip -s diff --git a/package/htpdate/patches/patch-htpdate_c b/package/htpdate/patches/patch-htpdate_c new file mode 100644 index 0000000..6dec284 --- /dev/null +++ b/package/htpdate/patches/patch-htpdate_c @@ -0,0 +1,55 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- htpdate-1.0.3.orig/htpdate.c 2008-09-02 22:24:09.000000000 +0200 ++++ htpdate-1.0.3/htpdate.c 2009-05-29 14:28:27.252071728 +0200 +@@ -351,6 +351,7 @@ static int setclock( double timedelta, i + } + + ++#if 0 + static int htpdate_adjtimex( double drift ) { + struct timex tmx; + long freq; +@@ -379,6 +380,7 @@ static int htpdate_adjtimex( double drif + } + + } ++#endif + + + static void showhelp() { +@@ -404,7 +406,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid + -s set time\n\ + -t turn off sanity time check\n\ + -u run daemon as user\n\ +- -x adjust kernel clock\n\ + host web server hostname or ip address (maximum of 16)\n\ + port port number (default 80 and 8080 for proxy server)\n"); + +@@ -584,9 +585,11 @@ int main( int argc, char *argv[] ) { + } + } + break; ++#if 0 + case 'x': /* adjust time and "kernel" */ + setmode = 3; + break; ++#endif + case 'D': /* run as daemon */ + daemonize = 1; + logmode = 1; +@@ -777,6 +780,7 @@ int main( int argc, char *argv[] ) { + printlog( 0, "Drift %.2f PPM, %.2f s/day", \ + drift*1e6, drift*86400 ); + ++#if 0 + /* Adjust system clock */ + if ( setmode == 3 ) { + starttime = time(NULL); +@@ -787,6 +791,7 @@ int main( int argc, char *argv[] ) { + /* Drop root privileges again */ + if ( sw_uid ) seteuid( sw_uid ); + } ++#endif + } else { + starttime = time(NULL); + } diff --git a/package/httping/Config.in b/package/httping/Config.in index 10c77ae..f7166e2 100644 --- a/package/httping/Config.in +++ b/package/httping/Config.in @@ -1,5 +1,3 @@ -#menu "httping........................... Httping is like 'ping' but for http-requests." - config ADK_PACKAGE_HTTPING prompt "httping........................... Httping is like 'ping' but for http-requests." tristate @@ -11,11 +9,3 @@ config ADK_PACKAGE_HTTPING transmission across the network also takes time! http://www.vanheusden.com/httping/ - -config ADK_PACKAGE_HTTPING_WITH_SSL - prompt " Enable SSL support" - bool - default y - depends ADK_PACKAGE_HTTPING - -#endmenu diff --git a/package/httping/Makefile b/package/httping/Makefile index eadc97d..64ebd15 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -6,29 +6,25 @@ include ${TOPDIR}/rules.mk PKG_NAME:= httping -PKG_VERSION:= 1.2.3 +PKG_VERSION:= 1.3.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= b257586da8acec18185c134ed86d2fdd -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz -MASTER_SITES:= http://www.vanheusden.com/httping/ +PKG_MD5SUM:= 41c912a9ecc904e51d7260053fc2195c +PKG_DESCR:= Httping is like 'ping' but for http-requests +PKG_SECTION:= net +PKG_DEPENDS:= libopenssl +PKG_SITES:= http://www.vanheusden.com/httping/ -PKG_DEPEND=libopenssl -ifneq (${ADK_PACKAGE_HTTPING_WITH_SSL},y) -SSL_ENABLE:=".nossl" -PKG_DEPEND:="" -endif +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -do-build: - ${MAKE} -C ${WRKBUILD} -f ${WRKBUILD}/Makefile${SSL_ENABLE} \ - CC="${TARGET_CC}" STAGING_DIR=${STAGING_DIR} +MAKE_FLAGS+= STAGING_DIR=${STAGING_DIR} +BUILD_STYLE:= auto do-install: ${INSTALL_DIR} ${IDIR_HTTPING}/usr/sbin - echo "Depends: ${PKG_DEPEND}" >> ${IDIR_HTTPING}/CONTROL/control ${CP} ${WRKBUILD}/${PKG_NAME} ${IDIR_HTTPING}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/httping/ipkg/httping.control b/package/httping/ipkg/httping.control deleted file mode 100644 index 5ab31d9..0000000 --- a/package/httping/ipkg/httping.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: httping -Section: net -Priority: optional -Description: Httping is like 'ping' but for http-requests. diff --git a/package/httptunnel/Makefile b/package/httptunnel/Makefile index 145018c..58d56e0 100644 --- a/package/httptunnel/Makefile +++ b/package/httptunnel/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= httptunnel PKG_VERSION:= 3.0.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 2a710f377c82ab4eb201458f7b9f99c5 -MASTER_SITES:= http://www.nocrew.org/software/httptunnel/ +PKG_DESCR:= http tunneling software +PKG_SECTION:= net +PKG_URL:= http://www.nocrew.org/software/httptunnel +PKG_SITES:= http://www.nocrew.org/software/httptunnel/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HTTPTUNNEL,httptunnel,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,HTTPTUNNEL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/httptunnel/ipkg/httptunnel.control b/package/httptunnel/ipkg/httptunnel.control deleted file mode 100644 index 45835ff..0000000 --- a/package/httptunnel/ipkg/httptunnel.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: httptunnel -Priority: optional -Section: net -Description: http tunneling software diff --git a/package/icecast/Makefile b/package/icecast/Makefile index 76ece30..3db42ae 100644 --- a/package/icecast/Makefile +++ b/package/icecast/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= icecast PKG_VERSION:= 2.3.2 PKG_RELEASE:= 1 PKG_MD5SUM:= ff516b3ccd2bcc31e68f460cd316093f -MASTER_SITES:= http://downloads.us.xiph.org/releases/icecast/ +PKG_DESCR:= A streaming media server +PKG_SECTION:= net +PKG_DEPENDS:= libcurl libvorbis libpthread libxml2 libxslt +PKG_URL:= http://www.icecast.org/ +PKG_SITES:= http://downloads.us.xiph.org/releases/icecast/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ICECAST,icecast,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ICECAST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TCPPFLAGS+= -I${STAGING_DIR}/usr/include/libxml2 CONFIGURE_STYLE= autotool gnu diff --git a/package/icecast/files/icecast.conffiles b/package/icecast/files/icecast.conffiles new file mode 100644 index 0000000..1203e9d --- /dev/null +++ b/package/icecast/files/icecast.conffiles @@ -0,0 +1 @@ +/etc/icecast.xml diff --git a/package/icecast/ipkg/icecast.conffiles b/package/icecast/ipkg/icecast.conffiles deleted file mode 100644 index 1203e9d..0000000 --- a/package/icecast/ipkg/icecast.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/icecast.xml diff --git a/package/icecast/ipkg/icecast.control b/package/icecast/ipkg/icecast.control deleted file mode 100644 index 4df9d50..0000000 --- a/package/icecast/ipkg/icecast.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: icecast -Priority: optional -Section: net -Depends: libcurl, libvorbisidec, libpthread, libxml2, libxslt -Description: A streaming media server diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index edd6d22..3eb5c56 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -9,18 +9,21 @@ PKG_NAME:= id3lib PKG_VERSION:= 3.8.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 19f27ddd2dda4b2d26a559a4f0f402a7 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=id3lib/} +PKG_DESCR:= An ID3v1/ID3v2 tagging library +PKG_SECTION:= libs +PKG_DEPENDS:= zlib libiconv +PKG_URL:= http://id3lib.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=id3lib/} -PKG_DEPEND:= zlib libiconv ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y) -PKG_DEPEND+= uclibc++ +PKG_DEPENDS+= uclibc++ else -PKG_DEPEND+= libstdcxx +PKG_DEPENDS+= libstdcxx endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND})) +$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-cxx-warnings=no diff --git a/package/id3lib/ipkg/id3lib.control b/package/id3lib/ipkg/id3lib.control deleted file mode 100644 index 2a7b02a..0000000 --- a/package/id3lib/ipkg/id3lib.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: id3lib -Priority: optional -Section: libs -Description: An ID3v1/ID3v2 tagging library. diff --git a/package/iftop/Makefile b/package/iftop/Makefile index 87d732a..1c12373 100644 --- a/package/iftop/Makefile +++ b/package/iftop/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= iftop PKG_VERSION:= 0.17 PKG_RELEASE:= 1 PKG_MD5SUM:= 062bc8fb3856580319857326e0b8752d -MASTER_SITES:= http://www.ex-parrot.com/~pdw/iftop/download/ +PKG_DESCR:= display bandwith usage on an interface +PKG_SECTION:= net +PKG_DEPENDS:= libncurses libpcap libpthread +PKG_URL:= http://www.ex-parrot.com/~pdw/iftop +PKG_SITES:= http://www.ex-parrot.com/~pdw/iftop/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IFTOP,iftop,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IFTOP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/iftop/ipkg/iftop.control b/package/iftop/ipkg/iftop.control deleted file mode 100644 index ce2cbad..0000000 --- a/package/iftop/ipkg/iftop.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iftop -Priority: optional -Section: net -Depends: libncurses, libpcap, libpthread -Description: display bandwith usage on an interface diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile index 90ff811..995f70d 100644 --- a/package/igmpproxy/Makefile +++ b/package/igmpproxy/Makefile @@ -6,24 +6,25 @@ include ${TOPDIR}/rules.mk PKG_NAME:= igmpproxy -PKG_VERSION:= 0.1-beta2 +PKG_VERSION:= 0.1_beta4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2a5a59480f44d4b14077a6b5319e9940 -DISTFILES:= ${PKG_NAME}-src-${PKG_VERSION}.tar.gz -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=igmpproxy/} -WRKDIST= ${WRKDIR}/${PKG_NAME} +PKG_MD5SUM:= 0a16178aeca5d1bf54c129cec9597f85 +PKG_DESCR:= IGMPproxy is a simple dynamic Multicast Routing Daemon +PKG_SECTION:= net +PKG_URL:= http://sourceforge.net/projects/igmpproxy +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=igmpproxy/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -do-build: - ${MAKE} CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS}" -C ${WRKBUILD}/src +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto -do-install: - ${INSTALL_DIR} ${IDIR_IGMPPROXY}/usr/sbin - ${INSTALL_DIR} ${IDIR_IGMPPROXY}/etc - ${INSTALL_BIN} ${WRKBUILD}/src/${PKG_NAME} ${IDIR_IGMPPROXY}/usr/sbin/ - ${INSTALL_DATA} ${WRKBUILD}/src/${PKG_NAME}.conf ${IDIR_IGMPPROXY}/etc +post-install: + ${INSTALL_DIR} ${IDIR_IGMPPROXY}/usr/sbin ${IDIR_IGMPPROXY}/etc + ${INSTALL_BIN} ${WRKINST}/usr/sbin/${PKG_NAME} ${IDIR_IGMPPROXY}/usr/sbin/ + ${INSTALL_DATA} ${WRKINST}/etc/${PKG_NAME}.conf ${IDIR_IGMPPROXY}/etc include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/igmpproxy/ipkg/igmpproxy.control b/package/igmpproxy/ipkg/igmpproxy.control deleted file mode 100644 index 26bfe15..0000000 --- a/package/igmpproxy/ipkg/igmpproxy.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: igmpproxy -Section: net -Priority: optional -Description: IGMPproxy is a simple dynamic Multicast Routing Daemon. diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile index 2ae002b..0305f07 100644 --- a/package/inputproto/Makefile +++ b/package/inputproto/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= inputproto PKG_VERSION:= 1.4.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 55c67c1f42d70458a3e4d153c8c07cf7 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile index ca240dd..7074ef8 100644 --- a/package/ipcad/Makefile +++ b/package/ipcad/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= ipcad PKG_VERSION:= 3.7.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 125605249958894148ec26d3c88189f5 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipcad/} +PKG_DESCR:= IP Cisco Accounting Daemon +PKG_SECTION:= net +PKG_DEPENDS:= libpcap +PKG_URL:= http://lionet.info/ipcad +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipcad/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPCAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IPCAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-ifst=linux \ @@ -27,8 +31,7 @@ pre-build: touch $(WRKBUILD)/cfglex.c $(WRKBUILD)/cslex.c post-install: - ${INSTALL_DIR} ${IDIR_IPCAD}/usr/bin - ${INSTALL_DIR} ${IDIR_IPCAD}/etc + ${INSTALL_DIR} ${IDIR_IPCAD}/usr/bin ${IDIR_IPCAD}/etc ${INSTALL_DATA} ${WRKINST}/etc/ipcad.conf ${IDIR_IPCAD}/etc/ ${INSTALL_BIN} ${WRKINST}/usr/bin/ipcad ${IDIR_IPCAD}/usr/bin/ diff --git a/package/ipcad/files/ipcad.conffiles b/package/ipcad/files/ipcad.conffiles new file mode 100644 index 0000000..f6843d8 --- /dev/null +++ b/package/ipcad/files/ipcad.conffiles @@ -0,0 +1 @@ +/etc/ipcad.conf diff --git a/package/ipcad/ipkg/ipcad.conffiles b/package/ipcad/ipkg/ipcad.conffiles deleted file mode 100644 index f6843d8..0000000 --- a/package/ipcad/ipkg/ipcad.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/ipcad.conf diff --git a/package/ipcad/ipkg/ipcad.control b/package/ipcad/ipkg/ipcad.control deleted file mode 100644 index 93df70c..0000000 --- a/package/ipcad/ipkg/ipcad.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: ipcad -Depends: libpcap -Section: net -Architecture: mipsel -Priority: optional -Description: IPCAD stands for IP Cisco Accounting Daemon. It runs in background, listens traffic on the specified interfaces, and records the traffic for later retrieval and analysis. IPCAD can use raw BPF devices, PCAP library, divert, tee or Linux iptables' ULOG & IPQ packet sources to capture the packets. diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 5434be2..3796df1 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -9,11 +9,21 @@ PKG_NAME:= iperf PKG_VERSION:= 2.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 8c5bc14cc2ea55f18f22afe3c23e3dcb -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} +PKG_DESCR:= Internet Protocol bandwidth measuring tool +PKG_SECTION:= net +PKG_DEPENDS:= libpthread +PKG_URL:= http://sourceforge.net/projects/iperf +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE})) +ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y) +PKG_DEPENDS+= uclibc++ +else +PKG_DEPENDS+= libstdcxx +endif + +$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/iperf/ipkg/iperf.control b/package/iperf/ipkg/iperf.control deleted file mode 100644 index b58436f..0000000 --- a/package/iperf/ipkg/iperf.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iperf -Priority: optional -Section: net -Depends: uclibc++, libgcc, libpthread -Description: Internet Protocol bandwidth measuring tool. diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 58650bf..d2703e6 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -9,13 +9,20 @@ PKG_NAME:= iproute2 PKG_VERSION:= 2.6.29-1 PKG_RELEASE:= 1 PKG_MD5SUM:= c1bc258a6c345905e79935ac7a3cc582 +PKG_DESCR:= iproute2 routing control utility +PKG_SECTION:= net +PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2 +PKG_SITES:= http://developer.osdl.org/dev/iproute2/download/ + +PKG_DESCR_1:= iproute2 traffic control utility +PKG_DEPENDS_1:= kmod-sched + DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -MASTER_SITES:= http://developer.osdl.org/dev/iproute2/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) do-configure: ${SED} "s:-O2:${TARGET_CFLAGS}:g" ${WRKBUILD}/Makefile @@ -31,10 +38,10 @@ do-configure: ${SED} "s, netem,," ${WRKBUILD}/Makefile do-build: - ${MAKE} -j1 -C ${WRKBUILD}/netem \ + ${MAKE} -C ${WRKBUILD}/netem \ HOSTCC=${HOSTCC} \ CCOPTS="-I${LINUX_DIR}" \ - ${MAKE} -j1 -C ${WRKBUILD} ${TARGET_CONFIGURE_OPTS} \ + ${MAKE} -C ${WRKBUILD} ${TARGET_CONFIGURE_OPTS} \ CFLAGS="-D_GNU_SOURCE ${TARGET_CFLAGS} -I ../include -DRESOLVE_HOSTNAMES" \ KERNEL_INCLUDE=${LINUX_DIR}/include all tc/tc ip/ip \ CCOPTS="-I${LINUX_DIR}" diff --git a/package/iproute2/ipkg/ip.control b/package/iproute2/ipkg/ip.control deleted file mode 100644 index 8206dd3..0000000 --- a/package/iproute2/ipkg/ip.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ip -Section: net -Priority: optional -Description: iproute2 routing control utility diff --git a/package/iproute2/ipkg/tc.control b/package/iproute2/ipkg/tc.control deleted file mode 100644 index 8950da3..0000000 --- a/package/iproute2/ipkg/tc.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: tc -Section: net -Priority: optional -Description: iproute2 traffic control utility -Depends: kmod-sched diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in index b140738..7edadda 100644 --- a/package/ipsec-tools/Config.in +++ b/package/ipsec-tools/Config.in @@ -1,7 +1,6 @@ config ADK_PACKAGE_IPSEC_TOOLS prompt "ipsec-tools....................... IPsec management tools" tristate - depends ADK_LINUX_2_6 select ADK_PACKAGE_LIBOPENSSL default n help diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 5fe7101..10a3539 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -6,19 +6,25 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ipsec-tools -PKG_VERSION:= 0.6.4 +PKG_VERSION:= 0.7.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= d0242a943c82c0cbf28005966ff35e21 +PKG_MD5SUM:= 72861f005746ee27984b2ee715ecc629 +PKG_DESCR:= IPsec management tools +PKG_SECTION:= net +PKG_DEPENDS:= libopenssl +PKG_URL:= http://ipsec-tools.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipsec-tools/} + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipsec-tools/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IPSEC_TOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-kernel-headers="${LINUX_DIR}/include" \ --without-readline \ + --disable-security-context \ --with-openssl="${STAGING_DIR}/usr" \ --without-libradius \ --without-libpam diff --git a/package/ipsec-tools/files/ipsec-tools.conffiles b/package/ipsec-tools/files/ipsec-tools.conffiles new file mode 100644 index 0000000..4340454 --- /dev/null +++ b/package/ipsec-tools/files/ipsec-tools.conffiles @@ -0,0 +1 @@ +/etc/racoon.conf diff --git a/package/ipsec-tools/ipkg/ipsec-tools.conffiles b/package/ipsec-tools/ipkg/ipsec-tools.conffiles deleted file mode 100644 index 4340454..0000000 --- a/package/ipsec-tools/ipkg/ipsec-tools.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/racoon.conf diff --git a/package/ipsec-tools/ipkg/ipsec-tools.control b/package/ipsec-tools/ipkg/ipsec-tools.control deleted file mode 100644 index c1cade1..0000000 --- a/package/ipsec-tools/ipkg/ipsec-tools.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ipsec-tools -Priority: optional -Section: net -Depends: libopenssl -Description: IPsec management tools diff --git a/package/ipsec-tools/patches/patch-configure b/package/ipsec-tools/patches/patch-configure index 5ff9866..29e65cf 100644 --- a/package/ipsec-tools/patches/patch-configure +++ b/package/ipsec-tools/patches/patch-configure @@ -1,12 +1,12 @@ -$Id$ ---- ipsec-tools-0.6.4.orig/configure 2005-12-09 10:03:34.000000000 +0100 -+++ ipsec-tools-0.6.4/configure 2007-06-28 16:58:31.000000000 +0200 -@@ -23147,7 +23147,7 @@ echo "${ECHO_T}${crypto_dir-default}" >& - - if test "x$crypto_dir" != "x"; then - LIBS="$LIBS -L${crypto_dir}/lib" -- CPPFLAGS="-I${crypto_dir}/include $CPPLAGS" -+ CPPFLAGS="-I${crypto_dir}/include $CPPFLAGS" - fi - echo "$as_me:$LINENO: checking openssl version" >&5 - echo $ECHO_N "checking openssl version... $ECHO_C" >&6 +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/configure 2009-04-21 16:41:45.000000000 +0200 ++++ ipsec-tools-0.7.2/configure 2009-05-29 15:28:06.991791782 +0200 +@@ -11963,7 +11963,7 @@ echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + + + +-CFLAGS_ADD="$CFLAGS_ADD -Wall -Werror -Wno-unused" ++CFLAGS_ADD="$CFLAGS_ADD -Wall -Wno-unused" + + case $host in + *netbsd*) diff --git a/package/ipsec-tools/patches/patch-configure_ac b/package/ipsec-tools/patches/patch-configure_ac deleted file mode 100644 index d28f9af..0000000 --- a/package/ipsec-tools/patches/patch-configure_ac +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ ---- ipsec-tools-0.6.4.orig/configure.ac 2005-12-09 10:00:28.000000000 +0100 -+++ ipsec-tools-0.6.4/configure.ac 2007-06-28 16:58:31.000000000 +0200 -@@ -183,7 +183,7 @@ AC_MSG_RESULT(${crypto_dir-default}) - - if test "x$crypto_dir" != "x"; then - LIBS="$LIBS -L${crypto_dir}/lib" -- CPPFLAGS="-I${crypto_dir}/include $CPPLAGS" -+ CPPFLAGS="-I${crypto_dir}/include $CPPFLAGS" - fi - AC_MSG_CHECKING(openssl version) - diff --git a/package/ipsec-tools/patches/patch-src_racoon_algorithm_c b/package/ipsec-tools/patches/patch-src_racoon_algorithm_c new file mode 100644 index 0000000..351ce17 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_racoon_algorithm_c @@ -0,0 +1,44 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/algorithm.c 2006-10-06 14:02:27.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/algorithm.c 2009-05-29 15:51:03.662094000 +0200 +@@ -111,9 +111,11 @@ static struct enc_algorithm oakley_encde + eay_idea_encrypt, eay_idea_decrypt, + eay_idea_weakkey, eay_idea_keylen, }, + #endif ++#ifndef OPENSSL_NO_BF + { "blowfish", algtype_blowfish, OAKLEY_ATTR_ENC_ALG_BLOWFISH, 8, + eay_bf_encrypt, eay_bf_decrypt, + eay_bf_weakkey, eay_bf_keylen, }, ++#endif + #ifdef HAVE_OPENSSL_RC5_H + { "rc5", algtype_rc5, OAKLEY_ATTR_ENC_ALG_RC5, 8, + eay_rc5_encrypt, eay_rc5_decrypt, +@@ -122,9 +124,11 @@ static struct enc_algorithm oakley_encde + { "3des", algtype_3des, OAKLEY_ATTR_ENC_ALG_3DES, 8, + eay_3des_encrypt, eay_3des_decrypt, + eay_3des_weakkey, eay_3des_keylen, }, ++#ifndef OPENSSL_NO_CAST + { "cast", algtype_cast128, OAKLEY_ATTR_ENC_ALG_CAST, 8, + eay_cast_encrypt, eay_cast_decrypt, + eay_cast_weakkey, eay_cast_keylen, }, ++#endif + { "aes", algtype_aes, OAKLEY_ATTR_ENC_ALG_AES, 16, + eay_aes_encrypt, eay_aes_decrypt, + eay_aes_weakkey, eay_aes_keylen, }, +@@ -150,12 +154,16 @@ static struct enc_algorithm ipsec_encdef + NULL, NULL, + NULL, eay_rc5_keylen, }, + #endif ++#ifndef OPENSSL_NO_CAST + { "cast", algtype_cast128, IPSECDOI_ESP_CAST, 8, + NULL, NULL, + NULL, eay_cast_keylen, }, ++#endif ++#ifndef OPENSSL_NO_CAST + { "blowfish", algtype_blowfish, IPSECDOI_ESP_BLOWFISH, 8, + NULL, NULL, + NULL, eay_bf_keylen, }, ++#endif + { "des-iv32", algtype_des_iv32, IPSECDOI_ESP_DES_IV32, 8, + NULL, NULL, + NULL, eay_des_keylen, }, diff --git a/package/ipsec-tools/patches/patch-src_racoon_cftoken_c b/package/ipsec-tools/patches/patch-src_racoon_cftoken_c new file mode 100644 index 0000000..29bdf1a --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_racoon_cftoken_c @@ -0,0 +1,2026 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/cftoken.c 2008-07-23 13:49:19.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/cftoken.c 2009-05-29 15:50:16.982910033 +0200 +@@ -8,7 +8,7 @@ + #define FLEX_SCANNER + #define YY_FLEX_MAJOR_VERSION 2 + #define YY_FLEX_MINOR_VERSION 5 +-#define YY_FLEX_SUBMINOR_VERSION 34 ++#define YY_FLEX_SUBMINOR_VERSION 35 + #if YY_FLEX_SUBMINOR_VERSION > 0 + #define FLEX_BETA + #endif +@@ -178,13 +178,6 @@ extern FILE *yyin, *yyout; + + #define unput(c) yyunput( c, (yytext_ptr) ) + +-/* The following is because we cannot portably get our hands on size_t +- * (without autoconf's help, which isn't available because we want +- * flex-generated scanners to compile on their own). +- * Given that the standard has decreed that size_t exists since 1989, +- * I guess we can afford to depend on it. Manoj. +- */ +- + #ifndef YY_TYPEDEF_YY_SIZE_T + #define YY_TYPEDEF_YY_SIZE_T + typedef size_t yy_size_t; +@@ -1634,6 +1627,7 @@ static struct include_stack { + static int incstackp = 0; + + static int yy_first_time = 1; ++int yywrap(void) { return 1; } + /* common seciton */ + /*octet (([01]?{digit}?{digit})|((2([0-4]{digit}))|(25[0-5]))) */ + +@@ -1642,7 +1636,7 @@ static int yy_first_time = 1; + + + +-#line 1646 "cftoken.c" ++#line 1640 "cftoken.c" + + #define INITIAL 0 + #define S_INI 1 +@@ -1679,6 +1673,35 @@ static int yy_first_time = 1; + + static int yy_init_globals (void ); + ++/* Accessor methods to globals. ++ These are made visible to non-reentrant scanners for convenience. */ ++ ++int yylex_destroy (void ); ++ ++int yyget_debug (void ); ++ ++void yyset_debug (int debug_flag ); ++ ++YY_EXTRA_TYPE yyget_extra (void ); ++ ++void yyset_extra (YY_EXTRA_TYPE user_defined ); ++ ++FILE *yyget_in (void ); ++ ++void yyset_in (FILE * in_str ); ++ ++FILE *yyget_out (void ); ++ ++void yyset_out (FILE * out_str ); ++ ++int yyget_leng (void ); ++ ++char *yyget_text (void ); ++ ++int yyget_lineno (void ); ++ ++void yyset_lineno (int line_number ); ++ + /* Macros after this point can all be overridden by user definitions in + * section 1. + */ +@@ -1814,7 +1837,7 @@ YY_DECL + register char *yy_cp, *yy_bp; + register int yy_act; + +-#line 142 "cftoken.l" ++#line 143 "cftoken.l" + + + if (yy_first_time) { +@@ -1824,7 +1847,7 @@ YY_DECL + + + /* privsep */ +-#line 1828 "cftoken.c" ++#line 1851 "cftoken.c" + + if ( !(yy_init) ) + { +@@ -1915,1028 +1938,1028 @@ do_action: /* This label is used only to + + case 1: + YY_RULE_SETUP +-#line 151 "cftoken.l" ++#line 152 "cftoken.l" + { BEGIN S_PRIV; YYDB; return(PRIVSEP); } + YY_BREAK + case 2: + YY_RULE_SETUP +-#line 152 "cftoken.l" ++#line 153 "cftoken.l" + { return(BOC); } + YY_BREAK + case 3: + YY_RULE_SETUP +-#line 153 "cftoken.l" ++#line 154 "cftoken.l" + { YYD; return(USER); } + YY_BREAK + case 4: + YY_RULE_SETUP +-#line 154 "cftoken.l" ++#line 155 "cftoken.l" + { YYD; return(GROUP); } + YY_BREAK + case 5: + YY_RULE_SETUP +-#line 155 "cftoken.l" ++#line 156 "cftoken.l" + { YYD; return(CHROOT); } + YY_BREAK + case 6: + YY_RULE_SETUP +-#line 156 "cftoken.l" ++#line 157 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* path */ + case 7: + YY_RULE_SETUP +-#line 159 "cftoken.l" ++#line 160 "cftoken.l" + { BEGIN S_PTH; YYDB; return(PATH); } + YY_BREAK + case 8: + YY_RULE_SETUP +-#line 160 "cftoken.l" ++#line 161 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_INCLUDE; + return(PATHTYPE); } + YY_BREAK + case 9: + YY_RULE_SETUP +-#line 162 "cftoken.l" ++#line 163 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_PSK; + return(PATHTYPE); } + YY_BREAK + case 10: + YY_RULE_SETUP +-#line 164 "cftoken.l" ++#line 165 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_CERT; + return(PATHTYPE); } + YY_BREAK + case 11: + YY_RULE_SETUP +-#line 166 "cftoken.l" ++#line 167 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_SCRIPT; + return(PATHTYPE); } + YY_BREAK + case 12: + YY_RULE_SETUP +-#line 168 "cftoken.l" ++#line 169 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_BACKUPSA; + return(PATHTYPE); } + YY_BREAK + case 13: + YY_RULE_SETUP +-#line 170 "cftoken.l" ++#line 171 "cftoken.l" + { YYD; yylval.num = LC_PATHTYPE_PIDFILE; + return(PATHTYPE); } + YY_BREAK + case 14: + YY_RULE_SETUP +-#line 172 "cftoken.l" ++#line 173 "cftoken.l" + { BEGIN S_INI; YYDB; return(EOS); } + YY_BREAK + /* include */ + case 15: + YY_RULE_SETUP +-#line 175 "cftoken.l" ++#line 176 "cftoken.l" + { YYDB; return(INCLUDE); } + YY_BREAK + /* self information */ + case 16: + YY_RULE_SETUP +-#line 178 "cftoken.l" ++#line 179 "cftoken.l" + { BEGIN S_INF; YYDB; yywarn("it is obsoleted. use \"my_identifier\" in each remote directives."); return(IDENTIFIER); } + YY_BREAK + case 17: + YY_RULE_SETUP +-#line 179 "cftoken.l" ++#line 180 "cftoken.l" + { BEGIN S_INI; return(EOS); } + YY_BREAK + /* special */ + case 18: + YY_RULE_SETUP +-#line 182 "cftoken.l" ++#line 183 "cftoken.l" + { YYDB; return(COMPLEX_BUNDLE); } + YY_BREAK + /* logging */ + case 19: + YY_RULE_SETUP +-#line 185 "cftoken.l" ++#line 186 "cftoken.l" + { BEGIN S_LOG; YYDB; return(LOGGING); } + YY_BREAK + case 20: + YY_RULE_SETUP +-#line 186 "cftoken.l" ++#line 187 "cftoken.l" + { YYD; yylval.num = LLV_ERROR; return(LOGLEV); } + YY_BREAK + case 21: + YY_RULE_SETUP +-#line 187 "cftoken.l" ++#line 188 "cftoken.l" + { YYD; yylval.num = LLV_WARNING; return(LOGLEV); } + YY_BREAK + case 22: + YY_RULE_SETUP +-#line 188 "cftoken.l" ++#line 189 "cftoken.l" + { YYD; yylval.num = LLV_NOTIFY; return(LOGLEV); } + YY_BREAK + case 23: + YY_RULE_SETUP +-#line 189 "cftoken.l" ++#line 190 "cftoken.l" + { YYD; yylval.num = LLV_INFO; return(LOGLEV); } + YY_BREAK + case 24: + YY_RULE_SETUP +-#line 190 "cftoken.l" ++#line 191 "cftoken.l" + { YYD; yylval.num = LLV_DEBUG; return(LOGLEV); } + YY_BREAK + case 25: + YY_RULE_SETUP +-#line 191 "cftoken.l" ++#line 192 "cftoken.l" + { YYD; yylval.num = LLV_DEBUG2; return(LOGLEV); } + YY_BREAK + case 26: + YY_RULE_SETUP +-#line 192 "cftoken.l" ++#line 193 "cftoken.l" + { YYD; yywarn("it is obsoleted. use \"debug2\""); yylval.num = LLV_DEBUG2; return(LOGLEV); } + YY_BREAK + case 27: + YY_RULE_SETUP +-#line 193 "cftoken.l" ++#line 194 "cftoken.l" + { YYD; yywarn("it is obsoleted. use \"debug2\""); yylval.num = LLV_DEBUG2; return(LOGLEV); } + YY_BREAK + case 28: + YY_RULE_SETUP +-#line 194 "cftoken.l" ++#line 195 "cftoken.l" + { BEGIN S_INI; return(EOS); } + YY_BREAK + /* padding */ + case 29: + YY_RULE_SETUP +-#line 197 "cftoken.l" ++#line 198 "cftoken.l" + { BEGIN S_PAD; YYDB; return(PADDING); } + YY_BREAK + case 30: + YY_RULE_SETUP +-#line 198 "cftoken.l" ++#line 199 "cftoken.l" + { return(BOC); } + YY_BREAK + case 31: + YY_RULE_SETUP +-#line 199 "cftoken.l" ++#line 200 "cftoken.l" + { YYD; return(PAD_RANDOMIZE); } + YY_BREAK + case 32: + YY_RULE_SETUP +-#line 200 "cftoken.l" ++#line 201 "cftoken.l" + { YYD; return(PAD_RANDOMIZELEN); } + YY_BREAK + case 33: + YY_RULE_SETUP +-#line 201 "cftoken.l" ++#line 202 "cftoken.l" + { YYD; return(PAD_MAXLEN); } + YY_BREAK + case 34: + YY_RULE_SETUP +-#line 202 "cftoken.l" ++#line 203 "cftoken.l" + { YYD; return(PAD_STRICT); } + YY_BREAK + case 35: + YY_RULE_SETUP +-#line 203 "cftoken.l" ++#line 204 "cftoken.l" + { YYD; return(PAD_EXCLTAIL); } + YY_BREAK + case 36: + YY_RULE_SETUP +-#line 204 "cftoken.l" ++#line 205 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* listen */ + case 37: + YY_RULE_SETUP +-#line 207 "cftoken.l" ++#line 208 "cftoken.l" + { BEGIN S_LST; YYDB; return(LISTEN); } + YY_BREAK + case 38: + YY_RULE_SETUP +-#line 208 "cftoken.l" ++#line 209 "cftoken.l" + { return(BOC); } + YY_BREAK + case 39: + YY_RULE_SETUP +-#line 209 "cftoken.l" ++#line 210 "cftoken.l" + { YYD; return(X_ISAKMP); } + YY_BREAK + case 40: + YY_RULE_SETUP +-#line 210 "cftoken.l" ++#line 211 "cftoken.l" + { YYD; return(X_ISAKMP_NATT); } + YY_BREAK + case 41: + YY_RULE_SETUP +-#line 211 "cftoken.l" ++#line 212 "cftoken.l" + { YYD; return(X_ADMIN); } + YY_BREAK + case 42: + YY_RULE_SETUP +-#line 212 "cftoken.l" ++#line 213 "cftoken.l" + { YYD; return(ADMINSOCK); } + YY_BREAK + case 43: + YY_RULE_SETUP +-#line 213 "cftoken.l" ++#line 214 "cftoken.l" + { YYD; return(DISABLED); } + YY_BREAK + case 44: + YY_RULE_SETUP +-#line 214 "cftoken.l" ++#line 215 "cftoken.l" + { YYD; return(STRICT_ADDRESS); } + YY_BREAK + case 45: + YY_RULE_SETUP +-#line 215 "cftoken.l" ++#line 216 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* ldap config */ + case 46: + YY_RULE_SETUP +-#line 218 "cftoken.l" ++#line 219 "cftoken.l" + { BEGIN S_LDAP; YYDB; return(LDAPCFG); } + YY_BREAK + case 47: + YY_RULE_SETUP +-#line 219 "cftoken.l" ++#line 220 "cftoken.l" + { return(BOC); } + YY_BREAK + case 48: + YY_RULE_SETUP +-#line 220 "cftoken.l" ++#line 221 "cftoken.l" + { YYD; return(LDAP_PVER); } + YY_BREAK + case 49: + YY_RULE_SETUP +-#line 221 "cftoken.l" ++#line 222 "cftoken.l" + { YYD; return(LDAP_HOST); } + YY_BREAK + case 50: + YY_RULE_SETUP +-#line 222 "cftoken.l" ++#line 223 "cftoken.l" + { YYD; return(LDAP_PORT); } + YY_BREAK + case 51: + YY_RULE_SETUP +-#line 223 "cftoken.l" ++#line 224 "cftoken.l" + { YYD; return(LDAP_BASE); } + YY_BREAK + case 52: + YY_RULE_SETUP +-#line 224 "cftoken.l" ++#line 225 "cftoken.l" + { YYD; return(LDAP_SUBTREE); } + YY_BREAK + case 53: + YY_RULE_SETUP +-#line 225 "cftoken.l" ++#line 226 "cftoken.l" + { YYD; return(LDAP_BIND_DN); } + YY_BREAK + case 54: + YY_RULE_SETUP +-#line 226 "cftoken.l" ++#line 227 "cftoken.l" + { YYD; return(LDAP_BIND_PW); } + YY_BREAK + case 55: + YY_RULE_SETUP +-#line 227 "cftoken.l" ++#line 228 "cftoken.l" + { YYD; return(LDAP_ATTR_USER); } + YY_BREAK + case 56: + YY_RULE_SETUP +-#line 228 "cftoken.l" ++#line 229 "cftoken.l" + { YYD; return(LDAP_ATTR_ADDR); } + YY_BREAK + case 57: + YY_RULE_SETUP +-#line 229 "cftoken.l" ++#line 230 "cftoken.l" + { YYD; return(LDAP_ATTR_MASK); } + YY_BREAK + case 58: + YY_RULE_SETUP +-#line 230 "cftoken.l" ++#line 231 "cftoken.l" + { YYD; return(LDAP_ATTR_GROUP); } + YY_BREAK + case 59: + YY_RULE_SETUP +-#line 231 "cftoken.l" ++#line 232 "cftoken.l" + { YYD; return(LDAP_ATTR_MEMBER); } + YY_BREAK + case 60: + YY_RULE_SETUP +-#line 232 "cftoken.l" ++#line 233 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* mode_cfg */ + case 61: + YY_RULE_SETUP +-#line 235 "cftoken.l" ++#line 236 "cftoken.l" + { BEGIN S_CFG; YYDB; return(MODECFG); } + YY_BREAK + case 62: + YY_RULE_SETUP +-#line 236 "cftoken.l" ++#line 237 "cftoken.l" + { return(BOC); } + YY_BREAK + case 63: + YY_RULE_SETUP +-#line 237 "cftoken.l" ++#line 238 "cftoken.l" + { YYD; return(CFG_NET4); } + YY_BREAK + case 64: + YY_RULE_SETUP +-#line 238 "cftoken.l" ++#line 239 "cftoken.l" + { YYD; return(CFG_MASK4); } + YY_BREAK + case 65: + YY_RULE_SETUP +-#line 239 "cftoken.l" ++#line 240 "cftoken.l" + { YYD; return(CFG_DNS4); } + YY_BREAK + case 66: + YY_RULE_SETUP +-#line 240 "cftoken.l" ++#line 241 "cftoken.l" + { YYD; return(CFG_NBNS4); } + YY_BREAK + case 67: + YY_RULE_SETUP +-#line 241 "cftoken.l" ++#line 242 "cftoken.l" + { YYD; return(CFG_NBNS4); } + YY_BREAK + case 68: + YY_RULE_SETUP +-#line 242 "cftoken.l" ++#line 243 "cftoken.l" + { YYD; return(CFG_DEFAULT_DOMAIN); } + YY_BREAK + case 69: + YY_RULE_SETUP +-#line 243 "cftoken.l" ++#line 244 "cftoken.l" + { YYD; return(CFG_AUTH_SOURCE); } + YY_BREAK + case 70: + YY_RULE_SETUP +-#line 244 "cftoken.l" ++#line 245 "cftoken.l" + { YYD; return(CFG_AUTH_GROUPS); } + YY_BREAK + case 71: + YY_RULE_SETUP +-#line 245 "cftoken.l" ++#line 246 "cftoken.l" + { YYD; return(CFG_GROUP_SOURCE); } + YY_BREAK + case 72: + YY_RULE_SETUP +-#line 246 "cftoken.l" ++#line 247 "cftoken.l" + { YYD; return(CFG_CONF_SOURCE); } + YY_BREAK + case 73: + YY_RULE_SETUP +-#line 247 "cftoken.l" ++#line 248 "cftoken.l" + { YYD; return(CFG_ACCOUNTING); } + YY_BREAK + case 74: + YY_RULE_SETUP +-#line 248 "cftoken.l" ++#line 249 "cftoken.l" + { YYD; return(CFG_SYSTEM); } + YY_BREAK + case 75: + YY_RULE_SETUP +-#line 249 "cftoken.l" ++#line 250 "cftoken.l" + { YYD; return(CFG_LOCAL); } + YY_BREAK + case 76: + YY_RULE_SETUP +-#line 250 "cftoken.l" ++#line 251 "cftoken.l" + { YYD; return(CFG_NONE); } + YY_BREAK + case 77: + YY_RULE_SETUP +-#line 251 "cftoken.l" ++#line 252 "cftoken.l" + { YYD; return(CFG_RADIUS); } + YY_BREAK + case 78: + YY_RULE_SETUP +-#line 252 "cftoken.l" ++#line 253 "cftoken.l" + { YYD; return(CFG_PAM); } + YY_BREAK + case 79: + YY_RULE_SETUP +-#line 253 "cftoken.l" ++#line 254 "cftoken.l" + { YYD; return(CFG_LDAP); } + YY_BREAK + case 80: + YY_RULE_SETUP +-#line 254 "cftoken.l" ++#line 255 "cftoken.l" + { YYD; return(CFG_POOL_SIZE); } + YY_BREAK + case 81: + YY_RULE_SETUP +-#line 255 "cftoken.l" ++#line 256 "cftoken.l" + { YYD; return(CFG_MOTD); } + YY_BREAK + case 82: + YY_RULE_SETUP +-#line 256 "cftoken.l" ++#line 257 "cftoken.l" + { YYD; return(CFG_AUTH_THROTTLE); } + YY_BREAK + case 83: + YY_RULE_SETUP +-#line 257 "cftoken.l" ++#line 258 "cftoken.l" + { YYD; return(CFG_SPLIT_NETWORK); } + YY_BREAK + case 84: + YY_RULE_SETUP +-#line 258 "cftoken.l" ++#line 259 "cftoken.l" + { YYD; return(CFG_SPLIT_LOCAL); } + YY_BREAK + case 85: + YY_RULE_SETUP +-#line 259 "cftoken.l" ++#line 260 "cftoken.l" + { YYD; return(CFG_SPLIT_INCLUDE); } + YY_BREAK + case 86: + YY_RULE_SETUP +-#line 260 "cftoken.l" ++#line 261 "cftoken.l" + { YYD; return(CFG_SPLIT_DNS); } + YY_BREAK + case 87: + YY_RULE_SETUP +-#line 261 "cftoken.l" ++#line 262 "cftoken.l" + { YYD; return(CFG_PFS_GROUP); } + YY_BREAK + case 88: + YY_RULE_SETUP +-#line 262 "cftoken.l" ++#line 263 "cftoken.l" + { YYD; return(CFG_SAVE_PASSWD); } + YY_BREAK + case 89: + YY_RULE_SETUP +-#line 263 "cftoken.l" ++#line 264 "cftoken.l" + { YYD; return(COMMA); } + YY_BREAK + case 90: + YY_RULE_SETUP +-#line 264 "cftoken.l" ++#line 265 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* timer */ + case 91: + YY_RULE_SETUP +-#line 267 "cftoken.l" ++#line 268 "cftoken.l" + { BEGIN S_RTRY; YYDB; return(RETRY); } + YY_BREAK + case 92: + YY_RULE_SETUP +-#line 268 "cftoken.l" ++#line 269 "cftoken.l" + { return(BOC); } + YY_BREAK + case 93: + YY_RULE_SETUP +-#line 269 "cftoken.l" ++#line 270 "cftoken.l" + { YYD; return(RETRY_COUNTER); } + YY_BREAK + case 94: + YY_RULE_SETUP +-#line 270 "cftoken.l" ++#line 271 "cftoken.l" + { YYD; return(RETRY_INTERVAL); } + YY_BREAK + case 95: + YY_RULE_SETUP +-#line 271 "cftoken.l" ++#line 272 "cftoken.l" + { YYD; return(RETRY_PERSEND); } + YY_BREAK + case 96: + YY_RULE_SETUP +-#line 272 "cftoken.l" ++#line 273 "cftoken.l" + { YYD; return(RETRY_PHASE1); } + YY_BREAK + case 97: + YY_RULE_SETUP +-#line 273 "cftoken.l" ++#line 274 "cftoken.l" + { YYD; return(RETRY_PHASE2); } + YY_BREAK + case 98: + YY_RULE_SETUP +-#line 274 "cftoken.l" ++#line 275 "cftoken.l" + { YYD; return(NATT_KA); } + YY_BREAK + case 99: + YY_RULE_SETUP +-#line 275 "cftoken.l" ++#line 276 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + /* sainfo */ + case 100: + YY_RULE_SETUP +-#line 278 "cftoken.l" ++#line 279 "cftoken.l" + { BEGIN S_SAINF; YYDB; return(SAINFO); } + YY_BREAK + case 101: + YY_RULE_SETUP +-#line 279 "cftoken.l" ++#line 280 "cftoken.l" + { YYD; return(ANONYMOUS); } + YY_BREAK + case 102: + YY_RULE_SETUP +-#line 280 "cftoken.l" ++#line 281 "cftoken.l" + { YYD; return(PORTANY); } + YY_BREAK + case 103: + YY_RULE_SETUP +-#line 281 "cftoken.l" ++#line 282 "cftoken.l" + { YYD; return(ANY); } + YY_BREAK + case 104: + YY_RULE_SETUP +-#line 282 "cftoken.l" ++#line 283 "cftoken.l" + { YYD; return(FROM); } + YY_BREAK + case 105: + YY_RULE_SETUP +-#line 283 "cftoken.l" ++#line 284 "cftoken.l" + { YYD; return(GROUP); } + YY_BREAK + /* sainfo spec */ + case 106: + YY_RULE_SETUP +-#line 285 "cftoken.l" ++#line 286 "cftoken.l" + { BEGIN S_SAINFS; return(BOC); } + YY_BREAK + case 107: + YY_RULE_SETUP +-#line 286 "cftoken.l" ++#line 287 "cftoken.l" + { BEGIN S_INI; return(EOS); } + YY_BREAK + case 108: + YY_RULE_SETUP +-#line 287 "cftoken.l" ++#line 288 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + case 109: + YY_RULE_SETUP +-#line 288 "cftoken.l" ++#line 289 "cftoken.l" + { YYD; return(PFS_GROUP); } + YY_BREAK + case 110: + YY_RULE_SETUP +-#line 289 "cftoken.l" ++#line 290 "cftoken.l" + { YYD; return(REMOTEID); } + YY_BREAK + case 111: + YY_RULE_SETUP +-#line 290 "cftoken.l" ++#line 291 "cftoken.l" + { YYD; yywarn("it is obsoleted. use \"my_identifier\"."); return(IDENTIFIER); } + YY_BREAK + case 112: + YY_RULE_SETUP +-#line 291 "cftoken.l" ++#line 292 "cftoken.l" + { YYD; return(MY_IDENTIFIER); } + YY_BREAK + case 113: + YY_RULE_SETUP +-#line 292 "cftoken.l" ++#line 293 "cftoken.l" + { YYD; return(LIFETIME); } + YY_BREAK + case 114: + YY_RULE_SETUP +-#line 293 "cftoken.l" ++#line 294 "cftoken.l" + { YYD; return(LIFETYPE_TIME); } + YY_BREAK + case 115: + YY_RULE_SETUP +-#line 294 "cftoken.l" ++#line 295 "cftoken.l" + { YYD; return(LIFETYPE_BYTE); } + YY_BREAK + case 116: + YY_RULE_SETUP +-#line 295 "cftoken.l" ++#line 296 "cftoken.l" + { YYD; yylval.num = algclass_ipsec_enc; return(ALGORITHM_CLASS); } + YY_BREAK + case 117: + YY_RULE_SETUP +-#line 296 "cftoken.l" ++#line 297 "cftoken.l" + { YYD; yylval.num = algclass_ipsec_auth; return(ALGORITHM_CLASS); } + YY_BREAK + case 118: + YY_RULE_SETUP +-#line 297 "cftoken.l" ++#line 298 "cftoken.l" + { YYD; yylval.num = algclass_ipsec_comp; return(ALGORITHM_CLASS); } + YY_BREAK + case 119: + YY_RULE_SETUP +-#line 298 "cftoken.l" ++#line 299 "cftoken.l" + { YYD; return(COMMA); } + YY_BREAK + /* remote */ + case 120: + YY_RULE_SETUP +-#line 301 "cftoken.l" ++#line 302 "cftoken.l" + { BEGIN S_RMT; YYDB; return(REMOTE); } + YY_BREAK + case 121: + YY_RULE_SETUP +-#line 302 "cftoken.l" ++#line 303 "cftoken.l" + { YYD; return(ANONYMOUS); } + YY_BREAK + case 122: + YY_RULE_SETUP +-#line 303 "cftoken.l" ++#line 304 "cftoken.l" + { YYD; return(INHERIT); } + YY_BREAK + /* remote spec */ + case 123: + YY_RULE_SETUP +-#line 305 "cftoken.l" ++#line 306 "cftoken.l" + { BEGIN S_RMTS; return(BOC); } + YY_BREAK + case 124: + YY_RULE_SETUP +-#line 306 "cftoken.l" ++#line 307 "cftoken.l" + { BEGIN S_INI; return(EOC); } + YY_BREAK + case 125: + YY_RULE_SETUP +-#line 307 "cftoken.l" ++#line 308 "cftoken.l" + { YYD; return(EXCHANGE_MODE); } + YY_BREAK + case 126: + YY_RULE_SETUP +-#line 308 "cftoken.l" ++#line 309 "cftoken.l" + { YYD; /* XXX ignored, but to be handled. */ ; } + YY_BREAK + case 127: + YY_RULE_SETUP +-#line 309 "cftoken.l" ++#line 310 "cftoken.l" + { YYD; yylval.num = ISAKMP_ETYPE_BASE; return(EXCHANGETYPE); } + YY_BREAK + case 128: + YY_RULE_SETUP +-#line 310 "cftoken.l" ++#line 311 "cftoken.l" + { YYD; yylval.num = ISAKMP_ETYPE_IDENT; return(EXCHANGETYPE); } + YY_BREAK + case 129: + YY_RULE_SETUP +-#line 311 "cftoken.l" ++#line 312 "cftoken.l" + { YYD; yylval.num = ISAKMP_ETYPE_AGG; return(EXCHANGETYPE); } + YY_BREAK + case 130: + YY_RULE_SETUP +-#line 312 "cftoken.l" ++#line 313 "cftoken.l" + { YYD; return(DOI); } + YY_BREAK + case 131: + YY_RULE_SETUP +-#line 313 "cftoken.l" ++#line 314 "cftoken.l" + { YYD; yylval.num = IPSEC_DOI; return(DOITYPE); } + YY_BREAK + case 132: + YY_RULE_SETUP +-#line 314 "cftoken.l" ++#line 315 "cftoken.l" + { YYD; return(SITUATION); } + YY_BREAK + case 133: + YY_RULE_SETUP +-#line 315 "cftoken.l" ++#line 316 "cftoken.l" + { YYD; yylval.num = IPSECDOI_SIT_IDENTITY_ONLY; return(SITUATIONTYPE); } + YY_BREAK + case 134: + YY_RULE_SETUP +-#line 316 "cftoken.l" ++#line 317 "cftoken.l" + { YYD; yylval.num = IPSECDOI_SIT_SECRECY; return(SITUATIONTYPE); } + YY_BREAK + case 135: + YY_RULE_SETUP +-#line 317 "cftoken.l" ++#line 318 "cftoken.l" + { YYD; yylval.num = IPSECDOI_SIT_INTEGRITY; return(SITUATIONTYPE); } + YY_BREAK + case 136: + YY_RULE_SETUP +-#line 318 "cftoken.l" ++#line 319 "cftoken.l" + { YYD; yywarn("it is obsoleted. use \"my_identifier\"."); return(IDENTIFIER); } + YY_BREAK + case 137: + YY_RULE_SETUP +-#line 319 "cftoken.l" ++#line 320 "cftoken.l" + { YYD; return(MY_IDENTIFIER); } + YY_BREAK + case 138: + YY_RULE_SETUP +-#line 320 "cftoken.l" ++#line 321 "cftoken.l" + { YYD; return(XAUTH_LOGIN); /* formerly identifier type login */ } + YY_BREAK + case 139: + YY_RULE_SETUP +-#line 321 "cftoken.l" ++#line 322 "cftoken.l" + { YYD; return(PEERS_IDENTIFIER); } + YY_BREAK + case 140: + YY_RULE_SETUP +-#line 322 "cftoken.l" ++#line 323 "cftoken.l" + { YYD; return(VERIFY_IDENTIFIER); } + YY_BREAK + case 141: + YY_RULE_SETUP +-#line 323 "cftoken.l" ++#line 324 "cftoken.l" + { YYD; return(CERTIFICATE_TYPE); } + YY_BREAK + case 142: + YY_RULE_SETUP +-#line 324 "cftoken.l" ++#line 325 "cftoken.l" + { YYD; return(CA_TYPE); } + YY_BREAK + case 143: + YY_RULE_SETUP +-#line 325 "cftoken.l" ++#line 326 "cftoken.l" + { YYD; yylval.num = ISAKMP_CERT_X509SIGN; return(CERT_X509); } + YY_BREAK + case 144: + YY_RULE_SETUP +-#line 326 "cftoken.l" ++#line 327 "cftoken.l" + { YYD; yylval.num = ISAKMP_CERT_PLAINRSA; return(CERT_PLAINRSA); } + YY_BREAK + case 145: + YY_RULE_SETUP +-#line 327 "cftoken.l" ++#line 328 "cftoken.l" + { YYD; return(PEERS_CERTFILE); } + YY_BREAK + case 146: + YY_RULE_SETUP +-#line 328 "cftoken.l" ++#line 329 "cftoken.l" + { YYD; return(DNSSEC); } + YY_BREAK + case 147: + YY_RULE_SETUP +-#line 329 "cftoken.l" ++#line 330 "cftoken.l" + { YYD; return(VERIFY_CERT); } + YY_BREAK + case 148: + YY_RULE_SETUP +-#line 330 "cftoken.l" ++#line 331 "cftoken.l" + { YYD; return(SEND_CERT); } + YY_BREAK + case 149: + YY_RULE_SETUP +-#line 331 "cftoken.l" ++#line 332 "cftoken.l" + { YYD; return(SEND_CR); } + YY_BREAK + case 150: + YY_RULE_SETUP +-#line 332 "cftoken.l" ++#line 333 "cftoken.l" + { YYD; return(DH_GROUP); } + YY_BREAK + case 151: + YY_RULE_SETUP +-#line 333 "cftoken.l" ++#line 334 "cftoken.l" + { YYD; return(NONCE_SIZE); } + YY_BREAK + case 152: + YY_RULE_SETUP +-#line 334 "cftoken.l" ++#line 335 "cftoken.l" + { YYD; return(GENERATE_POLICY); } + YY_BREAK + case 153: + YY_RULE_SETUP +-#line 335 "cftoken.l" ++#line 336 "cftoken.l" + { YYD; yylval.num = GENERATE_POLICY_UNIQUE; return(GENERATE_LEVEL); } + YY_BREAK + case 154: + YY_RULE_SETUP +-#line 336 "cftoken.l" ++#line 337 "cftoken.l" + { YYD; yylval.num = GENERATE_POLICY_REQUIRE; return(GENERATE_LEVEL); } + YY_BREAK + case 155: + YY_RULE_SETUP +-#line 337 "cftoken.l" ++#line 338 "cftoken.l" + { YYD; yywarn("it is obsoleted. use \"support_proxy\"."); return(SUPPORT_PROXY); } + YY_BREAK + case 156: + YY_RULE_SETUP +-#line 338 "cftoken.l" ++#line 339 "cftoken.l" + { YYD; return(SUPPORT_PROXY); } + YY_BREAK + case 157: + YY_RULE_SETUP +-#line 339 "cftoken.l" ++#line 340 "cftoken.l" + { YYD; return(INITIAL_CONTACT); } + YY_BREAK + case 158: + YY_RULE_SETUP +-#line 340 "cftoken.l" ++#line 341 "cftoken.l" + { YYD; return(NAT_TRAVERSAL); } + YY_BREAK + case 159: + YY_RULE_SETUP +-#line 341 "cftoken.l" ++#line 342 "cftoken.l" + { YYD; return(REMOTE_FORCE_LEVEL); } + YY_BREAK + case 160: + YY_RULE_SETUP +-#line 342 "cftoken.l" ++#line 343 "cftoken.l" + { YYD; return(PROPOSAL_CHECK); } + YY_BREAK + case 161: + YY_RULE_SETUP +-#line 343 "cftoken.l" ++#line 344 "cftoken.l" + { YYD; yylval.num = PROP_CHECK_OBEY; return(PROPOSAL_CHECK_LEVEL); } + YY_BREAK + case 162: + YY_RULE_SETUP +-#line 344 "cftoken.l" ++#line 345 "cftoken.l" + { YYD; yylval.num = PROP_CHECK_STRICT; return(PROPOSAL_CHECK_LEVEL); } + YY_BREAK + case 163: + YY_RULE_SETUP +-#line 345 "cftoken.l" ++#line 346 "cftoken.l" + { YYD; yylval.num = PROP_CHECK_EXACT; return(PROPOSAL_CHECK_LEVEL); } + YY_BREAK + case 164: + YY_RULE_SETUP +-#line 346 "cftoken.l" ++#line 347 "cftoken.l" + { YYD; yylval.num = PROP_CHECK_CLAIM; return(PROPOSAL_CHECK_LEVEL); } + YY_BREAK + case 165: + YY_RULE_SETUP +-#line 347 "cftoken.l" ++#line 348 "cftoken.l" + { YYD; return(KEEPALIVE); } + YY_BREAK + case 166: + YY_RULE_SETUP +-#line 348 "cftoken.l" ++#line 349 "cftoken.l" + { YYD; return(PASSIVE); } + YY_BREAK + case 167: + YY_RULE_SETUP +-#line 349 "cftoken.l" ++#line 350 "cftoken.l" + { YYD; return(LIFETIME); } + YY_BREAK + case 168: + YY_RULE_SETUP +-#line 350 "cftoken.l" ++#line 351 "cftoken.l" + { YYD; return(LIFETYPE_TIME); } + YY_BREAK + case 169: + YY_RULE_SETUP +-#line 351 "cftoken.l" ++#line 352 "cftoken.l" + { YYD; return(LIFETYPE_BYTE); } + YY_BREAK + case 170: + YY_RULE_SETUP +-#line 352 "cftoken.l" ++#line 353 "cftoken.l" + { YYD; return(DPD); } + YY_BREAK + case 171: + YY_RULE_SETUP +-#line 353 "cftoken.l" ++#line 354 "cftoken.l" + { YYD; return(DPD_DELAY); } + YY_BREAK + case 172: + YY_RULE_SETUP +-#line 354 "cftoken.l" ++#line 355 "cftoken.l" + { YYD; return(DPD_RETRY); } + YY_BREAK + case 173: + YY_RULE_SETUP +-#line 355 "cftoken.l" ++#line 356 "cftoken.l" + { YYD; return(DPD_MAXFAIL); } + YY_BREAK + case 174: + YY_RULE_SETUP +-#line 356 "cftoken.l" ++#line 357 "cftoken.l" + { YYD; return(PH1ID); } + YY_BREAK + case 175: + YY_RULE_SETUP +-#line 357 "cftoken.l" ++#line 358 "cftoken.l" + { YYD; return(IKE_FRAG); } + YY_BREAK + case 176: + YY_RULE_SETUP +-#line 358 "cftoken.l" ++#line 359 "cftoken.l" + { YYD; return(ESP_FRAG); } + YY_BREAK + case 177: + YY_RULE_SETUP +-#line 359 "cftoken.l" ++#line 360 "cftoken.l" + { YYD; return(SCRIPT); } + YY_BREAK + case 178: + YY_RULE_SETUP +-#line 360 "cftoken.l" ++#line 361 "cftoken.l" + { YYD; return(PHASE1_UP); } + YY_BREAK + case 179: + YY_RULE_SETUP +-#line 361 "cftoken.l" ++#line 362 "cftoken.l" + { YYD; return(PHASE1_DOWN); } + YY_BREAK + case 180: + YY_RULE_SETUP +-#line 362 "cftoken.l" ++#line 363 "cftoken.l" + { YYD; return(MODE_CFG); } + YY_BREAK + case 181: + YY_RULE_SETUP +-#line 363 "cftoken.l" ++#line 364 "cftoken.l" + { YYD; return(WEAK_PHASE1_CHECK); } + YY_BREAK + /* remote proposal */ + case 182: + YY_RULE_SETUP +-#line 365 "cftoken.l" ++#line 366 "cftoken.l" + { BEGIN S_RMTP; YYDB; return(PROPOSAL); } + YY_BREAK + case 183: + YY_RULE_SETUP +-#line 366 "cftoken.l" ++#line 367 "cftoken.l" + { return(BOC); } + YY_BREAK + case 184: + YY_RULE_SETUP +-#line 367 "cftoken.l" ++#line 368 "cftoken.l" + { BEGIN S_RMTS; return(EOC); } + YY_BREAK + case 185: + YY_RULE_SETUP +-#line 368 "cftoken.l" ++#line 369 "cftoken.l" + { YYD; return(LIFETIME); } + YY_BREAK + case 186: + YY_RULE_SETUP +-#line 369 "cftoken.l" ++#line 370 "cftoken.l" + { YYD; return(LIFETYPE_TIME); } + YY_BREAK + case 187: + YY_RULE_SETUP +-#line 370 "cftoken.l" ++#line 371 "cftoken.l" + { YYD; return(LIFETYPE_BYTE); } + YY_BREAK + case 188: + YY_RULE_SETUP +-#line 371 "cftoken.l" ++#line 372 "cftoken.l" + { YYD; yylval.num = algclass_isakmp_enc; return(ALGORITHM_CLASS); } + YY_BREAK + case 189: + YY_RULE_SETUP +-#line 372 "cftoken.l" ++#line 373 "cftoken.l" + { YYD; yylval.num = algclass_isakmp_ameth; return(ALGORITHM_CLASS); } + YY_BREAK + case 190: + YY_RULE_SETUP +-#line 373 "cftoken.l" ++#line 374 "cftoken.l" + { YYD; yylval.num = algclass_isakmp_hash; return(ALGORITHM_CLASS); } + YY_BREAK + case 191: + YY_RULE_SETUP +-#line 374 "cftoken.l" ++#line 375 "cftoken.l" + { YYD; return(DH_GROUP); } + YY_BREAK + case 192: + YY_RULE_SETUP +-#line 375 "cftoken.l" ++#line 376 "cftoken.l" + { YYD; return(GSS_ID); } + YY_BREAK + case 193: + YY_RULE_SETUP +-#line 376 "cftoken.l" ++#line 377 "cftoken.l" + { YYD; return(GSS_ID); } /* for back compatibility */ + YY_BREAK + /* GSS ID encoding type (global) */ + case 194: + YY_RULE_SETUP +-#line 379 "cftoken.l" ++#line 380 "cftoken.l" + { BEGIN S_GSSENC; YYDB; return(GSS_ID_ENC); } + YY_BREAK + case 195: + YY_RULE_SETUP +-#line 380 "cftoken.l" ++#line 381 "cftoken.l" + { YYD; yylval.num = LC_GSSENC_LATIN1; + return(GSS_ID_ENCTYPE); } + YY_BREAK + case 196: + YY_RULE_SETUP +-#line 382 "cftoken.l" ++#line 383 "cftoken.l" + { YYD; yylval.num = LC_GSSENC_UTF16LE; + return(GSS_ID_ENCTYPE); } + YY_BREAK + case 197: + YY_RULE_SETUP +-#line 384 "cftoken.l" ++#line 385 "cftoken.l" + { BEGIN S_INI; YYDB; return(EOS); } + YY_BREAK + /* parameter */ + case 198: + YY_RULE_SETUP +-#line 387 "cftoken.l" ++#line 388 "cftoken.l" + { YYD; yylval.num = TRUE; return(SWITCH); } + YY_BREAK + case 199: + YY_RULE_SETUP +-#line 388 "cftoken.l" ++#line 389 "cftoken.l" + { YYD; yylval.num = FALSE; return(SWITCH); } + YY_BREAK + /* prefix */ + case 200: + YY_RULE_SETUP +-#line 391 "cftoken.l" ++#line 392 "cftoken.l" + { + YYD; + yytext++; +@@ -2947,7 +2970,7 @@ YY_RULE_SETUP + /* port number */ + case 201: + YY_RULE_SETUP +-#line 399 "cftoken.l" ++#line 400 "cftoken.l" + { + char *p = yytext; + YYD; +@@ -2961,7 +2984,7 @@ YY_RULE_SETUP + /* address range */ + case 202: + YY_RULE_SETUP +-#line 410 "cftoken.l" ++#line 411 "cftoken.l" + { + YYD; + yytext++; +@@ -2977,318 +3000,318 @@ YY_RULE_SETUP + /* upper protocol */ + case 203: + YY_RULE_SETUP +-#line 423 "cftoken.l" ++#line 424 "cftoken.l" + { YYD; yylval.num = IPPROTO_ESP; return(UL_PROTO); } + YY_BREAK + case 204: + YY_RULE_SETUP +-#line 424 "cftoken.l" ++#line 425 "cftoken.l" + { YYD; yylval.num = IPPROTO_AH; return(UL_PROTO); } + YY_BREAK + case 205: + YY_RULE_SETUP +-#line 425 "cftoken.l" ++#line 426 "cftoken.l" + { YYD; yylval.num = IPPROTO_IPCOMP; return(UL_PROTO); } + YY_BREAK + case 206: + YY_RULE_SETUP +-#line 426 "cftoken.l" ++#line 427 "cftoken.l" + { YYD; yylval.num = IPPROTO_ICMP; return(UL_PROTO); } + YY_BREAK + case 207: + YY_RULE_SETUP +-#line 427 "cftoken.l" ++#line 428 "cftoken.l" + { YYD; yylval.num = IPPROTO_ICMPV6; return(UL_PROTO); } + YY_BREAK + case 208: + YY_RULE_SETUP +-#line 428 "cftoken.l" ++#line 429 "cftoken.l" + { YYD; yylval.num = IPPROTO_TCP; return(UL_PROTO); } + YY_BREAK + case 209: + YY_RULE_SETUP +-#line 429 "cftoken.l" ++#line 430 "cftoken.l" + { YYD; yylval.num = IPPROTO_UDP; return(UL_PROTO); } + YY_BREAK + /* algorithm type */ + case 210: + YY_RULE_SETUP +-#line 432 "cftoken.l" ++#line 433 "cftoken.l" + { YYD; yylval.num = algtype_des_iv64; return(ALGORITHMTYPE); } + YY_BREAK + case 211: + YY_RULE_SETUP +-#line 433 "cftoken.l" ++#line 434 "cftoken.l" + { YYD; yylval.num = algtype_des; return(ALGORITHMTYPE); } + YY_BREAK + case 212: + YY_RULE_SETUP +-#line 434 "cftoken.l" ++#line 435 "cftoken.l" + { YYD; yylval.num = algtype_3des; return(ALGORITHMTYPE); } + YY_BREAK + case 213: + YY_RULE_SETUP +-#line 435 "cftoken.l" ++#line 436 "cftoken.l" + { YYD; yylval.num = algtype_rc5; return(ALGORITHMTYPE); } + YY_BREAK + case 214: + YY_RULE_SETUP +-#line 436 "cftoken.l" ++#line 437 "cftoken.l" + { YYD; yylval.num = algtype_idea; return(ALGORITHMTYPE); } + YY_BREAK + case 215: + YY_RULE_SETUP +-#line 437 "cftoken.l" ++#line 438 "cftoken.l" + { YYD; yylval.num = algtype_cast128; return(ALGORITHMTYPE); } + YY_BREAK + case 216: + YY_RULE_SETUP +-#line 438 "cftoken.l" ++#line 439 "cftoken.l" + { YYD; yylval.num = algtype_blowfish; return(ALGORITHMTYPE); } + YY_BREAK + case 217: + YY_RULE_SETUP +-#line 439 "cftoken.l" ++#line 440 "cftoken.l" + { YYD; yylval.num = algtype_3idea; return(ALGORITHMTYPE); } + YY_BREAK + case 218: + YY_RULE_SETUP +-#line 440 "cftoken.l" ++#line 441 "cftoken.l" + { YYD; yylval.num = algtype_des_iv32; return(ALGORITHMTYPE); } + YY_BREAK + case 219: + YY_RULE_SETUP +-#line 441 "cftoken.l" ++#line 442 "cftoken.l" + { YYD; yylval.num = algtype_rc4; return(ALGORITHMTYPE); } + YY_BREAK + case 220: + YY_RULE_SETUP +-#line 442 "cftoken.l" ++#line 443 "cftoken.l" + { YYD; yylval.num = algtype_null_enc; return(ALGORITHMTYPE); } + YY_BREAK + case 221: + YY_RULE_SETUP +-#line 443 "cftoken.l" ++#line 444 "cftoken.l" + { YYD; yylval.num = algtype_null_enc; return(ALGORITHMTYPE); } + YY_BREAK + case 222: + YY_RULE_SETUP +-#line 444 "cftoken.l" ++#line 445 "cftoken.l" + { YYD; yylval.num = algtype_aes; return(ALGORITHMTYPE); } + YY_BREAK + case 223: + YY_RULE_SETUP +-#line 445 "cftoken.l" ++#line 446 "cftoken.l" + { YYD; yylval.num = algtype_aes; return(ALGORITHMTYPE); } + YY_BREAK + case 224: + YY_RULE_SETUP +-#line 446 "cftoken.l" ++#line 447 "cftoken.l" + { YYD; yylval.num = algtype_twofish; return(ALGORITHMTYPE); } + YY_BREAK + case 225: + YY_RULE_SETUP +-#line 447 "cftoken.l" ++#line 448 "cftoken.l" + { YYD; yylval.num = algtype_camellia; return(ALGORITHMTYPE); } + YY_BREAK + case 226: + YY_RULE_SETUP +-#line 448 "cftoken.l" ++#line 449 "cftoken.l" + { YYD; yylval.num = algtype_non_auth; return(ALGORITHMTYPE); } + YY_BREAK + case 227: + YY_RULE_SETUP +-#line 449 "cftoken.l" ++#line 450 "cftoken.l" + { YYD; yylval.num = algtype_hmac_md5; return(ALGORITHMTYPE); } + YY_BREAK + case 228: + YY_RULE_SETUP +-#line 450 "cftoken.l" ++#line 451 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha1; return(ALGORITHMTYPE); } + YY_BREAK + case 229: + YY_RULE_SETUP +-#line 451 "cftoken.l" ++#line 452 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_256; return(ALGORITHMTYPE); } + YY_BREAK + case 230: + YY_RULE_SETUP +-#line 452 "cftoken.l" ++#line 453 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_256; return(ALGORITHMTYPE); } + YY_BREAK + case 231: + YY_RULE_SETUP +-#line 453 "cftoken.l" ++#line 454 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_384; return(ALGORITHMTYPE); } + YY_BREAK + case 232: + YY_RULE_SETUP +-#line 454 "cftoken.l" ++#line 455 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_384; return(ALGORITHMTYPE); } + YY_BREAK + case 233: + YY_RULE_SETUP +-#line 455 "cftoken.l" ++#line 456 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_512; return(ALGORITHMTYPE); } + YY_BREAK + case 234: + YY_RULE_SETUP +-#line 456 "cftoken.l" ++#line 457 "cftoken.l" + { YYD; yylval.num = algtype_hmac_sha2_512; return(ALGORITHMTYPE); } + YY_BREAK + case 235: + YY_RULE_SETUP +-#line 457 "cftoken.l" ++#line 458 "cftoken.l" + { YYD; yylval.num = algtype_des_mac; return(ALGORITHMTYPE); } + YY_BREAK + case 236: + YY_RULE_SETUP +-#line 458 "cftoken.l" ++#line 459 "cftoken.l" + { YYD; yylval.num = algtype_kpdk; return(ALGORITHMTYPE); } + YY_BREAK + case 237: + YY_RULE_SETUP +-#line 459 "cftoken.l" ++#line 460 "cftoken.l" + { YYD; yylval.num = algtype_md5; return(ALGORITHMTYPE); } + YY_BREAK + case 238: + YY_RULE_SETUP +-#line 460 "cftoken.l" ++#line 461 "cftoken.l" + { YYD; yylval.num = algtype_sha1; return(ALGORITHMTYPE); } + YY_BREAK + case 239: + YY_RULE_SETUP +-#line 461 "cftoken.l" ++#line 462 "cftoken.l" + { YYD; yylval.num = algtype_tiger; return(ALGORITHMTYPE); } + YY_BREAK + case 240: + YY_RULE_SETUP +-#line 462 "cftoken.l" ++#line 463 "cftoken.l" + { YYD; yylval.num = algtype_sha2_256; return(ALGORITHMTYPE); } + YY_BREAK + case 241: + YY_RULE_SETUP +-#line 463 "cftoken.l" ++#line 464 "cftoken.l" + { YYD; yylval.num = algtype_sha2_256; return(ALGORITHMTYPE); } + YY_BREAK + case 242: + YY_RULE_SETUP +-#line 464 "cftoken.l" ++#line 465 "cftoken.l" + { YYD; yylval.num = algtype_sha2_384; return(ALGORITHMTYPE); } + YY_BREAK + case 243: + YY_RULE_SETUP +-#line 465 "cftoken.l" ++#line 466 "cftoken.l" + { YYD; yylval.num = algtype_sha2_384; return(ALGORITHMTYPE); } + YY_BREAK + case 244: + YY_RULE_SETUP +-#line 466 "cftoken.l" ++#line 467 "cftoken.l" + { YYD; yylval.num = algtype_sha2_512; return(ALGORITHMTYPE); } + YY_BREAK + case 245: + YY_RULE_SETUP +-#line 467 "cftoken.l" ++#line 468 "cftoken.l" + { YYD; yylval.num = algtype_sha2_512; return(ALGORITHMTYPE); } + YY_BREAK + case 246: + YY_RULE_SETUP +-#line 468 "cftoken.l" ++#line 469 "cftoken.l" + { YYD; yylval.num = algtype_oui; return(ALGORITHMTYPE); } + YY_BREAK + case 247: + YY_RULE_SETUP +-#line 469 "cftoken.l" ++#line 470 "cftoken.l" + { YYD; yylval.num = algtype_deflate; return(ALGORITHMTYPE); } + YY_BREAK + case 248: + YY_RULE_SETUP +-#line 470 "cftoken.l" ++#line 471 "cftoken.l" + { YYD; yylval.num = algtype_lzs; return(ALGORITHMTYPE); } + YY_BREAK + case 249: + YY_RULE_SETUP +-#line 471 "cftoken.l" ++#line 472 "cftoken.l" + { YYD; yylval.num = algtype_modp768; return(ALGORITHMTYPE); } + YY_BREAK + case 250: + YY_RULE_SETUP +-#line 472 "cftoken.l" ++#line 473 "cftoken.l" + { YYD; yylval.num = algtype_modp1024; return(ALGORITHMTYPE); } + YY_BREAK + case 251: + YY_RULE_SETUP +-#line 473 "cftoken.l" ++#line 474 "cftoken.l" + { YYD; yylval.num = algtype_modp1536; return(ALGORITHMTYPE); } + YY_BREAK + case 252: + YY_RULE_SETUP +-#line 474 "cftoken.l" ++#line 475 "cftoken.l" + { YYD; yylval.num = algtype_ec2n155; return(ALGORITHMTYPE); } + YY_BREAK + case 253: + YY_RULE_SETUP +-#line 475 "cftoken.l" ++#line 476 "cftoken.l" + { YYD; yylval.num = algtype_ec2n185; return(ALGORITHMTYPE); } + YY_BREAK + case 254: + YY_RULE_SETUP +-#line 476 "cftoken.l" ++#line 477 "cftoken.l" + { YYD; yylval.num = algtype_modp2048; return(ALGORITHMTYPE); } + YY_BREAK + case 255: + YY_RULE_SETUP +-#line 477 "cftoken.l" ++#line 478 "cftoken.l" + { YYD; yylval.num = algtype_modp3072; return(ALGORITHMTYPE); } + YY_BREAK + case 256: + YY_RULE_SETUP +-#line 478 "cftoken.l" ++#line 479 "cftoken.l" + { YYD; yylval.num = algtype_modp4096; return(ALGORITHMTYPE); } + YY_BREAK + case 257: + YY_RULE_SETUP +-#line 479 "cftoken.l" ++#line 480 "cftoken.l" + { YYD; yylval.num = algtype_modp6144; return(ALGORITHMTYPE); } + YY_BREAK + case 258: + YY_RULE_SETUP +-#line 480 "cftoken.l" ++#line 481 "cftoken.l" + { YYD; yylval.num = algtype_modp8192; return(ALGORITHMTYPE); } + YY_BREAK + case 259: + YY_RULE_SETUP +-#line 481 "cftoken.l" ++#line 482 "cftoken.l" + { YYD; yylval.num = algtype_psk; return(ALGORITHMTYPE); } + YY_BREAK + case 260: + YY_RULE_SETUP +-#line 482 "cftoken.l" ++#line 483 "cftoken.l" + { YYD; yylval.num = algtype_rsasig; return(ALGORITHMTYPE); } + YY_BREAK + case 261: + YY_RULE_SETUP +-#line 483 "cftoken.l" ++#line 484 "cftoken.l" + { YYD; yylval.num = algtype_dsssig; return(ALGORITHMTYPE); } + YY_BREAK + case 262: + YY_RULE_SETUP +-#line 484 "cftoken.l" ++#line 485 "cftoken.l" + { YYD; yylval.num = algtype_rsaenc; return(ALGORITHMTYPE); } + YY_BREAK + case 263: + YY_RULE_SETUP +-#line 485 "cftoken.l" ++#line 486 "cftoken.l" + { YYD; yylval.num = algtype_rsarev; return(ALGORITHMTYPE); } + YY_BREAK + case 264: + YY_RULE_SETUP +-#line 486 "cftoken.l" ++#line 487 "cftoken.l" + { YYD; yylval.num = algtype_gssapikrb; return(ALGORITHMTYPE); } + YY_BREAK + case 265: + YY_RULE_SETUP +-#line 487 "cftoken.l" ++#line 488 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_hybrid_rsa_s; return(ALGORITHMTYPE); +@@ -3299,7 +3322,7 @@ YY_RULE_SETUP + YY_BREAK + case 266: + YY_RULE_SETUP +-#line 494 "cftoken.l" ++#line 495 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_hybrid_dss_s; return(ALGORITHMTYPE); +@@ -3310,7 +3333,7 @@ YY_RULE_SETUP + YY_BREAK + case 267: + YY_RULE_SETUP +-#line 501 "cftoken.l" ++#line 502 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_hybrid_rsa_c; return(ALGORITHMTYPE); +@@ -3321,7 +3344,7 @@ YY_RULE_SETUP + YY_BREAK + case 268: + YY_RULE_SETUP +-#line 508 "cftoken.l" ++#line 509 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_hybrid_dss_c; return(ALGORITHMTYPE); +@@ -3332,7 +3355,7 @@ YY_RULE_SETUP + YY_BREAK + case 269: + YY_RULE_SETUP +-#line 515 "cftoken.l" ++#line 516 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_xauth_psk_s; return(ALGORITHMTYPE); +@@ -3343,7 +3366,7 @@ YY_RULE_SETUP + YY_BREAK + case 270: + YY_RULE_SETUP +-#line 522 "cftoken.l" ++#line 523 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_xauth_psk_c; return(ALGORITHMTYPE); +@@ -3354,7 +3377,7 @@ YY_RULE_SETUP + YY_BREAK + case 271: + YY_RULE_SETUP +-#line 529 "cftoken.l" ++#line 530 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_xauth_rsa_s; return(ALGORITHMTYPE); +@@ -3365,7 +3388,7 @@ YY_RULE_SETUP + YY_BREAK + case 272: + YY_RULE_SETUP +-#line 536 "cftoken.l" ++#line 537 "cftoken.l" + { + #ifdef ENABLE_HYBRID + YYD; yylval.num = algtype_xauth_rsa_c; return(ALGORITHMTYPE); +@@ -3377,105 +3400,105 @@ YY_RULE_SETUP + /* identifier type */ + case 273: + YY_RULE_SETUP +-#line 546 "cftoken.l" ++#line 547 "cftoken.l" + { YYD; yywarn("it is obsoleted."); return(VENDORID); } + YY_BREAK + case 274: + YY_RULE_SETUP +-#line 547 "cftoken.l" ++#line 548 "cftoken.l" + { YYD; yylval.num = IDTYPE_USERFQDN; return(IDENTIFIERTYPE); } + YY_BREAK + case 275: + YY_RULE_SETUP +-#line 548 "cftoken.l" ++#line 549 "cftoken.l" + { YYD; yylval.num = IDTYPE_FQDN; return(IDENTIFIERTYPE); } + YY_BREAK + case 276: + YY_RULE_SETUP +-#line 549 "cftoken.l" ++#line 550 "cftoken.l" + { YYD; yylval.num = IDTYPE_KEYID; return(IDENTIFIERTYPE); } + YY_BREAK + case 277: + YY_RULE_SETUP +-#line 550 "cftoken.l" ++#line 551 "cftoken.l" + { YYD; yylval.num = IDTYPE_ADDRESS; return(IDENTIFIERTYPE); } + YY_BREAK + case 278: + YY_RULE_SETUP +-#line 551 "cftoken.l" ++#line 552 "cftoken.l" + { YYD; yylval.num = IDTYPE_SUBNET; return(IDENTIFIERTYPE); } + YY_BREAK + case 279: + YY_RULE_SETUP +-#line 552 "cftoken.l" ++#line 553 "cftoken.l" + { YYD; yylval.num = IDTYPE_ASN1DN; return(IDENTIFIERTYPE); } + YY_BREAK + case 280: + YY_RULE_SETUP +-#line 553 "cftoken.l" ++#line 554 "cftoken.l" + { YYD; yywarn("certname will be obsoleted in near future."); yylval.num = IDTYPE_ASN1DN; return(IDENTIFIERTYPE); } + YY_BREAK + /* identifier qualifier */ + case 281: + YY_RULE_SETUP +-#line 556 "cftoken.l" ++#line 557 "cftoken.l" + { YYD; yylval.num = IDQUAL_TAG; return(IDENTIFIERQUAL); } + YY_BREAK + case 282: + YY_RULE_SETUP +-#line 557 "cftoken.l" ++#line 558 "cftoken.l" + { YYD; yylval.num = IDQUAL_FILE; return(IDENTIFIERQUAL); } + YY_BREAK + /* units */ + case 283: + YY_RULE_SETUP +-#line 560 "cftoken.l" ++#line 561 "cftoken.l" + { YYD; return(UNITTYPE_BYTE); } + YY_BREAK + case 284: + YY_RULE_SETUP +-#line 561 "cftoken.l" ++#line 562 "cftoken.l" + { YYD; return(UNITTYPE_KBYTES); } + YY_BREAK + case 285: + YY_RULE_SETUP +-#line 562 "cftoken.l" ++#line 563 "cftoken.l" + { YYD; return(UNITTYPE_MBYTES); } + YY_BREAK + case 286: + YY_RULE_SETUP +-#line 563 "cftoken.l" ++#line 564 "cftoken.l" + { YYD; return(UNITTYPE_TBYTES); } + YY_BREAK + case 287: + YY_RULE_SETUP +-#line 564 "cftoken.l" ++#line 565 "cftoken.l" + { YYD; return(UNITTYPE_SEC); } + YY_BREAK + case 288: + YY_RULE_SETUP +-#line 565 "cftoken.l" ++#line 566 "cftoken.l" + { YYD; return(UNITTYPE_MIN); } + YY_BREAK + case 289: + YY_RULE_SETUP +-#line 566 "cftoken.l" ++#line 567 "cftoken.l" + { YYD; return(UNITTYPE_HOUR); } + YY_BREAK + /* boolean */ + case 290: + YY_RULE_SETUP +-#line 569 "cftoken.l" ++#line 570 "cftoken.l" + { YYD; yylval.num = TRUE; return(BOOLEAN); } + YY_BREAK + case 291: + YY_RULE_SETUP +-#line 570 "cftoken.l" ++#line 571 "cftoken.l" + { YYD; yylval.num = FALSE; return(BOOLEAN); } + YY_BREAK + case 292: + YY_RULE_SETUP +-#line 572 "cftoken.l" ++#line 573 "cftoken.l" + { + char *bp; + +@@ -3486,7 +3509,7 @@ YY_RULE_SETUP + YY_BREAK + case 293: + YY_RULE_SETUP +-#line 580 "cftoken.l" ++#line 581 "cftoken.l" + { + char *p; + +@@ -3512,7 +3535,7 @@ YY_RULE_SETUP + case 294: + /* rule 294 can match eol */ + YY_RULE_SETUP +-#line 602 "cftoken.l" ++#line 603 "cftoken.l" + { + char *p = yytext; + +@@ -3532,7 +3555,7 @@ YY_RULE_SETUP + YY_BREAK + case 295: + YY_RULE_SETUP +-#line 619 "cftoken.l" ++#line 620 "cftoken.l" + { + YYD; + +@@ -3566,7 +3589,7 @@ case YY_STATE_EOF(S_RMTS): + case YY_STATE_EOF(S_RMTP): + case YY_STATE_EOF(S_SA): + case YY_STATE_EOF(S_GSSENC): +-#line 632 "cftoken.l" ++#line 633 "cftoken.l" + { + yy_delete_buffer(YY_CURRENT_BUFFER); + incstackp--; +@@ -3594,36 +3617,36 @@ case YY_STATE_EOF(S_GSSENC): + /* ... */ + case 296: + YY_RULE_SETUP +-#line 657 "cftoken.l" ++#line 658 "cftoken.l" + { ; } + YY_BREAK + case 297: + /* rule 297 can match eol */ + YY_RULE_SETUP +-#line 658 "cftoken.l" ++#line 659 "cftoken.l" + { incstack[incstackp].lineno++; } + YY_BREAK + case 298: + YY_RULE_SETUP +-#line 659 "cftoken.l" ++#line 660 "cftoken.l" + { YYD; } + YY_BREAK + case 299: + YY_RULE_SETUP +-#line 660 "cftoken.l" ++#line 661 "cftoken.l" + { return(EOS); } + YY_BREAK + case 300: + YY_RULE_SETUP +-#line 661 "cftoken.l" ++#line 662 "cftoken.l" + { yymore(); } + YY_BREAK + case 301: + YY_RULE_SETUP +-#line 663 "cftoken.l" ++#line 664 "cftoken.l" + ECHO; + YY_BREAK +-#line 3627 "cftoken.c" ++#line 3650 "cftoken.c" + + case YY_END_OF_BUFFER: + { +@@ -4171,9 +4194,19 @@ static void yy_load_buffer_state (void) + yyfree((void *) b ); + } + +-#ifndef __cplusplus ++#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */ ++#ifdef __cplusplus ++extern "C" { ++#endif ++#ifdef __THROW /* this is a gnuism */ ++extern int isatty (int ) __THROW; ++#else + extern int isatty (int ); +-#endif /* __cplusplus */ ++#endif ++#ifdef __cplusplus ++} ++#endif ++#endif + + /* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, +@@ -4619,7 +4652,7 @@ void yyfree (void * ptr ) + + #define YYTABLES_NAME "yytables" + +-#line 663 "cftoken.l" ++#line 664 "cftoken.l" + + + diff --git a/package/ipsec-tools/patches/patch-src_racoon_cftoken_l b/package/ipsec-tools/patches/patch-src_racoon_cftoken_l index 977ba8a..8ada6f6 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_cftoken_l +++ b/package/ipsec-tools/patches/patch-src_racoon_cftoken_l @@ -1,11 +1,10 @@ -$Id$ ---- ipsec-tools-0.6.4.orig/src/racoon/cftoken.l 2005-11-06 18:18:26.000000000 +0100 -+++ ipsec-tools-0.6.4/src/racoon/cftoken.l 2007-06-28 16:58:31.000000000 +0200 -@@ -105,6 +105,8 @@ static struct include_stack { +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/cftoken.l 2007-09-03 20:07:29.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/cftoken.l 2009-05-29 15:46:06.836399719 +0200 +@@ -104,6 +104,7 @@ static struct include_stack { static int incstackp = 0; static int yy_first_time = 1; -+ +int yywrap(void) { return 1; } %} diff --git a/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c b/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c index 66f9ba7..76c6a62 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c +++ b/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c @@ -1,12 +1,48 @@ -$Id$ ---- ipsec-tools-0.6.4.orig/src/racoon/crypto_openssl.c 2005-07-12 13:50:15.000000000 +0200 -+++ ipsec-tools-0.6.4/src/racoon/crypto_openssl.c 2007-06-28 17:04:27.000000000 +0200 -@@ -81,7 +81,7 @@ - #ifdef HAVE_OPENSSL_SHA2_H - #include - #else --#include "crypto/sha2/sha2.h" -+#include "missing/crypto/sha2/sha2.h" +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/crypto_openssl.c 2009-04-20 15:33:30.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/crypto_openssl.c 2009-05-29 15:31:04.728378359 +0200 +@@ -63,8 +63,12 @@ + #ifdef HAVE_OPENSSL_ENGINE_H + #include #endif ++#ifndef OPENSSL_NO_BF + #include ++#endif ++#ifndef OPENSSL_NO_CAST + #include ++#endif + #include + #ifdef HAVE_OPENSSL_RC5_H + #include +@@ -1347,6 +1351,7 @@ eay_idea_keylen(len) + } #endif ++#ifndef OPENSSL_NO_BF + /* + * BLOWFISH-CBC + */ +@@ -1381,6 +1386,7 @@ eay_bf_keylen(len) + return -1; + return len; + } ++#endif + + #ifdef HAVE_OPENSSL_RC5_H + /* +@@ -1492,6 +1498,7 @@ eay_3des_keylen(len) + return 192; + } + ++#ifndef OPENSSL_NO_CAST + /* + * CAST-CBC + */ +@@ -1526,6 +1533,7 @@ eay_cast_keylen(len) + return -1; + return len; + } ++#endif + + /* + * AES(RIJNDAEL)-CBC diff --git a/package/ipsec-tools/patches/patch-src_racoon_eaytest_c b/package/ipsec-tools/patches/patch-src_racoon_eaytest_c new file mode 100644 index 0000000..a7d7807 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_racoon_eaytest_c @@ -0,0 +1,27 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/eaytest.c 2008-07-16 10:50:02.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/eaytest.c 2009-05-29 15:33:04.286374004 +0200 +@@ -683,19 +683,23 @@ ciphertest(ac, av) + eay_aes_encrypt, eay_aes_decrypt) < 0) + return -1; + ++#ifndef OPENSSL_NO_BF + if (ciphertest_1 ("BLOWFISH", + &data, 8, + &key, key.l, + &iv0, 8, + eay_bf_encrypt, eay_bf_decrypt) < 0) + return -1; ++#endif + ++#ifndef OPENSSL_NO_CAST + if (ciphertest_1 ("CAST", + &data, 8, + &key, key.l, + &iv0, 8, + eay_cast_encrypt, eay_cast_decrypt) < 0) + return -1; ++#endif + + #ifdef HAVE_OPENSSL_IDEA_H + if (ciphertest_1 ("IDEA", diff --git a/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c b/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c new file mode 100644 index 0000000..7b612f0 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/isakmp_xauth.c 2009-04-20 15:35:36.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/isakmp_xauth.c 2009-05-29 15:56:30.460377529 +0200 +@@ -585,7 +585,7 @@ PAM_conv(msg_count, msg, rsp, dontcare) + + if ((reply = racoon_malloc(sizeof(*reply) * msg_count)) == NULL) + return PAM_CONV_ERR; +- bzero(reply, sizeof(*reply) * msg_count); ++ memset(reply, 0, sizeof(*reply) * msg_count); + + for (i = 0; i < msg_count; i++) { + switch (msg[i]->msg_style) { diff --git a/package/ipsec-tools/patches/patch-src_racoon_pfkey_c b/package/ipsec-tools/patches/patch-src_racoon_pfkey_c new file mode 100644 index 0000000..cedbc5c --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_racoon_pfkey_c @@ -0,0 +1,18 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/pfkey.c 2008-12-08 07:06:24.000000000 +0100 ++++ ipsec-tools-0.7.2/src/racoon/pfkey.c 2009-05-29 15:48:49.201433105 +0200 +@@ -3008,12 +3008,12 @@ addnewsp(mhp) + struct sockaddr *paddr; + + paddr = (struct sockaddr *)(xisr + 1); +- bcopy(paddr, &(*p_isr)->saidx.src, ++ memcpy(&(*p_isr)->saidx.src, paddr, + sysdep_sa_len(paddr)); + + paddr = (struct sockaddr *)((caddr_t)paddr + + sysdep_sa_len(paddr)); +- bcopy(paddr, &(*p_isr)->saidx.dst, ++ memcpy(&(*p_isr)->saidx.dst, paddr, + sysdep_sa_len(paddr)); + } + diff --git a/package/ipsec-tools/patches/patch-src_racoon_privsep_c b/package/ipsec-tools/patches/patch-src_racoon_privsep_c new file mode 100644 index 0000000..c69abd2 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_racoon_privsep_c @@ -0,0 +1,93 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/privsep.c 2008-12-08 07:06:24.000000000 +0100 ++++ ipsec-tools-0.7.2/src/racoon/privsep.c 2009-05-29 15:55:47.787585131 +0200 +@@ -323,7 +323,7 @@ privsep_init(void) + strerror(errno)); + goto out; + } +- bzero(reply, sizeof(*reply)); ++ memset(reply, 0, sizeof(*reply)); + reply->hdr.ac_cmd = combuf->hdr.ac_cmd; + reply->hdr.ac_len = sizeof(*reply); + +@@ -421,7 +421,7 @@ privsep_init(void) + strerror(errno)); + goto out; + } +- bzero(envp, (envc + 1) * sizeof(char *)); ++ memset(envp, 0, (envc + 1) * sizeof(char *)); + + + /* +@@ -716,7 +716,7 @@ privsep_eay_get_pkcs1privkey(path) + "Cannot allocate memory: %s\n", strerror(errno)); + return NULL; + } +- bzero(msg, len); ++ memset(msg, 0, len); + msg->hdr.ac_cmd = PRIVSEP_EAY_GET_PKCS1PRIVKEY; + msg->hdr.ac_len = len; + msg->bufs.buflen[0] = len - sizeof(*msg); +@@ -797,7 +797,7 @@ privsep_script_exec(script, name, envp) + return -1; + } + +- bzero(msg, sizeof(*msg)); ++ memset(msg, 0, sizeof(*msg)); + msg->hdr.ac_cmd = PRIVSEP_SCRIPT_EXEC; + msg->hdr.ac_len = sizeof(*msg); + +@@ -906,7 +906,7 @@ privsep_getpsk(str, keylen) + "Cannot allocate memory: %s\n", strerror(errno)); + return NULL; + } +- bzero(msg, len); ++ memset(msg, 0, len); + msg->hdr.ac_cmd = PRIVSEP_GETPSK; + msg->hdr.ac_len = len; + +@@ -960,7 +960,7 @@ privsep_xauth_login_system(usr, pwd) + "Cannot allocate memory: %s\n", strerror(errno)); + return -1; + } +- bzero(msg, len); ++ memset(msg, 0, len); + msg->hdr.ac_cmd = PRIVSEP_XAUTH_LOGIN_SYSTEM; + msg->hdr.ac_len = len; + +@@ -1014,7 +1014,7 @@ privsep_accounting_system(port, raddr, u + "Cannot allocate memory: %s\n", strerror(errno)); + return -1; + } +- bzero(msg, len); ++ memset(msg, 0, len); + msg->hdr.ac_cmd = PRIVSEP_ACCOUNTING_SYSTEM; + msg->hdr.ac_len = len; + msg->bufs.buflen[0] = sizeof(port); +@@ -1187,7 +1187,7 @@ privsep_accounting_pam(port, inout) + "Cannot allocate memory: %s\n", strerror(errno)); + return -1; + } +- bzero(msg, len); ++ memset(msg, 0, len); + msg->hdr.ac_cmd = PRIVSEP_ACCOUNTING_PAM; + msg->hdr.ac_len = len; + msg->bufs.buflen[0] = sizeof(port); +@@ -1248,7 +1248,7 @@ privsep_xauth_login_pam(port, raddr, usr + "Cannot allocate memory: %s\n", strerror(errno)); + return -1; + } +- bzero(msg, len); ++ memset(msg, 0, len); + msg->hdr.ac_cmd = PRIVSEP_XAUTH_LOGIN_PAM; + msg->hdr.ac_len = len; + msg->bufs.buflen[0] = sizeof(port); +@@ -1312,7 +1312,7 @@ privsep_cleanup_pam(port) + "Cannot allocate memory: %s\n", strerror(errno)); + return; + } +- bzero(msg, len); ++ memset(msg, 0, len); + msg->hdr.ac_cmd = PRIVSEP_CLEANUP_PAM; + msg->hdr.ac_len = len; + msg->bufs.buflen[0] = sizeof(port); diff --git a/package/ipsec-tools/patches/patch-src_racoon_racoonctl_c b/package/ipsec-tools/patches/patch-src_racoon_racoonctl_c new file mode 100644 index 0000000..d5d6267 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_racoon_racoonctl_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/racoonctl.c 2009-04-20 15:32:57.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/racoonctl.c 2009-05-29 15:57:45.600377208 +0200 +@@ -785,7 +785,7 @@ f_vpnc(ac, av) + errx(1, "cannot read source address"); + + /* We get "ip[port]" strip the port */ +- if ((idx = index(srcaddr, '[')) == NULL) ++ if ((idx = strchr(srcaddr, '[')) == NULL) + errx(1, "unexpected source address format"); + *idx = '\0'; + diff --git a/package/ipsec-tools/patches/patch-src_setkey_token_c b/package/ipsec-tools/patches/patch-src_setkey_token_c new file mode 100644 index 0000000..1c02318 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_setkey_token_c @@ -0,0 +1,707 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/setkey/token.c 2008-07-23 10:26:58.000000000 +0200 ++++ ipsec-tools-0.7.2/src/setkey/token.c 2009-05-29 15:26:39.126303087 +0200 +@@ -8,7 +8,7 @@ + #define FLEX_SCANNER + #define YY_FLEX_MAJOR_VERSION 2 + #define YY_FLEX_MINOR_VERSION 5 +-#define YY_FLEX_SUBMINOR_VERSION 34 ++#define YY_FLEX_SUBMINOR_VERSION 35 + #if YY_FLEX_SUBMINOR_VERSION > 0 + #define FLEX_BETA + #endif +@@ -178,13 +178,6 @@ extern FILE *yyin, *yyout; + + #define unput(c) yyunput( c, (yytext_ptr) ) + +-/* The following is because we cannot portably get our hands on size_t +- * (without autoconf's help, which isn't available because we want +- * flex-generated scanners to compile on their own). +- * Given that the standard has decreed that size_t exists since 1989, +- * I guess we can afford to depend on it. Manoj. +- */ +- + #ifndef YY_TYPEDEF_YY_SIZE_T + #define YY_TYPEDEF_YY_SIZE_T + typedef size_t yy_size_t; +@@ -1069,9 +1062,10 @@ char *yytext; + #if defined(SADB_X_EALG_AES) && ! defined(SADB_X_EALG_AESCBC) + #define SADB_X_EALG_AESCBC SADB_X_EALG_AES + #endif ++int yywrap(void) { return 1; } + /* common section */ + +-#line 1075 "token.c" ++#line 1069 "token.c" + + #define INITIAL 0 + #define S_PL 1 +@@ -1092,6 +1086,35 @@ char *yytext; + + static int yy_init_globals (void ); + ++/* Accessor methods to globals. ++ These are made visible to non-reentrant scanners for convenience. */ ++ ++int yylex_destroy (void ); ++ ++int yyget_debug (void ); ++ ++void yyset_debug (int debug_flag ); ++ ++YY_EXTRA_TYPE yyget_extra (void ); ++ ++void yyset_extra (YY_EXTRA_TYPE user_defined ); ++ ++FILE *yyget_in (void ); ++ ++void yyset_in (FILE * in_str ); ++ ++FILE *yyget_out (void ); ++ ++void yyset_out (FILE * out_str ); ++ ++int yyget_leng (void ); ++ ++char *yyget_text (void ); ++ ++int yyget_lineno (void ); ++ ++void yyset_lineno (int line_number ); ++ + /* Macros after this point can all be overridden by user definitions in + * section 1. + */ +@@ -1227,10 +1250,10 @@ YY_DECL + register char *yy_cp, *yy_bp; + register int yy_act; + +-#line 114 "token.l" ++#line 115 "token.l" + + +-#line 1234 "token.c" ++#line 1257 "token.c" + + if ( !(yy_init) ) + { +@@ -1321,84 +1344,84 @@ do_action: /* This label is used only to + + case 1: + YY_RULE_SETUP +-#line 116 "token.l" ++#line 117 "token.l" + { return(ADD); } + YY_BREAK + case 2: + YY_RULE_SETUP +-#line 117 "token.l" ++#line 118 "token.l" + { return(DELETE); } + YY_BREAK + case 3: + YY_RULE_SETUP +-#line 118 "token.l" ++#line 119 "token.l" + { return(DELETEALL); } + YY_BREAK + case 4: + YY_RULE_SETUP +-#line 119 "token.l" ++#line 120 "token.l" + { return(GET); } + YY_BREAK + case 5: + YY_RULE_SETUP +-#line 120 "token.l" ++#line 121 "token.l" + { return(FLUSH); } + YY_BREAK + case 6: + YY_RULE_SETUP +-#line 121 "token.l" ++#line 122 "token.l" + { return(DUMP); } + YY_BREAK + case 7: + YY_RULE_SETUP +-#line 122 "token.l" ++#line 123 "token.l" + { return(EXIT); } + YY_BREAK + case 8: + YY_RULE_SETUP +-#line 123 "token.l" ++#line 124 "token.l" + { return(EXIT); } + YY_BREAK + case 9: + YY_RULE_SETUP +-#line 124 "token.l" ++#line 125 "token.l" + { return(EXIT); } + YY_BREAK + /* for management SPD */ + case 10: + YY_RULE_SETUP +-#line 127 "token.l" ++#line 128 "token.l" + { return(SPDADD); } + YY_BREAK + case 11: + YY_RULE_SETUP +-#line 128 "token.l" ++#line 129 "token.l" + { return(SPDDELETE); } + YY_BREAK + case 12: + YY_RULE_SETUP +-#line 129 "token.l" ++#line 130 "token.l" + { return(SPDDUMP); } + YY_BREAK + case 13: + YY_RULE_SETUP +-#line 130 "token.l" ++#line 131 "token.l" + { return(SPDFLUSH); } + YY_BREAK + case 14: + YY_RULE_SETUP +-#line 131 "token.l" ++#line 132 "token.l" + { return(TAGGED); } + YY_BREAK + case 15: + YY_RULE_SETUP +-#line 132 "token.l" ++#line 133 "token.l" + { BEGIN S_PL; return(F_POLICY); } + YY_BREAK + case 16: + /* rule 16 can match eol */ + YY_RULE_SETUP +-#line 133 "token.l" ++#line 134 "token.l" + { + yymore(); + +@@ -1420,13 +1443,13 @@ YY_RULE_SETUP + YY_BREAK + case 17: + YY_RULE_SETUP +-#line 151 "token.l" ++#line 152 "token.l" + { BEGIN INITIAL; return(EOT); } + YY_BREAK + /* address resolution flags */ + case 18: + YY_RULE_SETUP +-#line 154 "token.l" ++#line 155 "token.l" + { + yylval.val.len = strlen(yytext); + yylval.val.buf = strdup(yytext); +@@ -1438,37 +1461,37 @@ YY_RULE_SETUP + /* security protocols */ + case 19: + YY_RULE_SETUP +-#line 163 "token.l" ++#line 164 "token.l" + { yylval.num = 0; return(PR_AH); } + YY_BREAK + case 20: + YY_RULE_SETUP +-#line 164 "token.l" ++#line 165 "token.l" + { yylval.num = 0; return(PR_ESP); } + YY_BREAK + case 21: + YY_RULE_SETUP +-#line 165 "token.l" ++#line 166 "token.l" + { yylval.num = 1; return(PR_AH); } + YY_BREAK + case 22: + YY_RULE_SETUP +-#line 166 "token.l" ++#line 167 "token.l" + { yylval.num = 1; return(PR_ESP); } + YY_BREAK + case 23: + YY_RULE_SETUP +-#line 167 "token.l" ++#line 168 "token.l" + { yylval.num = 0; return(PR_ESPUDP); } + YY_BREAK + case 24: + YY_RULE_SETUP +-#line 168 "token.l" ++#line 169 "token.l" + { yylval.num = 0; return(PR_IPCOMP); } + YY_BREAK + case 25: + YY_RULE_SETUP +-#line 169 "token.l" ++#line 170 "token.l" + { + yylval.num = 0; return(PR_TCP); + } +@@ -1476,72 +1499,72 @@ YY_RULE_SETUP + /* authentication alogorithm */ + case 26: + YY_RULE_SETUP +-#line 174 "token.l" ++#line 175 "token.l" + { BEGIN S_AUTHALG; return(F_AUTH); } + YY_BREAK + case 27: + YY_RULE_SETUP +-#line 175 "token.l" ++#line 176 "token.l" + { yylval.num = SADB_AALG_MD5HMAC; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 28: + YY_RULE_SETUP +-#line 176 "token.l" ++#line 177 "token.l" + { yylval.num = SADB_AALG_SHA1HMAC; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 29: + YY_RULE_SETUP +-#line 177 "token.l" ++#line 178 "token.l" + { yylval.num = SADB_X_AALG_MD5; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 30: + YY_RULE_SETUP +-#line 178 "token.l" ++#line 179 "token.l" + { yylval.num = SADB_X_AALG_SHA; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 31: + YY_RULE_SETUP +-#line 179 "token.l" ++#line 180 "token.l" + { yylval.num = SADB_X_AALG_SHA2_256; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 32: + YY_RULE_SETUP +-#line 180 "token.l" ++#line 181 "token.l" + { yylval.num = SADB_X_AALG_SHA2_256; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 33: + YY_RULE_SETUP +-#line 181 "token.l" ++#line 182 "token.l" + { yylval.num = SADB_X_AALG_SHA2_384; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 34: + YY_RULE_SETUP +-#line 182 "token.l" ++#line 183 "token.l" + { yylval.num = SADB_X_AALG_SHA2_384; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 35: + YY_RULE_SETUP +-#line 183 "token.l" ++#line 184 "token.l" + { yylval.num = SADB_X_AALG_SHA2_512; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 36: + YY_RULE_SETUP +-#line 184 "token.l" ++#line 185 "token.l" + { yylval.num = SADB_X_AALG_SHA2_512; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 37: + YY_RULE_SETUP +-#line 185 "token.l" ++#line 186 "token.l" + { yylval.num = SADB_X_AALG_RIPEMD160HMAC; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 38: + YY_RULE_SETUP +-#line 186 "token.l" ++#line 187 "token.l" + { yylval.num = SADB_X_AALG_AES_XCBC_MAC; BEGIN INITIAL; return(ALG_AUTH); } + YY_BREAK + case 39: + YY_RULE_SETUP +-#line 187 "token.l" ++#line 188 "token.l" + { + #ifdef SADB_X_AALG_TCP_MD5 + yylval.num = SADB_X_AALG_TCP_MD5; +@@ -1552,63 +1575,63 @@ YY_RULE_SETUP + YY_BREAK + case 40: + YY_RULE_SETUP +-#line 194 "token.l" ++#line 195 "token.l" + { yylval.num = SADB_X_AALG_NULL; BEGIN INITIAL; return(ALG_AUTH_NOKEY); } + YY_BREAK + /* encryption alogorithm */ + case 41: + YY_RULE_SETUP +-#line 197 "token.l" ++#line 198 "token.l" + { BEGIN S_ENCALG; return(F_ENC); } + YY_BREAK + case 42: + YY_RULE_SETUP +-#line 198 "token.l" ++#line 199 "token.l" + { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 43: + YY_RULE_SETUP +-#line 199 "token.l" ++#line 200 "token.l" + { yylval.num = SADB_EALG_3DESCBC; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 44: + YY_RULE_SETUP +-#line 200 "token.l" ++#line 201 "token.l" + { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_NOKEY); } + YY_BREAK + case 45: + YY_RULE_SETUP +-#line 201 "token.l" ++#line 202 "token.l" + { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_OLD); } + YY_BREAK + case 46: + YY_RULE_SETUP +-#line 202 "token.l" ++#line 203 "token.l" + { yylval.num = SADB_X_EALG_BLOWFISHCBC; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 47: + YY_RULE_SETUP +-#line 203 "token.l" ++#line 204 "token.l" + { yylval.num = SADB_X_EALG_CAST128CBC; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 48: + YY_RULE_SETUP +-#line 204 "token.l" ++#line 205 "token.l" + { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC_DESDERIV); } + YY_BREAK + case 49: + YY_RULE_SETUP +-#line 205 "token.l" ++#line 206 "token.l" + { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC_DES32IV); } + YY_BREAK + case 50: + YY_RULE_SETUP +-#line 206 "token.l" ++#line 207 "token.l" + { yylval.num = SADB_X_EALG_TWOFISHCBC; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 51: + YY_RULE_SETUP +-#line 207 "token.l" ++#line 208 "token.l" + { + #ifdef SADB_X_EALG_AESCBC + yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); +@@ -1617,7 +1640,7 @@ YY_RULE_SETUP + YY_BREAK + case 52: + YY_RULE_SETUP +-#line 212 "token.l" ++#line 213 "token.l" + { + #ifdef SADB_X_EALG_AESCBC + yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); +@@ -1626,12 +1649,12 @@ YY_RULE_SETUP + YY_BREAK + case 53: + YY_RULE_SETUP +-#line 217 "token.l" ++#line 218 "token.l" + { yylval.num = SADB_X_EALG_AESCTR; BEGIN INITIAL; return(ALG_ENC); } + YY_BREAK + case 54: + YY_RULE_SETUP +-#line 218 "token.l" ++#line 219 "token.l" + { + #ifdef SADB_X_EALG_CAMELLIACBC + yylval.num = SADB_X_EALG_CAMELLIACBC; BEGIN INITIAL; return(ALG_ENC); +@@ -1641,152 +1664,152 @@ YY_RULE_SETUP + /* compression algorithms */ + case 55: + YY_RULE_SETUP +-#line 225 "token.l" ++#line 226 "token.l" + { return(F_COMP); } + YY_BREAK + case 56: + YY_RULE_SETUP +-#line 226 "token.l" ++#line 227 "token.l" + { yylval.num = SADB_X_CALG_OUI; return(ALG_COMP); } + YY_BREAK + case 57: + YY_RULE_SETUP +-#line 227 "token.l" ++#line 228 "token.l" + { yylval.num = SADB_X_CALG_DEFLATE; return(ALG_COMP); } + YY_BREAK + case 58: + YY_RULE_SETUP +-#line 228 "token.l" ++#line 229 "token.l" + { yylval.num = SADB_X_CALG_LZS; return(ALG_COMP); } + YY_BREAK + case 59: + YY_RULE_SETUP +-#line 229 "token.l" ++#line 230 "token.l" + { return(F_RAWCPI); } + YY_BREAK + /* extension */ + case 60: + YY_RULE_SETUP +-#line 232 "token.l" ++#line 233 "token.l" + { return(F_MODE); } + YY_BREAK + case 61: + YY_RULE_SETUP +-#line 233 "token.l" ++#line 234 "token.l" + { yylval.num = IPSEC_MODE_TRANSPORT; return(MODE); } + YY_BREAK + case 62: + YY_RULE_SETUP +-#line 234 "token.l" ++#line 235 "token.l" + { yylval.num = IPSEC_MODE_TUNNEL; return(MODE); } + YY_BREAK + case 63: + YY_RULE_SETUP +-#line 235 "token.l" ++#line 236 "token.l" + { return(F_REQID); } + YY_BREAK + case 64: + YY_RULE_SETUP +-#line 236 "token.l" ++#line 237 "token.l" + { return(F_EXT); } + YY_BREAK + case 65: + YY_RULE_SETUP +-#line 237 "token.l" ++#line 238 "token.l" + { yylval.num = SADB_X_EXT_PRAND; return(EXTENSION); } + YY_BREAK + case 66: + YY_RULE_SETUP +-#line 238 "token.l" ++#line 239 "token.l" + { yylval.num = SADB_X_EXT_PSEQ; return(EXTENSION); } + YY_BREAK + case 67: + YY_RULE_SETUP +-#line 239 "token.l" ++#line 240 "token.l" + { yylval.num = SADB_X_EXT_PZERO; return(EXTENSION); } + YY_BREAK + case 68: + YY_RULE_SETUP +-#line 240 "token.l" ++#line 241 "token.l" + { return(NOCYCLICSEQ); } + YY_BREAK + case 69: + YY_RULE_SETUP +-#line 241 "token.l" ++#line 242 "token.l" + { return(F_REPLAY); } + YY_BREAK + case 70: + YY_RULE_SETUP +-#line 242 "token.l" ++#line 243 "token.l" + { return(F_LIFETIME_HARD); } + YY_BREAK + case 71: + YY_RULE_SETUP +-#line 243 "token.l" ++#line 244 "token.l" + { return(F_LIFETIME_SOFT); } + YY_BREAK + case 72: + YY_RULE_SETUP +-#line 244 "token.l" ++#line 245 "token.l" + { return(F_LIFEBYTE_HARD); } + YY_BREAK + case 73: + YY_RULE_SETUP +-#line 245 "token.l" ++#line 246 "token.l" + { return(F_LIFEBYTE_SOFT); } + YY_BREAK + case 74: + YY_RULE_SETUP +-#line 246 "token.l" ++#line 247 "token.l" + { return(SECURITY_CTX); } + YY_BREAK + /* ... */ + case 75: + YY_RULE_SETUP +-#line 249 "token.l" ++#line 250 "token.l" + { return(ANY); } + YY_BREAK + case 76: + YY_RULE_SETUP +-#line 250 "token.l" ++#line 251 "token.l" + { } + YY_BREAK + case 77: + /* rule 77 can match eol */ + YY_RULE_SETUP +-#line 251 "token.l" ++#line 252 "token.l" + { lineno++; } + YY_BREAK + case 78: + YY_RULE_SETUP +-#line 252 "token.l" ++#line 253 "token.l" + + YY_BREAK + case 79: + YY_RULE_SETUP +-#line 253 "token.l" ++#line 254 "token.l" + { return(EOT); } + YY_BREAK + /* for address parameters: /prefix, [port] */ + case 80: + YY_RULE_SETUP +-#line 256 "token.l" ++#line 257 "token.l" + { return SLASH; } + YY_BREAK + case 81: + YY_RULE_SETUP +-#line 257 "token.l" ++#line 258 "token.l" + { return BLCL; } + YY_BREAK + case 82: + YY_RULE_SETUP +-#line 258 "token.l" ++#line 259 "token.l" + { return ELCL; } + YY_BREAK + /* parameter */ + case 83: + YY_RULE_SETUP +-#line 261 "token.l" ++#line 262 "token.l" + { + char *bp; + +@@ -1796,7 +1819,7 @@ YY_RULE_SETUP + YY_BREAK + case 84: + YY_RULE_SETUP +-#line 268 "token.l" ++#line 269 "token.l" + { + yylval.val.buf = strdup(yytext + 2); + if (!yylval.val.buf) +@@ -1809,7 +1832,7 @@ YY_RULE_SETUP + case 85: + /* rule 85 can match eol */ + YY_RULE_SETUP +-#line 277 "token.l" ++#line 278 "token.l" + { + char *p = yytext; + while (*++p != '"') ; +@@ -1825,7 +1848,7 @@ YY_RULE_SETUP + YY_BREAK + case 86: + YY_RULE_SETUP +-#line 290 "token.l" ++#line 291 "token.l" + { + yylval.val.len = yyleng; + yylval.val.buf = strdup(yytext); +@@ -1836,7 +1859,7 @@ YY_RULE_SETUP + YY_BREAK + case 87: + YY_RULE_SETUP +-#line 298 "token.l" ++#line 299 "token.l" + { + yylval.val.len = yyleng; + yylval.val.buf = strdup(yytext); +@@ -1847,7 +1870,7 @@ YY_RULE_SETUP + YY_BREAK + case 88: + YY_RULE_SETUP +-#line 306 "token.l" ++#line 307 "token.l" + { + yyfatal("Syntax error"); + /*NOTREACHED*/ +@@ -1855,10 +1878,10 @@ YY_RULE_SETUP + YY_BREAK + case 89: + YY_RULE_SETUP +-#line 311 "token.l" ++#line 312 "token.l" + ECHO; + YY_BREAK +-#line 1862 "token.c" ++#line 1885 "token.c" + case YY_STATE_EOF(INITIAL): + case YY_STATE_EOF(S_PL): + case YY_STATE_EOF(S_AUTHALG): +@@ -2411,9 +2434,19 @@ static void yy_load_buffer_state (void) + yyfree((void *) b ); + } + +-#ifndef __cplusplus ++#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */ ++#ifdef __cplusplus ++extern "C" { ++#endif ++#ifdef __THROW /* this is a gnuism */ ++extern int isatty (int ) __THROW; ++#else + extern int isatty (int ); +-#endif /* __cplusplus */ ++#endif ++#ifdef __cplusplus ++} ++#endif ++#endif + + /* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, +@@ -2859,7 +2892,7 @@ void yyfree (void * ptr ) + + #define YYTABLES_NAME "yytables" + +-#line 311 "token.l" ++#line 312 "token.l" + + + diff --git a/package/ipsec-tools/patches/patch-src_setkey_token_l b/package/ipsec-tools/patches/patch-src_setkey_token_l index b73f73f..e069783 100644 --- a/package/ipsec-tools/patches/patch-src_setkey_token_l +++ b/package/ipsec-tools/patches/patch-src_setkey_token_l @@ -1,11 +1,10 @@ -$Id$ ---- ipsec-tools-0.6.4.orig/src/setkey/token.l 2005-06-29 15:01:30.000000000 +0200 -+++ ipsec-tools-0.6.4/src/setkey/token.l 2007-06-28 16:58:31.000000000 +0200 -@@ -84,6 +84,8 @@ - #ifndef SADB_X_EALG_AESCTR - #define SADB_X_EALG_AESCTR (-1) +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/setkey/token.l 2007-08-01 13:52:23.000000000 +0200 ++++ ipsec-tools-0.7.2/src/setkey/token.l 2009-05-29 15:25:54.760377400 +0200 +@@ -86,6 +86,7 @@ + #if defined(SADB_X_EALG_AES) && ! defined(SADB_X_EALG_AESCBC) + #define SADB_X_EALG_AESCBC SADB_X_EALG_AES #endif -+ +int yywrap(void) { return 1; } %} diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 9828f77..daaaa72 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -9,12 +9,16 @@ PKG_NAME:= ipset PKG_VERSION:= 2.3.3a PKG_RELEASE:= 1 PKG_MD5SUM:= c7d2f165242edaef5581db0f7d5af520 -MASTER_SITES:= http://ipset.netfilter.org/ +PKG_DESCR:= Netfilter ip sets administration utility +PKG_SECTION:= net +PKG_URL:= http://ipset.netfilter.org +PKG_SITES:= http://ipset.netfilter.org/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= KERNEL_DIR=${LINUX_DIR} PREFIX=/usr LD=$(TARGET_CROSS)ld BUILD_STYLE= auto diff --git a/package/ipset/ipkg/ipset.control b/package/ipset/ipkg/ipset.control deleted file mode 100644 index f7f6ae0..0000000 --- a/package/ipset/ipkg/ipset.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ipset -Priority: optional -Section: net -Description: Netfilter ip sets administration utility -Depends: kmod-iptables-extra diff --git a/package/iptables-snmp/Config.in b/package/iptables-snmp/Config.in deleted file mode 100644 index f4472ee..0000000 --- a/package/iptables-snmp/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config ADK_PACKAGE_IPTABLES_SNMP - prompt "iptables-snmp..................... An snmpd plugin to access iptables rules" - tristate - default n - select ADK_PACKAGE_SNMPD - help - This is a plugin that makes iptables rules accessable from snmpd. - - http://www.nobiscuit.com/iptables-snmp/ - diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile deleted file mode 100644 index 319a2b8..0000000 --- a/package/iptables-snmp/Makefile +++ /dev/null @@ -1,27 +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:= iptables-snmp -PKG_VERSION:= 0.1 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 8370d2f0c899461a053da491400119d1 -MASTER_SITES:= http://www.nobiscuit.com/iptables-snmp/ - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,IPTABLES_SNMP,iptables-snmp,${PKG_VERSION}-${PKG_RELEASE})) - -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto -FAKE_FLAGS+= INSTALL_PREFIX="${WRKINST}" - -post-install: - ${INSTALL_DIR} ${IDIR_IPTABLES_SNMP}/usr/lib - ${CP} ${WRKINST}/usr/lib/iptables-snmp.so ${IDIR_IPTABLES_SNMP}/usr/lib - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iptables-snmp/ipkg/iptables-snmp.control b/package/iptables-snmp/ipkg/iptables-snmp.control deleted file mode 100644 index cd92ffe..0000000 --- a/package/iptables-snmp/ipkg/iptables-snmp.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-snmp -Priority: optional -Section: net -Depends: snmpd -Description: An snmpd plugin to access iptables rules \ No newline at end of file diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 150d5d6..409eace 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -9,19 +9,23 @@ PKG_NAME:= iptables PKG_VERSION:= 1.4.3.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 545698693b636cfc844aafc6729fd48a -MASTER_SITES:= http://www.netfilter.org/projects/iptables/files/ \ +PKG_DESCR:= The netfilter firewalling software +PKG_SECTION:= net +PKG_URL:= http://www.netfilter.org +PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk include ${LINUX_DIR}/.config -$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_IPV6),y) -$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) endif CONFIGURE_STYLE:= gnu diff --git a/package/iptables/files/iptables.postinst b/package/iptables/files/iptables.postinst new file mode 100644 index 0000000..fd2865a --- /dev/null +++ b/package/iptables/files/iptables.postinst @@ -0,0 +1,7 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh + +if [ -f $IPKG_INSTROOT/etc/init.d/S45firewall ]; then + add_rcconf iptables firewall NO +fi + diff --git a/package/iptables/ipkg/ip6tables.control b/package/iptables/ipkg/ip6tables.control deleted file mode 100644 index c6d6393..0000000 --- a/package/iptables/ipkg/ip6tables.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ip6tables -Priority: optional -Depends: kmod-ip6tables -Section: net -Description: The netfilter firewalling software for IPv6 diff --git a/package/iptables/ipkg/iptables-extra.control b/package/iptables/ipkg/iptables-extra.control deleted file mode 100644 index afd4235..0000000 --- a/package/iptables/ipkg/iptables-extra.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-extra -Priority: optional -Section: net -Depends: iptables, iptables-mod-conntrack, iptables-mod-extra, iptables-mod-filter, iptables-mod-ipopt, iptables-mod-ipsec, iptables-mod-nat, iptables-mod-ulog -Description: Other extra Iptables extensions (meta-package) diff --git a/package/iptables/ipkg/iptables-mod-conntrack.control b/package/iptables/ipkg/iptables-mod-conntrack.control deleted file mode 100644 index 840992e..0000000 --- a/package/iptables/ipkg/iptables-mod-conntrack.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-conntrack -Priority: optional -Section: net -Depends: iptables, kmod-ipt-conntrack -Description: Iptables (IPv4) extensions for connection tracking diff --git a/package/iptables/ipkg/iptables-mod-extra.control b/package/iptables/ipkg/iptables-mod-extra.control deleted file mode 100644 index f26b4a4..0000000 --- a/package/iptables/ipkg/iptables-mod-extra.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-extra -Priority: optional -Section: net -Depends: iptables, kmod-ipt-extra -Description: Other extra Iptables (IPv4) extensions diff --git a/package/iptables/ipkg/iptables-mod-filter.control b/package/iptables/ipkg/iptables-mod-filter.control deleted file mode 100644 index 43ec799..0000000 --- a/package/iptables/ipkg/iptables-mod-filter.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-filter -Priority: optional -Section: net -Depends: iptables, kmod-ipt-filter -Description: Iptables (IPv4) extension for packet content inspection diff --git a/package/iptables/ipkg/iptables-mod-imq.control b/package/iptables/ipkg/iptables-mod-imq.control deleted file mode 100644 index d1e46d2..0000000 --- a/package/iptables/ipkg/iptables-mod-imq.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-imq -Priority: optional -Section: net -Depends: kmod-imq -Description: Iptables (IPv4) extensions for Intermediate Queuing Device QoS-support diff --git a/package/iptables/ipkg/iptables-mod-ipopt.control b/package/iptables/ipkg/iptables-mod-ipopt.control deleted file mode 100644 index 51ec6b2..0000000 --- a/package/iptables/ipkg/iptables-mod-ipopt.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-ipopt -Priority: optional -Section: net -Depends: iptables, kmod-ipt-ipopt -Description: Iptables (IPv4) extensions for matching/changing IP packet options diff --git a/package/iptables/ipkg/iptables-mod-ipsec.control b/package/iptables/ipkg/iptables-mod-ipsec.control deleted file mode 100644 index 4b4d2e6..0000000 --- a/package/iptables/ipkg/iptables-mod-ipsec.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-ipsec -Priority: optional -Section: net -Depends: iptables, kmod-ipt-ipsec -Description: Iptables (IPv4) extensions for matching special IPsec packets diff --git a/package/iptables/ipkg/iptables-mod-nat.control b/package/iptables/ipkg/iptables-mod-nat.control deleted file mode 100644 index 2ebbb1c..0000000 --- a/package/iptables/ipkg/iptables-mod-nat.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-nat -Priority: optional -Section: net -Depends: iptables, kmod-ipt-nat -Description: Iptables (IPv4) extensions for different NAT targets diff --git a/package/iptables/ipkg/iptables-mod-ulog.control b/package/iptables/ipkg/iptables-mod-ulog.control deleted file mode 100644 index 3fcd26f..0000000 --- a/package/iptables/ipkg/iptables-mod-ulog.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-ulog -Priority: optional -Section: net -Depends: iptables, kmod-ipt-ulog -Description: Iptables (IPv4) extension for user-space packet logging diff --git a/package/iptables/ipkg/iptables-utils.control b/package/iptables/ipkg/iptables-utils.control deleted file mode 100644 index aff5f4d..0000000 --- a/package/iptables/ipkg/iptables-utils.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-utils -Priority: optional -Section: net -Depends: iptables -Description: iptables-save and iptables-restore for Iptables (IPv4) diff --git a/package/iptables/ipkg/iptables.control b/package/iptables/ipkg/iptables.control deleted file mode 100644 index 40a6523..0000000 --- a/package/iptables/ipkg/iptables.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: iptables -Priority: optional -Section: net -Description: The netfilter firewalling software for IPv4 diff --git a/package/iptables/ipkg/iptables.postinst b/package/iptables/ipkg/iptables.postinst deleted file mode 100644 index fd2865a..0000000 --- a/package/iptables/ipkg/iptables.postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh - -if [ -f $IPKG_INSTROOT/etc/init.d/S45firewall ]; then - add_rcconf iptables firewall NO -fi - diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index f56a89d..5fc3641 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -9,12 +9,16 @@ PKG_NAME:= iptraf PKG_VERSION:= 3.0.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 377371c28ee3c21a76f7024920649ea8 -MASTER_SITES:= ftp://iptraf.seul.org/pub/iptraf/ \ +PKG_DESCR:= A console-based network monitoring program. +PKG_SECTION:= net +PKG_DEPENDS:= libncurses +PKG_URL:= http://iptraf.seul.org +PKG_SITES:= ftp://iptraf.seul.org/pub/iptraf/ \ ftp://the.wiretapped.net/pub/security/network-monitoring/iptraf/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPTRAF,iptraf,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IPTRAF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-build: ${MAKE} -C ${WRKBUILD}/src \ diff --git a/package/iptraf/ipkg/iptraf.control b/package/iptraf/ipkg/iptraf.control deleted file mode 100644 index 840c9d1..0000000 --- a/package/iptraf/ipkg/iptraf.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptraf -Priority: optional -Section: net -Depends: libncurses -Description: A console-based network monitoring program. diff --git a/package/irssi/Makefile b/package/irssi/Makefile index 3c77111..60f82b7 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -6,16 +6,24 @@ include ${TOPDIR}/rules.mk PKG_NAME:= irssi -PKG_VERSION:= 0.8.12 +PKG_VERSION:= 0.8.13 PKG_RELEASE:= 1 -PKG_MD5SUM:= e407b557b3cfc7c91ce4de2571dd79cb +PKG_MD5SUM:= 0d6fc2203832b514eff014fffd574664 +PKG_DESCR:= IRC text client +PKG_SECTION:= text +PKG_DEPENDS:= glib2 libncurses +PKG_URL:= http://www.irssi.org +PKG_SITES:= http://www.irssi.org/files/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= http://www.irssi.org/files/ -PKG_DEPENDS:= glib2, libncurses include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE})) +ifeq (${ADK_PACKAGE_IRSSI_SSL},y) +PKG_DEPENDS+= libopenssl +endif + +$(eval $(call PKG_template,IRSSI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-perl=no \ @@ -29,7 +37,6 @@ BUILD_STYLE= auto ifeq (${ADK_PACKAGE_IRSSI_SSL},y) CONFIGURE_ARGS+= --enable-ssl -PKG_DEPENDS:= ${PKG_DEPENDS}, openssl else CONFIGURE_ARGS+= --disable-ssl endif @@ -37,6 +44,5 @@ endif do-install: ${INSTALL_DIR} ${IDIR_IRSSI}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/src/fe-text/${PKG_NAME} ${IDIR_IRSSI}/usr/bin/ - echo 'Depends: ${PKG_DEPENDS}' >>${IDIR_IRSSI}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/irssi/ipkg/irssi.control b/package/irssi/ipkg/irssi.control deleted file mode 100644 index 5112153..0000000 --- a/package/irssi/ipkg/irssi.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: irssi -Priority: optional -Section: text -Description: IRC text client diff --git a/package/iw/Makefile b/package/iw/Makefile index f651112..8e153b5 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= iw PKG_VERSION:= 0.9.14 PKG_RELEASE:= 1 PKG_MD5SUM:= b5059cfe86bc7664511b79c159635a8f -MASTER_SITES:= http://wireless.kernel.org/download/iw/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211) +PKG_SECTION:= net +PKG_DEPENDS:= libnl +PKG_URL:= http://wireless.kernel.org/en/users/Documentation/iw +PKG_SITES:= http://wireless.kernel.org/download/iw/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IW,iw,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IW,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS:= V=1 BUILD_STYLE:= auto diff --git a/package/iw/ipkg/iw.control b/package/iw/ipkg/iw.control deleted file mode 100644 index b6246b4..0000000 --- a/package/iw/ipkg/iw.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: iw -Priority: optional -Section: net -Description: Tools for setting up WiFi cards via netlink (nl80211) diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 945f303..71417f5 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -6,14 +6,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= jamvm -PKG_VERSION:= 1.5.1 +PKG_VERSION:= 1.5.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 5a82751b50391eb092c906ce64f3b6bf -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} +PKG_MD5SUM:= ce886163658d748113b0570dfae12aea +PKG_DESCR:= A Java Virtual Machine (JVM) implementation +PKG_SECTION:= misc +PKG_DEPENDS:= libffi zlib +PKG_URL:= http://jamvm.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} include ${TOPDIR}/mk/package.mk -${eval ${call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}}} +$(eval $(call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-ffi diff --git a/package/jamvm/ipkg/jamvm.control b/package/jamvm/ipkg/jamvm.control deleted file mode 100644 index f33e66c..0000000 --- a/package/jamvm/ipkg/jamvm.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: jamvm -Priority: optional -Section: misc -Description: A Java Virtual Machine (JVM) implementation -Depends: libffi, zlib diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index a5a94ea..5c4e8f0 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= jpeg PKG_VERSION:= 6b PKG_RELEASE:= 1 PKG_MD5SUM:= dbd5f3b47ed13132f04c685d608a7547 -MASTER_SITES:= http://www.ijg.org/files/ \ +PKG_DESCR:= The Independent JPEG Groups JPEG runtime library +PKG_SECTION:= libs +PKG_URL:= http://sourceforge.net/projects/libjpeg +PKG_SITES:= http://www.ijg.org/files/ \ ftp://ftp.uu.net/graphics/jpeg/ + DISTFILES:= ${PKG_NAME}src.v${PKG_VERSION}.tar.gz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/jpeg/ipkg/libjpeg.control b/package/jpeg/ipkg/libjpeg.control deleted file mode 100644 index 83111d7..0000000 --- a/package/jpeg/ipkg/libjpeg.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: libjpeg -Priority: optional -Section: libs -Depends: -Description: The Independent JPEG Group's JPEG runtime library - diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile index 7341f1f..b73742f 100644 --- a/package/kbproto/Makefile +++ b/package/kbproto/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= kbproto PKG_VERSION:= 1.0.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 1efc6a4d97acb3ec3f34c4b2508478dc -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/kismet/Makefile b/package/kismet/Makefile index 5638908..907d2e5 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -9,14 +9,14 @@ PKG_NAME:= kismet PKG_VERSION:= 2008-05-R1 PKG_RELEASE:= 1 PKG_MD5SUM:= 6ee365d36354b4dee4945e67f8149294 -MASTER_SITES:= http://www.kismetwireless.net/code/ +PKG_SITES:= http://www.kismetwireless.net/code/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_COMPILE_KISMET_WITH_UCLIBCXX),y) TCFLAGS+= -fno-builtin -fno-rtti -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ diff --git a/package/kismet/files/kismet-client.conffiles b/package/kismet/files/kismet-client.conffiles new file mode 100644 index 0000000..b849ce1 --- /dev/null +++ b/package/kismet/files/kismet-client.conffiles @@ -0,0 +1,4 @@ +/etc/kismet/ap_manuf +/etc/kismet/client_manuf +/etc/kismet/kismet.conf +/etc/kismet/kismet_ui.conf \ No newline at end of file diff --git a/package/kismet/files/kismet-drone.conffiles b/package/kismet/files/kismet-drone.conffiles new file mode 100644 index 0000000..744e244 --- /dev/null +++ b/package/kismet/files/kismet-drone.conffiles @@ -0,0 +1 @@ +/etc/kismet/kismet_drone.conf diff --git a/package/kismet/files/kismet-server.conffiles b/package/kismet/files/kismet-server.conffiles new file mode 100644 index 0000000..0fdf437 --- /dev/null +++ b/package/kismet/files/kismet-server.conffiles @@ -0,0 +1,3 @@ +/etc/kismet/ap_manuf +/etc/kismet/client_manuf +/etc/kismet/kismet.conf diff --git a/package/kismet/ipkg/kismet-client.conffiles b/package/kismet/ipkg/kismet-client.conffiles deleted file mode 100644 index b849ce1..0000000 --- a/package/kismet/ipkg/kismet-client.conffiles +++ /dev/null @@ -1,4 +0,0 @@ -/etc/kismet/ap_manuf -/etc/kismet/client_manuf -/etc/kismet/kismet.conf -/etc/kismet/kismet_ui.conf \ No newline at end of file diff --git a/package/kismet/ipkg/kismet-client.control b/package/kismet/ipkg/kismet-client.control deleted file mode 100644 index e5c8f51..0000000 --- a/package/kismet/ipkg/kismet-client.control +++ /dev/null @@ -1,9 +0,0 @@ -Package: kismet-client -Priority: optional -Section: net -Depends: uclibc++, libncurses -Description: The kismet client - Kismet is an 802.11 layer2 wireless network detector, - sniffer, and intrusion detection system. Kismet will work with any - wireless card which supports raw monitoring (rfmon) mode, and can - sniff 802.11b, 802.11a, and 802.11g traffic. diff --git a/package/kismet/ipkg/kismet-drone.conffiles b/package/kismet/ipkg/kismet-drone.conffiles deleted file mode 100644 index 744e244..0000000 --- a/package/kismet/ipkg/kismet-drone.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/kismet/kismet_drone.conf diff --git a/package/kismet/ipkg/kismet-drone.control b/package/kismet/ipkg/kismet-drone.control deleted file mode 100644 index 9d8ac0d..0000000 --- a/package/kismet/ipkg/kismet-drone.control +++ /dev/null @@ -1,9 +0,0 @@ -Package: kismet-drone -Priority: optional -Section: net -Depends: uclibc++, libpcap -Description: The kismet drone - Kismet is an 802.11 layer2 wireless network detector, - sniffer, and intrusion detection system. Kismet will work with any - wireless card which supports raw monitoring (rfmon) mode, and can - sniff 802.11b, 802.11a, and 802.11g traffic. diff --git a/package/kismet/ipkg/kismet-server.conffiles b/package/kismet/ipkg/kismet-server.conffiles deleted file mode 100644 index 0fdf437..0000000 --- a/package/kismet/ipkg/kismet-server.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/kismet/ap_manuf -/etc/kismet/client_manuf -/etc/kismet/kismet.conf diff --git a/package/kismet/ipkg/kismet-server.control b/package/kismet/ipkg/kismet-server.control deleted file mode 100644 index 3c416be..0000000 --- a/package/kismet/ipkg/kismet-server.control +++ /dev/null @@ -1,9 +0,0 @@ -Package: kismet-server -Priority: optional -Section: net -Depends: uclibc++, libpcap -Description: The kismet server - Kismet is an 802.11 layer2 wireless network detector, - sniffer, and intrusion detection system. Kismet will work with any - wireless card which supports raw monitoring (rfmon) mode, and can - sniff 802.11b, 802.11a, and 802.11g traffic. diff --git a/package/kismet/ipkg/kismet.control b/package/kismet/ipkg/kismet.control deleted file mode 100644 index 1933285..0000000 --- a/package/kismet/ipkg/kismet.control +++ /dev/null @@ -1,9 +0,0 @@ -Package: kismet -Priority: optional -Section: net -Depends: libgcc, kismet-client, kismet-server -Description: kismet - Kismet is an 802.11 layer2 wireless network detector, - sniffer, and intrusion detection system. Kismet will work with any - wireless card which supports raw monitoring (rfmon) mode, and can - sniff 802.11b, 802.11a, and 802.11g traffic. diff --git a/package/knock/Makefile b/package/knock/Makefile index 349e787..384c82e 100644 --- a/package/knock/Makefile +++ b/package/knock/Makefile @@ -9,12 +9,18 @@ PKG_NAME:= knock PKG_VERSION:= 0.5 PKG_RELEASE:= 1 PKG_MD5SUM:= ca09d61458974cff90a700aba6120891 -MASTER_SITES:= http://www.zeroflux.org/proj/knock/files/ +PKG_DESCR:= A port-knocking client +PKG_SECTION:= net +PKG_URL:= http://www.zeroflux.org/projects/knock +PKG_SITES:= http://www.zeroflux.org/proj/knock/files/ + +PKG_DESCR_1:= A port-knocking server +PKG_DEPENDS_1:= libpcap include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) TCXXFLAGS+= ${TCPPFLAGS} ${TCFLAGS} CONFIGURE_STYLE= gnu diff --git a/package/knock/files/knockd.conffiles b/package/knock/files/knockd.conffiles new file mode 100644 index 0000000..e191bfd --- /dev/null +++ b/package/knock/files/knockd.conffiles @@ -0,0 +1 @@ +/etc/knockd.conf \ No newline at end of file diff --git a/package/knock/ipkg/knock.control b/package/knock/ipkg/knock.control deleted file mode 100644 index 72e635f..0000000 --- a/package/knock/ipkg/knock.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: knock -Priority: optional -Section: net -Depends: -Description: A port-knocking client diff --git a/package/knock/ipkg/knockd.conffiles b/package/knock/ipkg/knockd.conffiles deleted file mode 100644 index e191bfd..0000000 --- a/package/knock/ipkg/knockd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/knockd.conf \ No newline at end of file diff --git a/package/knock/ipkg/knockd.control b/package/knock/ipkg/knockd.control deleted file mode 100644 index e0c9439..0000000 --- a/package/knock/ipkg/knockd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: knockd -Priority: optional -Section: net -Depends: libpcap -Description: A port-knocking server diff --git a/package/knock/patches/patch-src_knockd_c b/package/knock/patches/patch-src_knockd_c new file mode 100644 index 0000000..d9f399b --- /dev/null +++ b/package/knock/patches/patch-src_knockd_c @@ -0,0 +1,12 @@ +$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 + return(NULL); + } + +- bzero((void*)(&ifr.ifr_name), sizeof(ifr.ifr_name)); ++ memset((void*)(&ifr.ifr_name), 0, sizeof(ifr.ifr_name)); + strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)-1); + ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0'; + if(ioctl(s, SIOCGIFADDR, &ifr)) { diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 049bf44..80b7578 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -9,15 +9,22 @@ PKG_NAME:= krb5 PKG_VERSION:= 1.6.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 2dc1307686eb1c2bf1ab08ea805dad46 -MASTER_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.6/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-signed.tar +PKG_DESCR:= MIT kerberos server +PKG_SECTION:= net +PKG_DEPENDS:= krb5-libs +PKG_URL:= http://web.mit.edu/kerberos +PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.6/ + +PKG_DESCR_1:= MIT kerberos libraries +PKG_SECTION_1:= libs +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-signed.tar WRKSRC= ${WRKDIST}/src include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-krb4 --disable-static --without-tcl @@ -33,13 +40,12 @@ post-extract: (cd ${WRKDIR}; tar xzf ${PKG_NAME}-${PKG_VERSION}.tar.gz) post-install: - ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/init.d + ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib/krb5/plugins/kdb ${INSTALL_DATA} ./files/kdc.conf ${IDIR_KRB5_SERVER}/etc/krb5kdc - ${INSTALL_BIN} ./files/krb5.init ${IDIR_KRB5_SERVER}/etc/init.d/krb5 ${INSTALL_BIN} ${WRKINST}/usr/sbin/{ktutil,kdb5_util,krb5kdc,kadmind,kadmin.local,kadmin} \ ${IDIR_KRB5_SERVER}/usr/sbin ${INSTALL_DATA} ${WRKINST}/usr/lib/krb5/plugins/kdb/db2.so \ diff --git a/package/krb5/files/krb5-server.postinst b/package/krb5/files/krb5-server.postinst new file mode 100644 index 0000000..24f1f7d --- /dev/null +++ b/package/krb5/files/krb5-server.postinst @@ -0,0 +1,8 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf "MIT kdc" kdc NO +add_service kerberos 88/tcp +add_service kerberos 88/udp +add_service kerberos-adm 749/tcp +add_service kpasswd 464/tcp +add_service kpasswd 464/udp diff --git a/package/krb5/files/krb5.init b/package/krb5/files/krb5.init index 732088f..f91d042 100644 --- a/package/krb5/files/krb5.init +++ b/package/krb5/files/krb5.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 70 +#PKG krb5-server +#INIT 70 . /etc/rc.conf case $1 in diff --git a/package/krb5/ipkg/krb5-libs.control b/package/krb5/ipkg/krb5-libs.control deleted file mode 100644 index 64ff096..0000000 --- a/package/krb5/ipkg/krb5-libs.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: krb5-libs -Priority: optional -Section: net -Depends: libpthread -Description: MIT kerberos libraries diff --git a/package/krb5/ipkg/krb5-server.control b/package/krb5/ipkg/krb5-server.control deleted file mode 100644 index 6eea59a..0000000 --- a/package/krb5/ipkg/krb5-server.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: krb5-server -Priority: optional -Section: net -Description: MIT kerberos server diff --git a/package/krb5/ipkg/krb5-server.postinst b/package/krb5/ipkg/krb5-server.postinst deleted file mode 100644 index 24f1f7d..0000000 --- a/package/krb5/ipkg/krb5-server.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf "MIT kdc" kdc NO -add_service kerberos 88/tcp -add_service kerberos 88/udp -add_service kerberos-adm 749/tcp -add_service kpasswd 464/tcp -add_service kpasswd 464/udp diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile index 5a18d3b..3a99789 100644 --- a/package/l2tpns/Makefile +++ b/package/l2tpns/Makefile @@ -6,20 +6,20 @@ include ${TOPDIR}/rules.mk PKG_NAME:= l2tpns -PKG_VERSION:= 2.1.14 +PKG_VERSION:= 2.1.21 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2a0ee2a3678160c335f1d68c17c4f871 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=l2tpns/} +PKG_MD5SUM:= 385c58055723ebc6c38062acd2db9c2c +PKG_DESCR:= A layer 2 tunneling protocol network server (LNS) +PKG_SECTION:= net +PKG_URL:= http://l2tpns.sourceforge.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=l2tpns/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,L2TPNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,L2TPNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_FLAGS= auto INSTALL_STYLE= auto -XAKE_FLAGS+= OPTIM="${TARGET_CFLAGS}" \ - STAGING_DIR=${STAGING_DIR} \ - LD="${TARGET_CC}" post-install: ${INSTALL_DIR} ${IDIR_L2TPNS}/etc/l2tpns diff --git a/package/l2tpns/files/l2tpns.conffiles b/package/l2tpns/files/l2tpns.conffiles new file mode 100644 index 0000000..eaf3a50 --- /dev/null +++ b/package/l2tpns/files/l2tpns.conffiles @@ -0,0 +1,3 @@ +/etc/l2tpns/ip_pool +/etc/l2tpns/startup-config +/etc/l2tpns/users diff --git a/package/l2tpns/ipkg/l2tpns.conffiles b/package/l2tpns/ipkg/l2tpns.conffiles deleted file mode 100644 index eaf3a50..0000000 --- a/package/l2tpns/ipkg/l2tpns.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/l2tpns/ip_pool -/etc/l2tpns/startup-config -/etc/l2tpns/users diff --git a/package/l2tpns/ipkg/l2tpns.control b/package/l2tpns/ipkg/l2tpns.control deleted file mode 100644 index 1946f88..0000000 --- a/package/l2tpns/ipkg/l2tpns.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: l2tpns -Section: net -Priority: optional -Description: A layer 2 tunneling protocol network server (LNS). diff --git a/package/l2tpns/patches/01-honor_includes_remove_backtrace.patch b/package/l2tpns/patches/01-honor_includes_remove_backtrace.patch deleted file mode 100644 index a8e4d75..0000000 --- a/package/l2tpns/patches/01-honor_includes_remove_backtrace.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff -urN orig/l2tpns-2.1.14/Makefile l2tpns-2.1.14/Makefile ---- orig/l2tpns-2.1.14/Makefile 2005-12-07 06:21:37.000000000 +0100 -+++ l2tpns-2.1.14/Makefile 2005-12-14 12:50:49.000000000 +0100 -@@ -11,17 +11,14 @@ - DEFINES += -DETCDIR='"$(etcdir)"' - - OPTIM = --OPTIM += -g - OPTIM += -O3 - --CC = gcc --LD = gcc --INCLUDES = -I. -+INCLUDES = -I. -I$(STAGING_DIR)/usr/include - CPPFLAGS = $(INCLUDES) $(DEFINES) - CFLAGS = -Wall -Wformat-security -Wno-format-zero-length $(OPTIM) --LDFLAGS = -+LDFLAGS = -L$(STAGING_DIR)/usr/lib - LDLIBS = --INSTALL = install -c -D -o root -g root -+INSTALL = install -c -D - - l2tpns.LIBS = -lm -lcli -ldl - -diff -urN orig/l2tpns-2.1.14/l2tpns.c l2tpns-2.1.14/l2tpns.c ---- orig/l2tpns-2.1.14/l2tpns.c 2005-12-07 06:21:37.000000000 +0100 -+++ l2tpns-2.1.14/l2tpns.c 2005-12-14 12:50:36.000000000 +0100 -@@ -940,18 +940,14 @@ - - if (!t) - { -- static int backtrace_count = 0; - LOG(0, 0, t, "tunnelsend called with 0 as tunnel id\n"); - STAT(tunnel_tx_errors); -- log_backtrace(backtrace_count, 5) - return; - } - - if (!tunnel[t].ip) - { -- static int backtrace_count = 0; - LOG(1, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n"); -- log_backtrace(backtrace_count, 5) - STAT(tunnel_tx_errors); - return; - } -@@ -4125,23 +4121,8 @@ - struct sched_param params = {0}; - params.sched_priority = 1; - -- if (get_nprocs() < 2) -- { -- LOG(0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n"); -- config->scheduler_fifo = 0; -- } -- else -- { -- if ((ret = sched_setscheduler(0, SCHED_FIFO, ¶ms)) == 0) -- { -- LOG(1, 0, 0, "Using FIFO scheduler. Say goodbye to any other processes running\n"); -- } -- else -- { -- LOG(0, 0, 0, "Error setting scheduler to FIFO: %s\n", strerror(errno)); -- config->scheduler_fifo = 0; -- } -- } -+ LOG(0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n"); -+ config->scheduler_fifo = 0; - } - - /* Set up the cluster communications port. */ -diff -urN orig/l2tpns-2.1.14/l2tpns.h l2tpns-2.1.14/l2tpns.h ---- orig/l2tpns-2.1.14/l2tpns.h 2005-12-09 01:43:17.000000000 +0100 -+++ l2tpns-2.1.14/l2tpns.h 2005-12-14 07:43:51.000000000 +0100 -@@ -5,7 +5,6 @@ - #define __L2TPNS_H__ - - #include --#include - #include - #include - #include -@@ -766,21 +765,6 @@ - extern ippoolt *ip_address_pool; - #define sessionfree (session[0].next) - --#define log_backtrace(count, max) \ --if (count++ < max) { \ -- void *array[20]; \ -- char **strings; \ -- int size, i; \ -- LOG(0, 0, t, "Backtrace follows:\n"); \ -- size = backtrace(array, 10); \ -- strings = backtrace_symbols(array, size); \ -- if (strings) for (i = 0; i < size; i++) \ -- { \ -- LOG(0, 0, t, " %s\n", strings[i]); \ -- } \ -- free(strings); \ --} -- - - extern configt *config; - extern time_t basetime; // Time when this process started. -diff -urN orig/l2tpns-2.1.14/ppp.c l2tpns-2.1.14/ppp.c ---- orig/l2tpns-2.1.14/ppp.c 2005-12-07 06:21:37.000000000 +0100 -+++ l2tpns-2.1.14/ppp.c 2005-12-14 07:43:08.000000000 +0100 -@@ -1755,9 +1755,7 @@ - { - if (size < 12) // Need more space than this!! - { -- static int backtrace_count = 0; - LOG(0, s, t, "makeppp buffer too small for L2TP header (size=%d)\n", size); -- log_backtrace(backtrace_count, 5) - return NULL; - } - -@@ -1780,9 +1778,7 @@ - - if (l + 12 > size) - { -- static int backtrace_count = 0; - LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%d)\n", size, l + 12); -- log_backtrace(backtrace_count, 5) - return NULL; - } - diff --git a/package/l2tpns/patches/patch-Makefile b/package/l2tpns/patches/patch-Makefile new file mode 100644 index 0000000..4065c29 --- /dev/null +++ b/package/l2tpns/patches/patch-Makefile @@ -0,0 +1,37 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- l2tpns-2.1.21.orig/Makefile 2005-12-07 06:21:37.000000000 +0100 ++++ l2tpns-2.1.21/Makefile 2009-05-29 17:48:31.886728540 +0200 +@@ -10,18 +10,11 @@ DEFINES = + DEFINES += -DLIBDIR='"$(libdir)"' + DEFINES += -DETCDIR='"$(etcdir)"' + +-OPTIM = +-OPTIM += -g +-OPTIM += -O3 +- +-CC = gcc +-LD = gcc + INCLUDES = -I. + CPPFLAGS = $(INCLUDES) $(DEFINES) +-CFLAGS = -Wall -Wformat-security -Wno-format-zero-length $(OPTIM) +-LDFLAGS = ++CFLAGS ?= -Wall -Wformat-security -Wno-format-zero-length + LDLIBS = +-INSTALL = install -c -D -o root -g root ++INSTALL = install -c -D + + l2tpns.LIBS = -lm -lcli -ldl + +@@ -58,10 +51,10 @@ depend: + mv Makefile.tmp Makefile + + l2tpns: $(OBJS) +- $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS) ++ $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS) + + nsctl: nsctl.o control.o +- $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS) ++ $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) $($@.LIBS) + + %.o: %.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< diff --git a/package/l2tpns/patches/patch-l2tpns_c b/package/l2tpns/patches/patch-l2tpns_c new file mode 100644 index 0000000..3aa1210 --- /dev/null +++ b/package/l2tpns/patches/patch-l2tpns_c @@ -0,0 +1,35 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- l2tpns-2.1.21.orig/l2tpns.c 2006-06-22 17:30:50.000000000 +0200 ++++ l2tpns-2.1.21/l2tpns.c 2009-05-29 17:53:32.393095004 +0200 +@@ -4233,31 +4233,6 @@ int main(int argc, char *argv[]) + chdir("/tmp"); + } + +- if (config->scheduler_fifo) +- { +- int ret; +- struct sched_param params = {0}; +- params.sched_priority = 1; +- +- if (get_nprocs() < 2) +- { +- LOG(0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n"); +- config->scheduler_fifo = 0; +- } +- else +- { +- if ((ret = sched_setscheduler(0, SCHED_FIFO, ¶ms)) == 0) +- { +- LOG(1, 0, 0, "Using FIFO scheduler. Say goodbye to any other processes running\n"); +- } +- else +- { +- LOG(0, 0, 0, "Error setting scheduler to FIFO: %s\n", strerror(errno)); +- config->scheduler_fifo = 0; +- } +- } +- } +- + /* Set up the cluster communications port. */ + if (cluster_init() < 0) + exit(1); diff --git a/package/lame/Makefile b/package/lame/Makefile index 1509f62..315f501 100644 --- a/package/lame/Makefile +++ b/package/lame/Makefile @@ -9,12 +9,19 @@ PKG_NAME:= lame PKG_VERSION:= 398-2 PKG_RELEASE:= 1 PKG_MD5SUM:= 719dae0ee675d0c16e0e89952930ed35 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=lame/} +PKG_DESCR:= LAME MP3 encoder +PKG_SECTION:= sound +PKG_DEPENDS:= libncurses +PKG_URL:= http://lame.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=lame/} + +PKG_DESCR_1:= LAME MP3 encoding library +PKG_SECTION_1:= libs include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/lame/ipkg/lame.control b/package/lame/ipkg/lame.control deleted file mode 100644 index 6054160..0000000 --- a/package/lame/ipkg/lame.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lame -Priority: optional -Section: sound -Depends: ncurses -Description: LAME MP3 encoder diff --git a/package/lame/ipkg/liblame.control b/package/lame/ipkg/liblame.control deleted file mode 100644 index 1ce78f1..0000000 --- a/package/lame/ipkg/liblame.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: liblame -Priority: optional -Section: sound -Description: LAME MP3 encoding library diff --git a/package/less/Makefile b/package/less/Makefile index b98db64..92b79f2 100644 --- a/package/less/Makefile +++ b/package/less/Makefile @@ -6,17 +6,20 @@ include ${TOPDIR}/rules.mk PKG_NAME:= less -PKG_VERSION:= 381 +PKG_VERSION:= 429 PKG_RELEASE:= 1 -PKG_MD5SUM:= 40c2dd4ac137b61b6a55a6478817daf4 -MASTER_SITES:= http://www.greenwoodsoftware.com/less/ +PKG_MD5SUM:= 206f2f13b9b0a35e45df660fcb6af31d +PKG_DESCR:= A text mode pager +PKG_SECTION:= text +PKG_DEPENDS:= libncurses +PKG_URL:= http://www.greenwoodsoftware.com/less +PKG_SITES:= http://www.greenwoodsoftware.com/less/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LESS,less,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LESS,less,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --without-regex BUILD_STYLE= auto do-install: diff --git a/package/less/ipkg/less.control b/package/less/ipkg/less.control deleted file mode 100644 index dbf4e4f..0000000 --- a/package/less/ipkg/less.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: less -Priority: optional -Section: misc -Depends: libncurses -Description: A text mode pager diff --git a/package/libICE/Makefile b/package/libICE/Makefile index 2a48ee4..6705f39 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libICE PKG_VERSION:= 1.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= d80aab5b32434251cf4732f0e760e9d8 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= Inter-Client Exchange library +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libICE/ipkg/libice.control b/package/libICE/ipkg/libice.control deleted file mode 100644 index 471ce8d..0000000 --- a/package/libICE/ipkg/libice.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libice -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libSM/Makefile b/package/libSM/Makefile index 6dc5345..2f9a74e 100644 --- a/package/libSM/Makefile +++ b/package/libSM/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libSM PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 39ee8e9dfbb2c1788629066ce796df22 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= X11 Session Management library +PKG_SECTION:= x11 +PKG_DEPENDS:= libuuid +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libSM/ipkg/libsm.control b/package/libSM/ipkg/libsm.control deleted file mode 100644 index f74b397..0000000 --- a/package/libSM/ipkg/libsm.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libsm -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 14b4770..b2c3ab1 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libX11 PKG_VERSION:= 1.1.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 2feb39a0de6f05b25c308268691d960c -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= X11 client-side library +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-xlocale \ diff --git a/package/libX11/ipkg/libx11.control b/package/libX11/ipkg/libx11.control deleted file mode 100644 index 5a71847..0000000 --- a/package/libX11/ipkg/libx11.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libx11 -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libXau/Makefile b/package/libXau/Makefile index e3ed45a..12f3b90 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libXau PKG_VERSION:= 1.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 77c3de874155456c857b331063ad2fd9 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= X11 authorisation library +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libXau/ipkg/libxau.control b/package/libXau/ipkg/libxau.control deleted file mode 100644 index cac514d..0000000 --- a/package/libXau/ipkg/libxau.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libxau -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile index c554441..1af7476 100644 --- a/package/libXaw/Makefile +++ b/package/libXaw/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libXaw PKG_VERSION:= 1.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= d27375737f323849cf7ca2fa8566afa5 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= X11 Athena Widget library +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libXaw/ipkg/libxaw.control b/package/libXaw/ipkg/libxaw.control deleted file mode 100644 index 75e476c..0000000 --- a/package/libXaw/ipkg/libxaw.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libxaw -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index 06872b3..8d9bada 100644 --- a/package/libXdmcp/Makefile +++ b/package/libXdmcp/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libXdmcp PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 PKG_MD5SUM:= a7e23f356a2b4fe8668f9ff4a2b0413a -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= X11 display manager control protocol library +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libXdmcp/ipkg/libxdmcp.control b/package/libXdmcp/ipkg/libxdmcp.control deleted file mode 100644 index 740edcf..0000000 --- a/package/libXdmcp/ipkg/libxdmcp.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libxdmcp -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 18aeedd..6d3ef85 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libXext PKG_VERSION:= 1.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= b7749174f9b3c3227bcbabc9ffb7d1a9 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= X Window System client interface to several extensions to the X protocol +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXext/ipkg/libxext.control b/package/libXext/ipkg/libxext.control deleted file mode 100644 index 44a712b..0000000 --- a/package/libXext/ipkg/libxext.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libxext -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index ec1c61d..fdb5df1 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libXfont PKG_VERSION:= 1.3.3 PKG_RELEASE:= 1 PKG_MD5SUM:= cb202f7b1af5fc95a7f35f0a62e52e6e -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= X font Library +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libXfont/ipkg/libxfont.control b/package/libXfont/ipkg/libxfont.control deleted file mode 100644 index f622a83..0000000 --- a/package/libXfont/ipkg/libxfont.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libxfont -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile index 135c5da..f4d87f7 100644 --- a/package/libXmu/Makefile +++ b/package/libXmu/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libXmu PKG_VERSION:= 1.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 48b432e84035c664ece80a33695d5254 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= a set of miscellaneous utility convenience functions for X libraries +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu #CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXmu/ipkg/libxmu.control b/package/libXmu/ipkg/libxmu.control deleted file mode 100644 index 73545b2..0000000 --- a/package/libXmu/ipkg/libxmu.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libxmu -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile index 33ce075..d1940d9 100644 --- a/package/libXpm/Makefile +++ b/package/libXpm/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= libXpm PKG_VERSION:= 3.5.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 7bbc8f112f7143ed6961a58ce4e14558 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= common operation for the XPM pixmap format +PKG_SECTION:= x11 +PKG_DESCR:= common operation for the XPM pixmap format +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libXpm/ipkg/libxpm.control b/package/libXpm/ipkg/libxpm.control deleted file mode 100644 index 276bd3d..0000000 --- a/package/libXpm/ipkg/libxpm.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libxpm -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libXt/Makefile b/package/libXt/Makefile index fab8059..6c0b85d 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libXt PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 666305c8a2b825b276b3412d8c0d2273 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= X Toolkit Intrinsics +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull \ diff --git a/package/libXt/ipkg/libxt.control b/package/libXt/ipkg/libxt.control deleted file mode 100644 index a2c6ff1..0000000 --- a/package/libXt/ipkg/libxt.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libxt -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile index afc5103..2be0c3b 100644 --- a/package/libXxf86dga/Makefile +++ b/package/libXxf86dga/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libXxf86dga PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 704501402a277258ffc878e821357ad4 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= client library for the XFree86-DGA extension +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXxf86dga/ipkg/libxxf86dga.control b/package/libXxf86dga/ipkg/libxxf86dga.control deleted file mode 100644 index 51e7a1e..0000000 --- a/package/libXxf86dga/ipkg/libxxf86dga.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libxxf86dga -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libao/Makefile b/package/libao/Makefile index 17e8344..0f94f65 100644 --- a/package/libao/Makefile +++ b/package/libao/Makefile @@ -6,14 +6,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libao -PKG_VERSION:= 0.8.6 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 12e136a4c0995068ff134997c84421ed -MASTER_SITES:= http://downloads.xiph.org/releases/ao/ +PKG_VERSION:= 0.8.8 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b92cba3cbcf1ee9bc221118a85d23dcd +PKG_DESCR:= A cross platform audio library +PKG_SECTION:= libs +PKG_URL:= http://www.xiph.org/ao +PKG_SITES:= http://downloads.xiph.org/releases/ao/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-esd \ diff --git a/package/libao/ipkg/libao.control b/package/libao/ipkg/libao.control deleted file mode 100644 index 5103929..0000000 --- a/package/libao/ipkg/libao.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libao -Priority: optional -Section: libs -Description: A cross platform audio library diff --git a/package/libart/Makefile b/package/libart/Makefile index 70f281a..f37251c 100644 --- a/package/libart/Makefile +++ b/package/libart/Makefile @@ -9,13 +9,16 @@ PKG_NAME:= libart PKG_VERSION:= 2.3.17 PKG_RELEASE:= 1 PKG_MD5SUM:= f1f6b3e5490f382535dccb288f5d8b14 -MASTER_SITES:= ${MASTER_SITE_GNOME:=libart_lgpl/2.3/} +PKG_DESCR:= An high-performance 2D graphics library +PKG_SECTION:= libs +PKG_SITES:= ${MASTER_SITE_GNOME:=libart_lgpl/2.3/} + DISTFILES:= ${PKG_NAME}_lgpl-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_lgpl-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libart/ipkg/libart.control b/package/libart/ipkg/libart.control deleted file mode 100644 index 42d9523..0000000 --- a/package/libart/ipkg/libart.control +++ /dev/null @@ -1,9 +0,0 @@ -Package: libart -Priority: optional -Section: libs -Description: An high-performance 2D graphics library. - A library of functions for 2D graphics supporting a superset of the - PostScript imaging model, designed to be integrated with graphics, artwork, - and illustration programs. It is written in optimized C, and is fully - compatible with C++. With a small footprint of 10,000 lines of code, it is - especially suitable for embedded applications. diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index 11b3d6b..c376e65 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libaudiofile PKG_VERSION:= 0.2.6 PKG_RELEASE:= 2 PKG_MD5SUM:= 460f848ce5f4a33ae66b15a4fb7720ec -MASTER_SITES:= http://www.freewrt.org/distfiles/ +PKG_DESCR:= audiofile library +PKG_SECTION:= libs +PKG_URL:= http://www.68k.org/~michael/audiofile +PKG_SITES:= http://www.openadk.org/distfiles/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBAUDIOFILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_linux_vers=2 diff --git a/package/libaudiofile/ipkg/libaudiofile.control b/package/libaudiofile/ipkg/libaudiofile.control deleted file mode 100644 index b9ba5e1..0000000 --- a/package/libaudiofile/ipkg/libaudiofile.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libaudiofile -Priority: optional -Section: libs -Description: Open-source version of SGI's audiofile library diff --git a/package/libc/Makefile b/package/libc/Makefile index 8ee90ff..a079672 100644 --- a/package/libc/Makefile +++ b/package/libc/Makefile @@ -12,7 +12,7 @@ NO_DISTFILES:= 1 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBC,libc,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBC,libc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) # do nothing, use native c library do-install: diff --git a/package/libc/ipkg/libc.control b/package/libc/ipkg/libc.control deleted file mode 100644 index a522be5..0000000 --- a/package/libc/ipkg/libc.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libc -Priority: optional -Section: libs -Description: native standard C library diff --git a/package/libcli/Makefile b/package/libcli/Makefile index 025ed48..ba99e76 100755 --- a/package/libcli/Makefile +++ b/package/libcli/Makefile @@ -6,15 +6,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libcli -PKG_VERSION:= 1.8.6 +PKG_VERSION:= 1.9.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= fde7103a3771f550bfd366ee3ca1ef53 - -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=libcli/} +PKG_MD5SUM:= b917617d21b90db214971efe64a33416 +PKG_DESCR:= Cisco-like command-line interface library +PKG_SECTION:= libs +PKG_URL:= http://code.google.com/p/libcli +PKG_SITES:= http://libcli.googlecode.com/files/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBCLI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBCLI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/libcli/ipkg/libcli.control b/package/libcli/ipkg/libcli.control deleted file mode 100755 index 6ef456b..0000000 --- a/package/libcli/ipkg/libcli.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libcli -Section: libs -Architecture: mipsel -Priority: optional -Description: Provides a shared library for including a Cisco-like command-line interface into other software. \ No newline at end of file diff --git a/package/libcli/patches/patch-Makefile b/package/libcli/patches/patch-Makefile index 26f11e0..03c26c3 100644 --- a/package/libcli/patches/patch-Makefile +++ b/package/libcli/patches/patch-Makefile @@ -1,23 +1,21 @@ -$Id$ -allow CFLAGS overwrite, change some defaults ---- libcli-1.8.6.orig/Makefile 2006-03-07 00:13:11.000000000 +0100 -+++ libcli-1.8.6/Makefile 2007-01-07 21:27:49.000000000 +0100 -@@ -1,14 +1,14 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libcli-1.9.4.orig/Makefile 2008-10-09 04:38:01.000000000 +0200 ++++ libcli-1.9.4/Makefile 2009-05-29 17:42:04.310095050 +0200 +@@ -1,15 +1,12 @@ DESTDIR = -PREFIX = /usr/local +PREFIX = /usr MAJOR = 1 - MINOR = 8 - REVISION = 6 + MINOR = 9 + REVISION = 3 LIB = libcli.so -CC = gcc -DEBUG = -g -OPTIM = -O3 -+#CC := gcc -+#DEBUG = -g -+#OPTIM = -O3 - CFLAGS += $(DEBUG) $(OPTIM) -Wall -Wformat-security -Wno-format-zero-length +-CFLAGS += $(DEBUG) $(OPTIM) -Wall -Wformat-security -Wno-format-zero-length ++CFLAGS += -Wall -Wformat-security -Wno-format-zero-length LDFLAGS += -shared -Wl,-soname,$(LIB).$(MAJOR).$(MINOR) LIBPATH += -L. + LIBS = -lcrypt diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile index 92d26cf..e16c6d1 100644 --- a/package/libdaemon/Makefile +++ b/package/libdaemon/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libdaemon PKG_VERSION:= 0.10 PKG_RELEASE:= 2 PKG_MD5SUM:= 6812a5e4063b5016f25e9a0cebbd3dd9 -MASTER_SITES:= http://0pointer.de/lennart/projects/libdaemon/ +PKG_DESCR:= A lightweight C library that eases the writing of UNIX daemons +PKG_SECTION:= libs +PKG_SITES:= http://0pointer.de/lennart/projects/libdaemon/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes diff --git a/package/libdaemon/ipkg/libdaemon.control b/package/libdaemon/ipkg/libdaemon.control deleted file mode 100644 index 3f53422..0000000 --- a/package/libdaemon/ipkg/libdaemon.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libdaemon -Priority: optional -Section: libs -Description: A lightweight C library that eases the writing of UNIX daemons. diff --git a/package/libdb/Makefile b/package/libdb/Makefile index 5b812c1..782e913 100644 --- a/package/libdb/Makefile +++ b/package/libdb/Makefile @@ -9,24 +9,22 @@ PKG_NAME:= libdb PKG_VERSION:= 4.7.25 PKG_RELEASE:= 1 PKG_MD5SUM:= ec2b87e833779681a0c3a814aa71359e -MASTER_SITES:= http://www.oracle.com/technology/software/products/berkeley-db/ +PKG_DESCR:= disk file format database which stores key/data-pairs in single files +PKG_SECTION:= libs +PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db +PKG_SITES:= http://www.openadk.org/distfiles/ + DISTFILES:= db-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/db-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE})) - -ifeq ($(DEBUG),1) -PKG_CONFIGURE:= --enable-debug -else -PKG_CONFIGURE:= --disable-debug -endif +$(eval $(call PKG_template,LIBDB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-configure: (cd ${WRKBUILD}/build_unix ; \ ${TARGET_CONFIGURE_OPTS} \ - CFLAGS="${TARGET_CFLAGS_ARCH} -pipe" \ + CFLAGS="${TARGET_CFLAGS}" \ CPPFLAGS="-I${STAGING_DIR}/usr/include" \ LDFLAGS="-L${STAGING_DIR}/usr/lib" \ ../dist/configure \ @@ -66,7 +64,6 @@ do-configure: --disable-cryptography \ --disable-queue \ --with-mutex=UNIX/fcntl \ - ${PKG_CONFIGURE} \ ); do-install: diff --git a/package/libdb/ipkg/libdb.control b/package/libdb/ipkg/libdb.control deleted file mode 100644 index 28605c3..0000000 --- a/package/libdb/ipkg/libdb.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libdb -Priority: optional -Section: libs -Description: disk file format database which stores key/data-pairs in single files diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile index f7e5389..d96404c 100644 --- a/package/libdnet/Makefile +++ b/package/libdnet/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libdnet PKG_VERSION:= 1.10 PKG_RELEASE:= 1 PKG_MD5SUM:= 416b765e9d9961501ac85e9a366fd219 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/} +PKG_DESCR:= a low-level networking library +PKG_SECTION:= libs +PKG_URL:= http://libdnet.sourceforge.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no @@ -25,6 +28,5 @@ post-install: $(INSTALL_DIR) $(IDIR_LIBDNET)/usr/lib $(INSTALL_DIR) $(IDIR_LIBDNET)/usr/sbin $(CP) $(WRKINST)/usr/lib/libdnet.so.* $(IDIR_LIBDNET)/usr/lib/ - $(INSTALL_BIN) $(WRKINST)/usr/sbin/dnet $(IDIR_LIBDNET)/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libdnet/ipkg/libdnet.control b/package/libdnet/ipkg/libdnet.control deleted file mode 100644 index cb7c6ac..0000000 --- a/package/libdnet/ipkg/libdnet.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libdnet -Priority: optional -Section: libs -Description: a low-level networking library diff --git a/package/libelf/Makefile b/package/libelf/Makefile index 8bf7192..4952c5b 100644 --- a/package/libelf/Makefile +++ b/package/libelf/Makefile @@ -9,11 +9,11 @@ PKG_NAME:= libelf PKG_VERSION:= 0.8.9 PKG_RELEASE:= 1 PKG_MD5SUM:= 11904a77b948bcfab671e80100b6098d -MASTER_SITES:= http://www.mr511.de/software/ +PKG_SITES:= http://www.mr511.de/software/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= mr_cv_target_elf=yes \ diff --git a/package/libelf/ipkg/libelf.control b/package/libelf/ipkg/libelf.control deleted file mode 100644 index 804b02f..0000000 --- a/package/libelf/ipkg/libelf.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libelf -Priority: optional -Section: libs -Description: a library for accessing ELF objects diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 0093aa7..9a91b1c 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libevent PKG_VERSION:= 1.3 PKG_RELEASE:= 2 PKG_MD5SUM:= d87b05143c6c2bc9464758e68e9c6e25 -MASTER_SITES:= http://www.monkey.org/~provos/ +PKG_DESCR:= Event notification library for event-driven network servers +PKG_SECTION:= libs +PKG_URL:= http://www.monkey.org/~provos +PKG_SITES:= http://www.monkey.org/~provos/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libevent/ipkg/libevent.control b/package/libevent/ipkg/libevent.control deleted file mode 100644 index 31da5b2..0000000 --- a/package/libevent/ipkg/libevent.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libevent -Priority: optional -Section: libs -Description: Event notification library for event-driven network servers diff --git a/package/libffi/Makefile b/package/libffi/Makefile index 8cc13b5..881c07b 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -6,14 +6,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libffi -PKG_VERSION:= 3.0.6 +PKG_VERSION:= 3.0.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8994a7e0e8baeedf63e3d0d94d75ac68 -MASTER_SITES:= ftp://sourceware.org/pub/libffi/ +PKG_MD5SUM:= 188a4f79fdac2310044b44b7d3918ef9 +PKG_DESCR:= Foreign Function Interface library +PKG_SECTION:= libs +PKG_URL:= http://sourceware.org/libffi +PKG_SITES:= ftp://sourceware.org/pub/libffi/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= autotool gnu BUILD_STYLE= auto diff --git a/package/libffi/ipkg/libffi.control b/package/libffi/ipkg/libffi.control deleted file mode 100644 index 7e52b9c..0000000 --- a/package/libffi/ipkg/libffi.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libffi -Priority: optional -Section: libs -Description: Foreign Function Interface library diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile index cf4008a..487d3b7 100644 --- a/package/libfontenc/Makefile +++ b/package/libfontenc/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libfontenc PKG_VERSION:= 1.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= b7bb0887b702ab03251fd9fc361d0c58 -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= helps font libraries portably determine and deal with different encodings of fonts +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libfontenc/ipkg/libfontenc.control b/package/libfontenc/ipkg/libfontenc.control deleted file mode 100644 index 0a0db7a..0000000 --- a/package/libfontenc/ipkg/libfontenc.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libfontenc -Priority: optional -Section: x11 -Description: X.org library diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index fd7c283..a414dca 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= libgcrypt PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 555488ddfc81a6e0df1fb5112e7eee13 -MASTER_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ +PKG_DESCR:= GNU crypto library +PKG_SECTION:= libs +PKG_DEPENDS:= libgpg-error +PKG_URL:= http://directory.fsf.org/project/libgcrypt +PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-asm \ diff --git a/package/libgcrypt/ipkg/libgcrypt.control b/package/libgcrypt/ipkg/libgcrypt.control deleted file mode 100644 index 8cf2b30..0000000 --- a/package/libgcrypt/ipkg/libgcrypt.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: libgcrypt -Priority: optional -Section: libs -Description: GNU crypto library -Depends: libgpg-error - diff --git a/package/libgd/Makefile b/package/libgd/Makefile index 43ae0a9..32d4f49 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= gd PKG_VERSION:= 2.0.35 PKG_RELEASE:= 1 PKG_MD5SUM:= 982963448dc36f20cb79b6e9ba6fdede -MASTER_SITES:= http://www.libgd.org/releases/ +PKG_DESCR:= A library for the dynamic creation of images +PKG_SECTION:= libs +PKG_DEPENDS:= libjpeg libpng +PKG_URL:= http://www.libgd.org +PKG_SITES:= http://www.libgd.org/releases/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_DIR}/usr/bin/libpng12-config" diff --git a/package/libgd/ipkg/libgd.control b/package/libgd/ipkg/libgd.control deleted file mode 100644 index f6a78e5..0000000 --- a/package/libgd/ipkg/libgd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libgd -Priority: optional -Section: libs -Depends: libjpeg, libpng -Description: A library for the dynamic creation of images diff --git a/package/libgdbm/Makefile b/package/libgdbm/Makefile index 91c3d60..62c53ca 100644 --- a/package/libgdbm/Makefile +++ b/package/libgdbm/Makefile @@ -9,15 +9,17 @@ PKG_NAME:= libgdbm PKG_VERSION:= 1.8.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 1d1b1d5c0245b1c00aff92da751e9aa1 +PKG_DESCR:= disk file format database which stores key/data-pairs in single files +PKG_SECTION:= libs +PKG_URL:= http://www.gnu.org/software/gdbm +PKG_SITES:= ${MASTER_SITE_GNU:=gdbm/} -MASTER_SITES:= ${MASTER_SITE_GNU:=gdbm/} DISTFILES:= gdbm-${PKG_VERSION}.tar.gz - WRKDIST= ${WRKDIR}/gdbm-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libgdbm/ipkg/libgdbm.control b/package/libgdbm/ipkg/libgdbm.control deleted file mode 100644 index a05a7ac..0000000 --- a/package/libgdbm/ipkg/libgdbm.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libgdbm -Priority: optional -Section: libs -Description: disk file format database which stores key/data-pairs in single files diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 9881e22..b9de613 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -9,15 +9,19 @@ PKG_NAME:= libgpg-error PKG_VERSION:= 1.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 8599b96c911b1df1be24a6ff4ec3c364 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \ +PKG_DESCR:= an helper library for common error codes and descriptions +PKG_SECTION:= libs +PKG_URL:= http://www.gnupg.org +PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \ http://mirrors.rootmode.com/ftp.gnupg.org/libgpg-error/ \ http://gulus.usherbrooke.ca/pub/appl/GnuPG/libgpg-error/ \ http://gnupg.unixmexico.org/ftp/libgpg-error/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libgpg-error/ipkg/libgpg-error.control b/package/libgpg-error/ipkg/libgpg-error.control deleted file mode 100644 index 6a08c01..0000000 --- a/package/libgpg-error/ipkg/libgpg-error.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libgpg-error -Priority: optional -Section: libs -Description: an helper library for common error codes and descriptions diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile index 55533f6..7a9b3b4 100644 --- a/package/libgssglue/Makefile +++ b/package/libgssglue/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libgssglue PKG_VERSION:= 0.1 PKG_RELEASE:= 1 PKG_MD5SUM:= ce1b4c758e6de01b712d154c5c97e540 -MASTER_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/ +PKG_DESCR:= GSS glue library for NFSv4 +PKG_SECTION:= libs +PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libgssglue/ipkg/libgssglue.control b/package/libgssglue/ipkg/libgssglue.control deleted file mode 100644 index 44e801a..0000000 --- a/package/libgssglue/ipkg/libgssglue.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libgssglue -Priority: optional -Section: libs -Description: library for NFSv4 diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index a845669..75f3141 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -9,12 +9,14 @@ PKG_NAME:= libiconv PKG_VERSION:= 1.13 PKG_RELEASE:= 1 PKG_MD5SUM:= 048032a3032ebd182150bdee30a5d533 - -MASTER_SITES:= ${MASTER_SITE_GNU:=libiconv/} +PKG_DESCR:= character set conversion library +PKG_SECTION:= libs +PKG_URL:= http://www.gnu.org/software/libiconv +PKG_SITES:= ${MASTER_SITE_GNU:=libiconv/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libiconv/ipkg/libiconv.control b/package/libiconv/ipkg/libiconv.control deleted file mode 100644 index 21306f1..0000000 --- a/package/libiconv/ipkg/libiconv.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libiconv -Priority: optional -Section: libs -Description: character set conversion library diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile index 8712868..3c705c6 100644 --- a/package/libid3tag/Makefile +++ b/package/libid3tag/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libid3tag PKG_VERSION:= 0.15.1b PKG_RELEASE:= 1 PKG_MD5SUM:= e5808ad997ba32c498803822078748c3 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} +PKG_DESCR:= an ID3 tag manipulation library +PKG_SECTION:= libs +PKG_DEPENDS:= zlib +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBID3TAG,libid3tag,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBID3TAG,libid3tag,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-debugging \ diff --git a/package/libid3tag/ipkg/libid3tag.control b/package/libid3tag/ipkg/libid3tag.control deleted file mode 100644 index ec9a754..0000000 --- a/package/libid3tag/ipkg/libid3tag.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libid3tag -Priority: optional -Section: libs -Depends: zlib -Description: an ID3 tag manipulation library diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index e78dd5f..6259a59 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -6,15 +6,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lzo -PKG_VERSION:= 2.02 +PKG_VERSION:= 2.03 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6760e5819f4238328709bf93bf10071c - -MASTER_SITES:= http://www.oberhumer.com/opensource/lzo/download/ +PKG_MD5SUM:= 0c3d078c2e8ea5a88971089a2f02a726 +PKG_DESCR:= a real-time data compression library +PKG_SECTION:= libs +PKG_URL:= http://www.oberhumer.com/opensource/lzo +PKG_SITES:= http://www.oberhumer.com/opensource/lzo/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-static diff --git a/package/liblzo/ipkg/liblzo.control b/package/liblzo/ipkg/liblzo.control deleted file mode 100644 index 3f84ee6..0000000 --- a/package/liblzo/ipkg/liblzo.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: liblzo -Priority: optional -Section: libs -Description: a real-time data compression library diff --git a/package/libmad/Makefile b/package/libmad/Makefile index 3828fa0..0c3ab8f 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -9,13 +9,15 @@ PKG_NAME:= libmad PKG_VERSION:= 0.15.1b PKG_RELEASE:= 1 PKG_MD5SUM:= 1be543bc30c56fb6bea1d7bf6a64e66c - -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \ +PKG_DESCR:= An high-quality MPEG audio decoding library +PKG_SECTION:= libs +PKG_URL:= http://sourceforge.net/projects/mad +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \ ftp://ftp.mars.org/pub/mpeg/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBMAD,libmad,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) FPM:=default ifeq (${ARCH},i386) diff --git a/package/libmad/ipkg/libmad.control b/package/libmad/ipkg/libmad.control deleted file mode 100644 index e81fea2..0000000 --- a/package/libmad/ipkg/libmad.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libmad -Priority: optional -Section: libs -Description: An high-quality MPEG audio decoding library diff --git a/package/libnet/Makefile b/package/libnet/Makefile index 9eb7a3e..788650b 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -9,17 +9,21 @@ PKG_NAME:= libnet PKG_VERSION:= 1.0.2a PKG_RELEASE:= 7 PKG_MD5SUM:= ddf53f0f484184390e8c2a1bd0853667 -MASTER_SITES:= http://www.packetfactory.net/libnet/dist/deprecated/ +PKG_DESCR:= a low-level packet creation library +PKG_SECTION:= libs +PKG_DEPENDS:= libpcap +PKG_SITES:= http://www.packetfactory.net/libnet/dist/deprecated/ + WRKDIST= ${WRKDIR}/Libnet-${PKG_VERSION} include ${TOPDIR}/mk/package.mk ENDIAN:=lil -ifeq (${ARCH},mips) +ifeq (${CPU_ARCH},mips) ENDIAN:=big endif -$(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_libnet_have_pf_packet=yes \ diff --git a/package/libnet/ipkg/libnet.control b/package/libnet/ipkg/libnet.control deleted file mode 100644 index 65a2b5e..0000000 --- a/package/libnet/ipkg/libnet.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libnet -Priority: optional -Section: libs -Description: a low-level packet creation library -Depends: libpcap diff --git a/package/libnfsidmap/Makefile b/package/libnfsidmap/Makefile index e9cb63f..9268820 100644 --- a/package/libnfsidmap/Makefile +++ b/package/libnfsidmap/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libnfsidmap PKG_VERSION:= 0.21b1 PKG_RELEASE:= 1 PKG_MD5SUM:= a8a44bd4aa22441fb54735dd65496b72 -MASTER_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/ +PKG_DESCR:= library for NFSv4 +PKG_SECTION:= libs +PKG_URL:= http://www.citi.umich.edu/projects/nfsv4/linux/ +PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBNFSIDMAP,libnfsidmap,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBNFSIDMAP,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libnfsidmap/ipkg/libnfsidmap.control b/package/libnfsidmap/ipkg/libnfsidmap.control deleted file mode 100644 index ad122b2..0000000 --- a/package/libnfsidmap/ipkg/libnfsidmap.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libnfsidmap -Priority: optional -Section: libs -Description: library for NFSv4 diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 99aa712..e5e869a 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libnids PKG_VERSION:= 1.18 PKG_RELEASE:= 1 PKG_MD5SUM:= 9ee6dcdfac97bae6fe611aa27d2594a5 -MASTER_SITES:= http://www.packetfactory.net/projects/libnids/dist/ +PKG_DESCR:= implementation of an E-component of Network Intrusion Detection System +PKG_SECTION:= libs +PKG_SITES:= http://www.packetfactory.net/projects/libnids/dist/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBNIDS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-libnet="${STAGING_DIR}/usr" \ diff --git a/package/libnids/ipkg/libnids.control b/package/libnids/ipkg/libnids.control deleted file mode 100644 index f342742..0000000 --- a/package/libnids/ipkg/libnids.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libnids -Priority: optional -Section: libs -Description: implementation of an E-component of Network Intrusion Detection System. -Depends: libpcap, libnet diff --git a/package/libnl/Makefile b/package/libnl/Makefile index 6c4b7cb..d11f3e2 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -9,12 +9,13 @@ PKG_NAME:= libnl PKG_VERSION:= 1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= ae970ccd9144e132b68664f98e7ceeb1 -MASTER_SITES:= http://downloads.openwrt.org/sources/ - +PKG_DESCR:= Netlink library +PKG_SECTION:= libs +PKG_SITES:= http://downloads.openwrt.org/sources/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/libnl/ipkg/libnl.control b/package/libnl/ipkg/libnl.control deleted file mode 100644 index 8ad5fcc..0000000 --- a/package/libnl/ipkg/libnl.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libnl -Priority: optional -Section: net -Description: Tools for setting up WiFi cards via netlink (nl80211) diff --git a/package/libnl/patches/patch-include_netlink-local_h b/package/libnl/patches/patch-include_netlink-local_h new file mode 100644 index 0000000..11929f8 --- /dev/null +++ b/package/libnl/patches/patch-include_netlink-local_h @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/include/netlink-local.h 2009-05-28 23:19:45.636686415 +0200 +@@ -337,7 +337,7 @@ static inline int nl_cb_call(struct nl_c + } + + #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0])) +-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) ++#define __offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) + + #define __init __attribute__ ((constructor)) + #define __exit __attribute__ ((destructor)) diff --git a/package/libnl/patches/patch-lib_object_c b/package/libnl/patches/patch-lib_object_c new file mode 100644 index 0000000..6d4ba6c --- /dev/null +++ b/package/libnl/patches/patch-lib_object_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libnl-1.1.orig/lib/object.c 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/lib/object.c 2009-05-28 23:20:00.925639994 +0200 +@@ -96,7 +96,7 @@ struct nl_object *nl_object_clone(struct + { + struct nl_object *new; + struct nl_object_ops *ops = obj_ops(obj); +- int doff = offsetof(struct nl_derived_object, data); ++ int doff = __offsetof(struct nl_derived_object, data); + int size; + + new = nl_object_alloc(ops); diff --git a/package/libogg/Makefile b/package/libogg/Makefile index 2d8f567..fb95c22 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libogg PKG_VERSION:= 1.1.3 PKG_RELEASE:= 2 PKG_MD5SUM:= eaf7dc6ebbff30975de7527a80831585 -MASTER_SITES:= http://downloads.xiph.org/releases/ogg/ +PKG_DESCR:= The Ogg bitstream handling library +PKG_SECTION:= libs +PKG_URL:= http://www.xiph.org/ogg +PKG_SITES:= http://downloads.xiph.org/releases/ogg/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOGG,libogg,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBOGG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libogg/ipkg/libogg.control b/package/libogg/ipkg/libogg.control deleted file mode 100644 index dd816f3..0000000 --- a/package/libogg/ipkg/libogg.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libogg -Priority: optional -Section: libs -Description: The Ogg bitstream handling library diff --git a/package/libol/Makefile b/package/libol/Makefile index 1188273..9e8243c 100644 --- a/package/libol/Makefile +++ b/package/libol/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libol PKG_VERSION:= 0.3.18 PKG_RELEASE:= 1 PKG_MD5SUM:= cbadf4b7ea276dfa85acc38a1cc5ff17 -MASTER_SITES:= http://www.balabit.com/downloads/files/libol/0.3/ +PKG_DESCR:= Support library for syslog-ng +PKG_SECTION:= libs +PKG_URL:= http://www.balabit.com +PKG_SITES:= http://www.balabit.com/downloads/files/libol/0.3/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOL,libol,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBOL,libol,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libol/ipkg/libol.control b/package/libol/ipkg/libol.control deleted file mode 100644 index c65ae38..0000000 --- a/package/libol/ipkg/libol.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libol -Section: libs -Description: Support library for syslog-ng -Priority: optional diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile index 1377f64..1be2121 100644 --- a/package/libosip2/Makefile +++ b/package/libosip2/Makefile @@ -6,14 +6,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libosip2 -PKG_VERSION:= 2.2.0 +PKG_VERSION:= 3.3.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= f1237af0250c59b318bd64a59f5750ea -MASTER_SITES:= ${MASTER_SITE_GNU:=osip/} +PKG_MD5SUM:= 81493bb4d4ae6d55b71a0d4369339125 +PKG_DESCR:= GNU oSIP library, a SIP (Session Initiation Protocol) implementation +PKG_SECTION:= libs +PKG_DEPENDS:= libpthread +PKG_URL:= http://www.gnu.org/software/osip +PKG_SITES:= ${MASTER_SITE_GNU:=osip/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOSIP2,libosip2,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBOSIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-trace \ diff --git a/package/libosip2/ipkg/libosip2.control b/package/libosip2/ipkg/libosip2.control deleted file mode 100644 index 706c3e4..0000000 --- a/package/libosip2/ipkg/libosip2.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libosip2 -Priority: optional -Section: libs -Description: GNU oSIP library, a SIP (Session Initiation Protocol) implementation -Depends: libpthread diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile index 0d05d70..276d118 100644 --- a/package/libowfat/Makefile +++ b/package/libowfat/Makefile @@ -5,17 +5,20 @@ include ${TOPDIR}/rules.mk -PKG_NAME= libowfat -PKG_VERSION= 0.25 -PKG_RELEASE= 1 -PKG_MD5SUM= 7a5ab9f5b7099b82e428cd308d170005 +PKG_NAME:= libowfat +PKG_VERSION:= 0.28 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 6bbee9a86506419657d87123b7a6f2c1 +PKG_DESCR:= useful C library +PKG_SECTION:= libs +PKG_URL:= http://www.fefe.de/libowfat +PKG_SITES:= http://dl.fefe.de/ -MASTER_SITES= http://dl.fefe.de/ -DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOWFAT,libowfat,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBOWFAT,libowfat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/libp11/Makefile b/package/libp11/Makefile index 6a3deed..e71e780 100644 --- a/package/libp11/Makefile +++ b/package/libp11/Makefile @@ -6,14 +6,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libp11 -PKG_VERSION:= 0.2.2 +PKG_VERSION:= 0.2.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= b8655b2065575eb1b96a9c924c234c63 -MASTER_SITES:= http://www.opensc-project.org/files/libp11/ +PKG_MD5SUM:= 9e2c5cbececde245e2d2f535bd49ce35 +PKG_DESCR:= library implementing a small layer on top of PKCS11 API +PKG_SECTION:= libs +PKG_DEPENDS:= libopenssl libltdl +PKG_URL:= http://www.opensc-project.org/libp11 +PKG_SITES:= http://www.opensc-project.org/files/libp11/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBP11,libp11,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBP11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/libp11/ipkg/libp11.control b/package/libp11/ipkg/libp11.control deleted file mode 100644 index 93e0155..0000000 --- a/package/libp11/ipkg/libp11.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libp11 -Priority: optional -Section: crypto -Description: libp11 -Depends: libopenssl, libltdl diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index d89bf36..2e8415e 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libpcap PKG_VERSION:= 1.0.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 9ad1358c5dec48456405eac197a46d3d -MASTER_SITES:= http://www.tcpdump.org/release/ +PKG_DESCR:= a low-level packet capture library +PKG_SECTION:= libs +PKG_URL:= http://www.tcpdump.org +PKG_SITES:= http://www.tcpdump.org/release/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_linux_vers=26 diff --git a/package/libpcap/ipkg/libpcap.control b/package/libpcap/ipkg/libpcap.control deleted file mode 100644 index a743ea4..0000000 --- a/package/libpcap/ipkg/libpcap.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libpcap -Priority: optional -Section: libs -Description: a low-level packet capture library diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index 9668bd1..b4c8dc6 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libpciaccess PKG_VERSION:= 0.10.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 3c4a7578cb63c63ccb1ebca87e10407f -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_DESCR:= X.org libpciaccess library +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= autotool gnu BUILD_STYLE= auto diff --git a/package/libpciaccess/ipkg/libpciaccess.control b/package/libpciaccess/ipkg/libpciaccess.control deleted file mode 100644 index c0c7469..0000000 --- a/package/libpciaccess/ipkg/libpciaccess.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libpciaccess -Priority: optional -Section: x11 -Description: libpciaccess library diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 6b0a332..1111110 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -6,14 +6,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libpng -PKG_VERSION:= 1.2.35 +PKG_VERSION:= 1.2.36 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8ca6246930a57d5be7adc7c4e7fb5e00 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/} +PKG_MD5SUM:= 4779cd011409ea9b591e11638781f0bf +PKG_DESCR:= A library for reading/writing PNG images +PKG_SECTION:= libs +PKG_DEPENDS:= zlib +PKG_URL:= http://www.libpng.org/pub/png/libpng.html +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libpng/ipkg/libpng.control b/package/libpng/ipkg/libpng.control deleted file mode 100644 index 96c91b4..0000000 --- a/package/libpng/ipkg/libpng.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libpng -Priority: optional -Section: libs -Depends: zlib -Description: A library for reading/writing PNG images diff --git a/package/libpri/Makefile b/package/libpri/Makefile index f3b7cc8..5da4ebe 100644 --- a/package/libpri/Makefile +++ b/package/libpri/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libpri PKG_VERSION:= 1.2.7 PKG_RELEASE:= 1 PKG_MD5SUM:= b9354f420304afa7b8923615a117b9c6 -MASTER_SITES:= http://www.asterisk-support.de/mirror/libpri/ +PKG_DESCR:= C implementation of the Primary Rate ISDN specification +PKG_SECTION:= libs +PKG_URL:= http://www.asterisk.org +PKG_SITES:= http://www.asterisk-support.de/mirror/libpri/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPRI,libpri,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBPRI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto MAKE_FLAGS+= CC='${TARGET_CC}' diff --git a/package/libpri/ipkg/libpri.control b/package/libpri/ipkg/libpri.control deleted file mode 100644 index 029fa44..0000000 --- a/package/libpri/ipkg/libpri.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libpri -Priority: optional -Section: libs -Depends: -Description: C implementation of the Primary Rate ISDN specification diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index d337a44..cbf398e 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -12,11 +12,13 @@ include ${TOPDIR}/toolchain/uClibc/Makefile.inc endif PKG_NAME:= libpthread +PKG_DESCR:= POSIX threading library +PKG_SECTION:= libs NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-install: ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib diff --git a/package/libpthread/ipkg/libpthread.control b/package/libpthread/ipkg/libpthread.control deleted file mode 100644 index 73978c2..0000000 --- a/package/libpthread/ipkg/libpthread.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libpthread -Priority: optional -Section: libs -Description: POSIX threads library diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index dcda319..bcdb411 100644 --- a/package/librpcsecgss/Makefile +++ b/package/librpcsecgss/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= librpcsecgss PKG_VERSION:= 0.18 PKG_RELEASE:= 1 PKG_MD5SUM:= f2c4a69c5a32f62b762a569b8d962156 -MASTER_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ +PKG_DESCR:= Secure RPC library for NFSv4 +PKG_SECTION:= libs +PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= autotool gnu BUILD_STYLE= auto @@ -21,6 +23,7 @@ INSTALL_STYLE= auto confprog post-extract: $(CP) ./files/librpcsecgss.pc* $(WRKSRC)/ + post-install: $(INSTALL_DIR) $(IDIR_LIBRPCSECGSS)/usr/lib $(CP) $(WRKINST)/usr/lib/librpcsecgss.so* $(IDIR_LIBRPCSECGSS)/usr/lib/ diff --git a/package/librpcsecgss/ipkg/librpcsecgss.control b/package/librpcsecgss/ipkg/librpcsecgss.control deleted file mode 100644 index b4772a0..0000000 --- a/package/librpcsecgss/ipkg/librpcsecgss.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: librpcsecgss -Priority: optional -Section: libs -Description: library for NFSv4 diff --git a/package/libshout/Makefile b/package/libshout/Makefile index b0c9e75..b5f9c3a 100644 --- a/package/libshout/Makefile +++ b/package/libshout/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= libshout PKG_VERSION:= 2.2.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 4f75fc9901c724b712c371c9a1e782d3 -MASTER_SITES:= http://downloads.us.xiph.org/releases/libshout/ +PKG_DESCR:= Library which can be used to write a source client for streaming +PKG_SECTION:= libs +PKG_DEPENDS:= libvorbis libogg +PKG_URL:= http://directory.fsf.org/project/libshout +PKG_SITES:= http://downloads.us.xiph.org/releases/libshout/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSHOUT,libshout,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBSHOUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-speex=no \ diff --git a/package/libshout/ipkg/libshout.control b/package/libshout/ipkg/libshout.control deleted file mode 100644 index d1d9ce6..0000000 --- a/package/libshout/ipkg/libshout.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libshout -Priority: optional -Section: libs -Depends: libvorbis, libogg -Description: Library which can be used to write a source client for streaming diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile index 7a10a62..42aa501 100644 --- a/package/libsigc++/Makefile +++ b/package/libsigc++/Makefile @@ -9,12 +9,15 @@ PKG_NAME:= libsigc++ PKG_VERSION:= 2.2.2 PKG_RELEASE:= 1 PKG_MD5SUM:= e27a20ac9bc9100f48effdfca8e8c595 - -MASTER_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/} +PKG_DESCR:= Callback framework for C++ +PKG_SECTION:= libs +PKG_DEPENDS:= libstdc++ +PKG_URL:= http://libsigc.sourceforge.net +PKG_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSIGCXX,libsigc++,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBSIGCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/libsigc++/ipkg/libsigc++.control b/package/libsigc++/ipkg/libsigc++.control deleted file mode 100644 index ffce297..0000000 --- a/package/libsigc++/ipkg/libsigc++.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libsigc++ -Priority: optional -Section: libs -Depends: libstdc++ -Description: Callback framework for C++ diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index 4e9a1c5..ae07966 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -7,11 +7,13 @@ include ${TOPDIR}/rules.mk include ${TOPDIR}/toolchain/glibc/Makefile.inc PKG_NAME:= libstdcxx +PKG_DESCR:= C++ support library +PKG_SECTION:= libs NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSTDCXX,libstdcxx,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBSTDCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-install: ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/lib diff --git a/package/libstdcxx/ipkg/libstdcxx.control b/package/libstdcxx/ipkg/libstdcxx.control deleted file mode 100644 index 384ebc1..0000000 --- a/package/libstdcxx/ipkg/libstdcxx.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libstdcxx -Priority: optional -Section: net -Depends: libgcc -Description: G++ support library diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index 159b59d..239a297 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -9,7 +9,10 @@ PKG_NAME:= libtasn1 PKG_VERSION:= 1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 93b43cc5013bda4d8bf64508f1566c54 -MASTER_SITES:= ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \ +PKG_DESCR:= an ASN.1 and DER structures manipulation library +PKG_SECTION:= libs +PKG_URL:= http://www.gnupg.org +PKG_SITES:= ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \ ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/libtasn1/ \ http://www.mirrors.wiretapped.net/security/network-securitygnutls/libtasn1/ \ ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/libtasn1/ \ @@ -17,7 +20,7 @@ MASTER_SITES:= ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBTASN1,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libtasn1/ipkg/libtasn1.control b/package/libtasn1/ipkg/libtasn1.control deleted file mode 100644 index 4a5c1f6..0000000 --- a/package/libtasn1/ipkg/libtasn1.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libtasn1 -Priority: optional -Section: libs -Description: an ASN.1 and DER structures manipulation library diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index f7a1e7a..811d1c5 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -12,11 +12,13 @@ include ${TOPDIR}/toolchain/uClibc/Makefile.inc endif PKG_NAME:= libthread-db +PKG_DESCR:= POSIX threads library for gdb/gdbserver +PKG_SECTION:= libs NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBTHREAD_DB,libthread-db,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBTHREAD_DB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-install: ${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib diff --git a/package/libthread_db/ipkg/libthread-db.control b/package/libthread_db/ipkg/libthread-db.control deleted file mode 100644 index 533ba41..0000000 --- a/package/libthread_db/ipkg/libthread-db.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libthread-db -Priority: optional -Section: libs -Description: POSIX threads library for gdb/gdbserver diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index db6190d..240382f 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= libtiff PKG_VERSION:= 3.8.2 PKG_RELEASE:= 1 PKG_MD5SUM:= fbb6f446ea4ed18955e2714934e5b698 -MASTER_SITES:= ftp://ftp.remotesensing.org/pub/libtiff/ +PKG_DESCR:= A library for reading/writing TIFF images +PKG_SECTION:= libs +PKG_URL:= http://www.libtiff.org +PKG_SITES:= ftp://ftp.remotesensing.org/pub/libtiff/ + DISTFILES:= tiff-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/tiff-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-cxx diff --git a/package/libtiff/ipkg/libtiff.control b/package/libtiff/ipkg/libtiff.control deleted file mode 100644 index 9647d07..0000000 --- a/package/libtiff/ipkg/libtiff.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libtiff -Priority: optional -Section: libs -Description: A library for reading/writing TIFF images diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 1b81fdb..0cf6968 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -6,15 +6,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtirpc -PKG_VERSION:= 0.1.11 -PKG_RELEASE:= 2 -PKG_MD5SUM:= c656b7bf47e8bddbdefcd0b6a6f77b71 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=libtirpc/} +PKG_VERSION:= 0.2.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b3b513a8825aa227deac63ea38c64f41 +PKG_DESCR:= a transport independent RPC library +PKG_SECTION:= libs +PKG_URL:= http://sourceforge.net/projects/libtirpc +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libtirpc/} + DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBTIRPC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= autotool gnu ifneq (${ADK_COMPILE_NFS_UTILS_WITH_KERBEROS},y) diff --git a/package/libtirpc/ipkg/libtirpc.control b/package/libtirpc/ipkg/libtirpc.control deleted file mode 100644 index 2253115..0000000 --- a/package/libtirpc/ipkg/libtirpc.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libtirpc -Priority: optional -Section: libs -Description: a transport independent RPC library diff --git a/package/libtirpc/patches/patch-INSTALL b/package/libtirpc/patches/patch-INSTALL new file mode 100644 index 0000000..cfc0e71 --- /dev/null +++ b/package/libtirpc/patches/patch-INSTALL @@ -0,0 +1,255 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libtirpc-0.2.0.orig/INSTALL 2009-05-28 21:25:26.000000000 +0200 ++++ libtirpc-0.2.0/INSTALL 2009-05-29 20:19:10.039164332 +0200 +@@ -1,35 +1,19 @@ +-Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +-Foundation, Inc. ++Installation Instructions ++************************* ++ ++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, ++2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives + unlimited permission to copy, distribute and modify it. + +- +-TI-RPC Library Quick Installation +-================================= +- +- Without GSS API +- +-$ ./configure +-$ make +-# make install +- +- To enable utilization of RPCSEC via GSS API use following commands +-but you need to install libgssapi from the CITI before +- +-$ ./configure --enable-gss +-$ make +-# make install +- +- Once installed, you can customize the /etc/netconfig configuration file +-to configure the supported protocols. To support INET6 udp/tcp, uncomment +-the udp6/tcp6 lines. +- +- + Basic Installation + ================== + +- These are generic installation instructions. ++ Briefly, the shell commands `./configure; make; make install' should ++configure, build, and install this package. The following ++more-detailed instructions are generic; see the `README' file for ++instructions specific to this package. + + The `configure' shell script attempts to guess correct values for + various system-dependent variables used during compilation. It uses +@@ -42,9 +26,9 @@ debugging `configure'). + + It can also use an optional file (typically called `config.cache' + and enabled with `--cache-file=config.cache' or simply `-C') that saves +-the results of its tests to speed up reconfiguring. (Caching is ++the results of its tests to speed up reconfiguring. Caching is + disabled by default to prevent problems with accidental use of stale +-cache files.) ++cache files. + + If you need to do unusual things to compile the package, please try + to figure out how `configure' could check whether to do them, and mail +@@ -54,20 +38,17 @@ some point `config.cache' contains resul + may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +-`configure' by a program called `autoconf'. You only need +-`configure.ac' if you want to change it or regenerate `configure' using +-a newer version of `autoconf'. ++`configure' by a program called `autoconf'. You need `configure.ac' if ++you want to change it or regenerate `configure' using a newer version ++of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type +- `./configure' to configure the package for your system. If you're +- using `csh' on an old version of System V, you might need to type +- `sh ./configure' instead to prevent `csh' from trying to execute +- `configure' itself. ++ `./configure' to configure the package for your system. + +- Running `configure' takes awhile. While running, it prints some +- messages telling which features it is checking for. ++ Running `configure' might take a while. While running, it prints ++ some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + +@@ -86,6 +67,9 @@ The simplest way to compile this package + all sorts of other programs in order to regenerate files that came + with the distribution. + ++ 6. Often, you can also type `make uninstall' to remove the installed ++ files again. ++ + Compilers and Options + ===================== + +@@ -97,7 +81,7 @@ for details on some of the pertinent env + by setting variables in the command line or in the environment. Here + is an example: + +- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix ++ ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +@@ -106,34 +90,46 @@ Compiling For Multiple Architectures + + You can compile the package for more than one kind of computer at the + same time, by placing the object files for each architecture in their +-own directory. To do this, you must use a version of `make' that +-supports the `VPATH' variable, such as GNU `make'. `cd' to the ++own directory. To do this, you can use GNU `make'. `cd' to the + directory where you want the object files and executables to go and run + the `configure' script. `configure' automatically checks for the + source code in the directory that `configure' is in and in `..'. + +- If you have to use a `make' that does not support the `VPATH' +-variable, you have to compile the package for one architecture at a +-time in the source code directory. After you have installed the +-package for one architecture, use `make distclean' before reconfiguring +-for another architecture. ++ With a non-GNU `make', it is safer to compile the package for one ++architecture at a time in the source code directory. After you have ++installed the package for one architecture, use `make distclean' before ++reconfiguring for another architecture. ++ ++ On MacOS X 10.5 and later systems, you can create libraries and ++executables that work on multiple system types--known as "fat" or ++"universal" binaries--by specifying multiple `-arch' options to the ++compiler but only a single `-arch' option to the preprocessor. Like ++this: ++ ++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CPP="gcc -E" CXXCPP="g++ -E" ++ ++ This is not guaranteed to produce working output in all cases, you ++may have to build one architecture at a time and combine the results ++using the `lipo' tool if you have problems. + + Installation Names + ================== + +- By default, `make install' will install the package's files in +-`/usr/local/bin', `/usr/local/man', etc. You can specify an +-installation prefix other than `/usr/local' by giving `configure' the +-option `--prefix=PATH'. ++ By default, `make install' installs the package's commands under ++`/usr/local/bin', include files under `/usr/local/include', etc. You ++can specify an installation prefix other than `/usr/local' by giving ++`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for + architecture-specific files and architecture-independent files. If you +-give `configure' the option `--exec-prefix=PATH', the package will use +-PATH as the prefix for installing programs and libraries. +-Documentation and other data files will still use the regular prefix. ++pass the option `--exec-prefix=PREFIX' to `configure', the package uses ++PREFIX as the prefix for installing programs and libraries. ++Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +-options like `--bindir=PATH' to specify different values for particular ++options like `--bindir=DIR' to specify different values for particular + kinds of files. Run `configure --help' for a list of the directories + you can set and what kinds of files go in them. + +@@ -156,6 +152,28 @@ find the X include and library files aut + you can use the `configure' options `--x-includes=DIR' and + `--x-libraries=DIR' to specify their locations. + ++Particular systems ++================== ++ ++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU ++CC is not installed, it is recommended to use the following options in ++order to use an ANSI C compiler: ++ ++ ./configure CC="cc -Ae" ++ ++and if that doesn't work, install pre-built binaries of GCC for HP-UX. ++ ++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot ++parse its `' header file. The option `-nodtk' can be used as ++a workaround. If GNU CC is not installed, it is therefore recommended ++to try ++ ++ ./configure CC="cc" ++ ++and if that doesn't work, try ++ ++ ./configure CC="cc -nodtk" ++ + Specifying the System Type + ========================== + +@@ -178,7 +196,7 @@ where SYSTEM can have one of these forms + need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +-use the `--target=TYPE' option to select the type of system they will ++use the option `--target=TYPE' to select the type of system they will + produce code for. + + If you want to _use_ a cross compiler, that generates code for a +@@ -208,9 +226,14 @@ them in the `configure' command line, us + + ./configure CC=/usr/local2/bin/gcc + +-will cause the specified gcc to be used as the C compiler (unless it is ++causes the specified `gcc' to be used as the C compiler (unless it is + overridden in the site shell script). + ++Unfortunately, this technique does not work for `CONFIG_SHELL' due to ++an Autoconf bug. Until the bug is fixed you can use this workaround: ++ ++ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash ++ + `configure' Invocation + ====================== + +@@ -219,7 +242,14 @@ operates. + + `--help' + `-h' +- Print a summary of the options to `configure', and exit. ++ Print a summary of all of the options to `configure', and exit. ++ ++`--help=short' ++`--help=recursive' ++ Print a summary of the options unique to this package's ++ `configure', and exit. The `short' variant lists options used ++ only in the top level, while the `recursive' variant lists options ++ also present in any nested packages. + + `--version' + `-V' +@@ -246,6 +276,16 @@ operates. + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + ++`--prefix=DIR' ++ Use DIR as the installation prefix. *Note Installation Names:: ++ for more details, including other options available for fine-tuning ++ the installation locations. ++ ++`--no-create' ++`-n' ++ Run the configure checks, but stop before creating any output ++ files. ++ + `configure' also accepts some other, not widely useful, options. Run + `configure --help' for more details. + diff --git a/package/libtirpc/patches/patch-Makefile_am b/package/libtirpc/patches/patch-Makefile_am deleted file mode 100644 index e95e381..0000000 --- a/package/libtirpc/patches/patch-Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libtirpc-0.1.9.orig/Makefile.am 2008-07-09 20:13:20.000000000 +0200 -+++ libtirpc-0.1.9/Makefile.am 2008-12-10 01:02:50.823745058 +0100 -@@ -46,6 +46,3 @@ nobase_include_HEADERS = tirpc/un-namesp - pkgconfigdir=$(libdir)/pkgconfig - pkgconfig_DATA = libtirpc.pc - --install-exec-local: -- cp -p ./doc/etc_netconfig $(DESTDIR)/etc/netconfig -- chmod 0644 $(DESTDIR)/etc/netconfig diff --git a/package/libtirpc/patches/patch-Makefile_in b/package/libtirpc/patches/patch-Makefile_in new file mode 100644 index 0000000..a2010c3 --- /dev/null +++ b/package/libtirpc/patches/patch-Makefile_in @@ -0,0 +1,94 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libtirpc-0.2.0.orig/Makefile.in 2009-05-29 00:13:40.000000000 +0200 ++++ libtirpc-0.2.0/Makefile.in 2009-05-29 20:19:10.275181553 +0200 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -98,22 +98,17 @@ CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DSYMUTIL = @DSYMUTIL@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GREP = @GREP@ + GSSGLUE_CFLAGS = @GSSGLUE_CFLAGS@ + GSSGLUE_LIBS = @GSSGLUE_LIBS@ +@@ -122,17 +117,23 @@ INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++NM = @NM@ + NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -152,8 +153,7 @@ abs_srcdir = @abs_srcdir@ + abs_top_builddir = @abs_top_builddir@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -184,6 +184,7 @@ libdir = @libdir@ + libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -298,7 +299,7 @@ clean-libtool: + -rm -rf .libs _libs + + distclean-libtool: +- -rm -f libtool ++ -rm -f libtool config.lt + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" +@@ -411,7 +412,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS diff --git a/package/libtirpc/patches/patch-aclocal_m4 b/package/libtirpc/patches/patch-aclocal_m4 new file mode 100644 index 0000000..7223bcd --- /dev/null +++ b/package/libtirpc/patches/patch-aclocal_m4 @@ -0,0 +1,10821 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libtirpc-0.2.0.orig/aclocal.m4 2009-05-29 00:13:37.000000000 +0200 ++++ libtirpc-0.2.0/aclocal.m4 2009-05-29 20:18:53.426131776 +0200 +@@ -1,4 +1,4 @@ +-# generated automatically by aclocal 1.10.1 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.2 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +@@ -13,108 +13,194 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(AC_AUTOCONF_VERSION, [2.63],, ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, + [m4_warning([this file was generated for autoconf 2.63. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. + +-# serial 52 AC_PROG_LIBTOOL ++m4_define([_LT_COPYING], [dnl ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++]) + ++# serial 56 LT_INIT + +-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +-# ----------------------------------------------------------- +-# If this macro is not defined by Autoconf, define it here. +-m4_ifdef([AC_PROVIDE_IFELSE], +- [], +- [m4_define([AC_PROVIDE_IFELSE], +- [m4_ifdef([AC_PROVIDE_$1], +- [$2], [$3])])]) + ++# LT_PREREQ(VERSION) ++# ------------------ ++# Complain and exit if this libtool version is less that VERSION. ++m4_defun([LT_PREREQ], ++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, ++ [m4_default([$3], ++ [m4_fatal([Libtool version $1 or higher is required], ++ 63)])], ++ [$2])]) + +-# AC_PROG_LIBTOOL +-# --------------- +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [AC_LIBTOOL_CXX], +- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX +- ])]) +-dnl And a similar setup for Fortran 77 support +- AC_PROVIDE_IFELSE([AC_PROG_F77], +- [AC_LIBTOOL_F77], +- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +-])]) + +-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. +- AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [ifdef([AC_PROG_GCJ], +- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([A][M_PROG_GCJ], +- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([LT_AC_PROG_GCJ], +- [define([LT_AC_PROG_GCJ], +- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +-])])# AC_PROG_LIBTOOL ++# _LT_CHECK_BUILDDIR ++# ------------------ ++# Complain if the absolute build directory name contains unusual characters ++m4_defun([_LT_CHECK_BUILDDIR], ++[case `pwd` in ++ *\ * | *\ *) ++ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; ++esac ++]) + + +-# _AC_PROG_LIBTOOL +-# ---------------- +-AC_DEFUN([_AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl ++# LT_INIT([OPTIONS]) ++# ------------------ ++AC_DEFUN([LT_INIT], ++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++AC_BEFORE([$0], [LT_LANG])dnl ++AC_BEFORE([$0], [LT_OUTPUT])dnl ++AC_BEFORE([$0], [LTDL_INIT])dnl ++m4_require([_LT_CHECK_BUILDDIR])dnl ++ ++dnl Autoconf doesn't catch unexpanded LT_ macros by default: ++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl ++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl ++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 ++dnl unless we require an AC_DEFUNed macro: ++AC_REQUIRE([LTOPTIONS_VERSION])dnl ++AC_REQUIRE([LTSUGAR_VERSION])dnl ++AC_REQUIRE([LTVERSION_VERSION])dnl ++AC_REQUIRE([LTOBSOLETE_VERSION])dnl ++m4_require([_LT_PROG_LTMAIN])dnl ++ ++dnl Parse OPTIONS ++_LT_SET_OPTIONS([$0], [$1]) + + # This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' + AC_SUBST(LIBTOOL)dnl + +-# Prevent multiple expansion +-define([AC_PROG_LIBTOOL], []) +-])# _AC_PROG_LIBTOOL ++_LT_SETUP + ++# Only expand once: ++m4_define([LT_INIT]) ++])# LT_INIT + +-# AC_LIBTOOL_SETUP +-# ---------------- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl ++# Old names: ++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) ++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PROG_LIBTOOL], []) ++dnl AC_DEFUN([AM_PROG_LIBTOOL], []) ++ ++ ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++m4_defun([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) ++ ++ ++# _LT_FILEUTILS_DEFAULTS ++# ---------------------- ++# It is okay to use these file commands and assume they have been set ++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. ++m4_defun([_LT_FILEUTILS_DEFAULTS], ++[: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++])# _LT_FILEUTILS_DEFAULTS ++ ++ ++# _LT_SETUP ++# --------- ++m4_defun([_LT_SETUP], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++_LT_DECL([], [host_alias], [0], [The host system])dnl ++_LT_DECL([], [host], [0])dnl ++_LT_DECL([], [host_os], [0])dnl ++dnl ++_LT_DECL([], [build_alias], [0], [The build system])dnl ++_LT_DECL([], [build], [0])dnl ++_LT_DECL([], [build_os], [0])dnl ++dnl + AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +- ++AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++dnl + AC_REQUIRE([AC_PROG_LN_S])dnl +-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-AC_REQUIRE([AC_OBJEXT])dnl +-AC_REQUIRE([AC_EXEEXT])dnl ++test -z "$LN_S" && LN_S="ln -s" ++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl + dnl +-AC_LIBTOOL_SYS_MAX_CMD_LEN +-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-AC_LIBTOOL_OBJDIR ++AC_REQUIRE([LT_CMD_MAX_LEN])dnl ++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl ++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl ++dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_CMD_RELOAD])dnl ++m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CMD_OLD_ARCHIVE])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl + +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH ++_LT_CONFIG_LIBTOOL_INIT([ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++]) ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++_LT_CHECK_OBJDIR ++ ++m4_require([_LT_TAG_COMPILER])dnl ++_LT_PROG_ECHO_BACKSLASH + + case $host_os in + aix3*) +@@ -130,116 +216,653 @@ esac + + # Sed substitution that helps us do robust quoting. It backslashifies + # metacharacters that are still active within double-quoted strings. +-Xsed='sed -e 1s/^X//' +-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] ++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + + # Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] ++double_quote_subst='s/\([["`\\]]\)/\\\1/g' + + # Sed substitution to delay expansion of an escaped shell variable in a + # double_quote_subst'ed string. + delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ + # Sed substitution to avoid accidental globbing in evaled expressions + no_glob_subst='s/\*/\\\*/g' + +-# Constants: +-rm="rm -f" +- + # Global variables: +-default_ofile=libtool ++ofile=libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except MSVC, + # which needs '.lib'). + libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" +-with_gnu_ld="$lt_cv_prog_gnu_ld" + +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) ++with_gnu_ld="$lt_cv_prog_gnu_ld" + + old_CC="$CC" + old_CFLAGS="$CFLAGS" + + # Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as + test -z "$CC" && CC=cc + test -z "$LTCC" && LTCC=$CC + test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +-test -z "$DLLTOOL" && DLLTOOL=dlltool + test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: + test -z "$ac_objext" && ac_objext=o + +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= +- +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" +- ;; +- *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi +- + _LT_CC_BASENAME([$compiler]) + + # Only perform the check for file, if the check method requires it ++test -z "$MAGIC_CMD" && MAGIC_CMD=file + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC ++ _LT_PATH_MAGIC + fi + ;; + esac + +-_LT_REQUIRED_DARWIN_CHECKS ++# Use C for the default configuration in the libtool script ++LT_SUPPORTED_TAG([CC]) ++_LT_LANG_C_CONFIG ++_LT_LANG_DEFAULT_CONFIG ++_LT_CONFIG_COMMANDS ++])# _LT_SETUP + +-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-enable_win32_dll=yes, enable_win32_dll=no) + +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++# _LT_PROG_LTMAIN ++# --------------- ++# Note that this code is called both from `configure', and `config.status' ++# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, ++# `config.status' has no value for ac_aux_dir unless we are using Automake, ++# so we pass a copy along to make sure it has a sensible value anyway. ++m4_defun([_LT_PROG_LTMAIN], ++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl ++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) ++ltmain="$ac_aux_dir/ltmain.sh" ++])# _LT_PROG_LTMAIN + +-AC_ARG_WITH([pic], +- [AC_HELP_STRING([--with-pic], +- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], +- [pic_mode=default]) +-test -z "$pic_mode" && pic_mode=default + +-# Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP + ++# So that we can recreate a full libtool script including additional ++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS ++# in macros and then make a single call at the end using the `libtool' ++# label. + +-# _LT_AC_SYS_COMPILER ++ ++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) ++# ---------------------------------------- ++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL_INIT], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_INIT]) ++ ++ ++# _LT_CONFIG_LIBTOOL([COMMANDS]) ++# ------------------------------ ++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) ++ ++ ++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) ++# ----------------------------------------------------- ++m4_defun([_LT_CONFIG_SAVE_COMMANDS], ++[_LT_CONFIG_LIBTOOL([$1]) ++_LT_CONFIG_LIBTOOL_INIT([$2]) ++]) ++ ++ ++# _LT_FORMAT_COMMENT([COMMENT]) ++# ----------------------------- ++# Add leading comment marks to the start of each line, and a trailing ++# full-stop to the whole comment if one is not present already. ++m4_define([_LT_FORMAT_COMMENT], ++[m4_ifval([$1], [ ++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], ++ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) ++)]) ++ ++ ++ ++ ++ ++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) ++# ------------------------------------------------------------------- ++# CONFIGNAME is the name given to the value in the libtool script. ++# VARNAME is the (base) name used in the configure script. ++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on ++# VARNAME. Any other value will be used directly. ++m4_define([_LT_DECL], ++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], ++ [m4_ifval([$1], [$1], [$2])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) ++ m4_ifval([$4], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], ++ [tagged?], [m4_ifval([$5], [yes], [no])])]) ++]) ++ ++ ++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) ++# -------------------------------------------------------- ++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) ++ ++ ++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_tag_varnames], ++[_lt_decl_filter([tagged?], [yes], $@)]) ++ ++ ++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) ++# --------------------------------------------------------- ++m4_define([_lt_decl_filter], ++[m4_case([$#], ++ [0], [m4_fatal([$0: too few arguments: $#])], ++ [1], [m4_fatal([$0: too few arguments: $#: $1])], ++ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], ++ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], ++ [lt_dict_filter([lt_decl_dict], $@)])[]dnl ++]) ++ ++ ++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) ++# -------------------------------------------------- ++m4_define([lt_decl_quote_varnames], ++[_lt_decl_filter([value], [1], $@)]) ++ ++ ++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_dquote_varnames], ++[_lt_decl_filter([value], [2], $@)]) ++ ++ ++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_varnames_tagged], ++[m4_assert([$# <= 2])dnl ++_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), ++ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) ++m4_define([_lt_decl_varnames_tagged], ++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) ++ ++ ++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_all_varnames], ++[_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_if([$2], [], ++ m4_quote(lt_decl_varnames), ++ m4_quote(m4_shift($@))))[]dnl ++]) ++m4_define([_lt_decl_all_varnames], ++[lt_join($@, lt_decl_varnames_tagged([$1], ++ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl ++]) ++ ++ ++# _LT_CONFIG_STATUS_DECLARE([VARNAME]) ++# ------------------------------------ ++# Quote a variable value, and forward it to `config.status' so that its ++# declaration there will have the same value as in `configure'. VARNAME ++# must have a single quote delimited value for this to work. ++m4_define([_LT_CONFIG_STATUS_DECLARE], ++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) ++ ++ ++# _LT_CONFIG_STATUS_DECLARATIONS ++# ------------------------------ ++# We delimit libtool config variables with single quotes, so when ++# we write them to config.status, we have to be sure to quote all ++# embedded single quotes properly. In configure, this macro expands ++# each variable declared with _LT_DECL (and _LT_TAGDECL) into: ++# ++# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' ++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), ++ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAGS ++# ---------------- ++# Output comment and list of tags supported by the script ++m4_defun([_LT_LIBTOOL_TAGS], ++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl ++available_tags="_LT_TAGS"dnl ++]) ++ ++ ++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) ++# ----------------------------------- ++# Extract the dictionary values for VARNAME (optionally with TAG) and ++# expand to a commented shell variable setting: ++# ++# # Some comment about what VAR is for. ++# visible_name=$lt_internal_name ++m4_define([_LT_LIBTOOL_DECLARE], ++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], ++ [description])))[]dnl ++m4_pushdef([_libtool_name], ++ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl ++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), ++ [0], [_libtool_name=[$]$1], ++ [1], [_libtool_name=$lt_[]$1], ++ [2], [_libtool_name=$lt_[]$1], ++ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl ++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl ++]) ++ ++ ++# _LT_LIBTOOL_CONFIG_VARS ++# ----------------------- ++# Produce commented declarations of non-tagged libtool config variables ++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' ++# script. Tagged libtool config variables (even for the LIBTOOL CONFIG ++# section) are produced by _LT_LIBTOOL_TAG_VARS. ++m4_defun([_LT_LIBTOOL_CONFIG_VARS], ++[m4_foreach([_lt_var], ++ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAG_VARS(TAG) ++# ------------------------- ++m4_define([_LT_LIBTOOL_TAG_VARS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) ++ ++ ++# _LT_TAGVAR(VARNAME, [TAGNAME]) ++# ------------------------------ ++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) ++ ++ ++# _LT_CONFIG_COMMANDS + # ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], ++# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of ++# variables for single and double quote escaping we saved from calls ++# to _LT_DECL, we can put quote escaped variables declarations ++# into `config.status', and then the shell code to quote escape them in ++# for loops in `config.status'. Finally, any additional code accumulated ++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. ++m4_defun([_LT_CONFIG_COMMANDS], ++[AC_PROVIDE_IFELSE([LT_OUTPUT], ++ dnl If the libtool generation code has been placed in $CONFIG_LT, ++ dnl instead of duplicating it all over again into config.status, ++ dnl then we will have config.status run $CONFIG_LT later, so it ++ dnl needs to know what name is stored there: ++ [AC_CONFIG_COMMANDS([libtool], ++ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], ++ dnl If the libtool generation code is destined for config.status, ++ dnl expand the accumulated commands and init code now: ++ [AC_CONFIG_COMMANDS([libtool], ++ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) ++])#_LT_CONFIG_COMMANDS ++ ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], ++[ ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++_LT_CONFIG_STATUS_DECLARATIONS ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# Quote evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_quote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Double-quote double-evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_dquote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\[$]0 --fallback-echo"')dnl " ++ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ++ ;; ++esac ++ ++_LT_OUTPUT_LIBTOOL_INIT ++]) ++ ++ ++# LT_OUTPUT ++# --------- ++# This macro allows early generation of the libtool script (before ++# AC_OUTPUT is called), incase it is used in configure for compilation ++# tests. ++AC_DEFUN([LT_OUTPUT], ++[: ${CONFIG_LT=./config.lt} ++AC_MSG_NOTICE([creating $CONFIG_LT]) ++cat >"$CONFIG_LT" <<_LTEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate a libtool stub with the current configuration. ++ ++lt_cl_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AS_SHELL_SANITIZE ++_AS_PREPARE ++ ++exec AS_MESSAGE_FD>&1 ++exec AS_MESSAGE_LOG_FD>>config.log ++{ ++ echo ++ AS_BOX([Running $as_me.]) ++} >&AS_MESSAGE_LOG_FD ++ ++lt_cl_help="\ ++\`$as_me' creates a local libtool stub from the current configuration, ++for use in further configure time tests before the real libtool is ++generated. ++ ++Usage: $[0] [[OPTIONS]] ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ ++Report bugs to ." ++ ++lt_cl_version="\ ++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl ++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) ++configured by $[0], generated by m4_PACKAGE_STRING. ++ ++Copyright (C) 2008 Free Software Foundation, Inc. ++This config.lt script is free software; the Free Software Foundation ++gives unlimited permision to copy, distribute and modify it." ++ ++while test $[#] != 0 ++do ++ case $[1] in ++ --version | --v* | -V ) ++ echo "$lt_cl_version"; exit 0 ;; ++ --help | --h* | -h ) ++ echo "$lt_cl_help"; exit 0 ;; ++ --debug | --d* | -d ) ++ debug=: ;; ++ --quiet | --q* | --silent | --s* | -q ) ++ lt_cl_silent=: ;; ++ ++ -*) AC_MSG_ERROR([unrecognized option: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ ++ *) AC_MSG_ERROR([unrecognized argument: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ esac ++ shift ++done ++ ++if $lt_cl_silent; then ++ exec AS_MESSAGE_FD>/dev/null ++fi ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<_LTEOF ++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AC_MSG_NOTICE([creating $ofile]) ++_LT_OUTPUT_LIBTOOL_COMMANDS ++AS_EXIT(0) ++_LTEOF ++chmod +x "$CONFIG_LT" ++ ++# configure is writing to config.log, but config.lt does its own redirection, ++# appending to config.log, which fails on DOS, as config.log is still kept ++# open by configure. Here we exec the FD to /dev/null, effectively closing ++# config.log, so it can be properly (re)opened and appended to by config.lt. ++if test "$no_create" != yes; then ++ lt_cl_success=: ++ test "$silent" = yes && ++ lt_config_lt_args="$lt_config_lt_args --quiet" ++ exec AS_MESSAGE_LOG_FD>/dev/null ++ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++ exec AS_MESSAGE_LOG_FD>>config.log ++ $lt_cl_success || AS_EXIT(1) ++fi ++])# LT_OUTPUT ++ ++ ++# _LT_CONFIG(TAG) ++# --------------- ++# If TAG is the built-in tag, create an initial libtool script with a ++# default configuration from the untagged config vars. Otherwise add code ++# to config.status for appending the configuration named by TAG from the ++# matching tagged config vars. ++m4_defun([_LT_CONFIG], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_CONFIG_SAVE_COMMANDS([ ++ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl ++ m4_if(_LT_TAG, [C], [ ++ # See if we are running on zsh, and set the options which allow our ++ # commands through without removal of \ escapes. ++ if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" ++ ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL ++ ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++_LT_COPYING ++_LT_LIBTOOL_TAGS ++ ++# ### BEGIN LIBTOOL CONFIG ++_LT_LIBTOOL_CONFIG_VARS ++_LT_LIBTOOL_TAG_VARS ++# ### END LIBTOOL CONFIG ++ ++_LT_EOF ++ ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac ++ ++ _LT_PROG_LTMAIN ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ _LT_PROG_XSI_SHELLFNS ++ ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++], ++[cat <<_LT_EOF >> "$ofile" ++ ++dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded ++dnl in a comment (ie after a #). ++# ### BEGIN LIBTOOL TAG CONFIG: $1 ++_LT_LIBTOOL_TAG_VARS(_LT_TAG) ++# ### END LIBTOOL TAG CONFIG: $1 ++_LT_EOF ++])dnl /m4_if ++], ++[m4_if([$1], [], [ ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile'], []) ++])dnl /_LT_CONFIG_SAVE_COMMANDS ++])# _LT_CONFIG ++ ++ ++# LT_SUPPORTED_TAG(TAG) ++# --------------------- ++# Trace this macro to discover what tags are supported by the libtool ++# --tag option, using: ++# autoconf --trace 'LT_SUPPORTED_TAG:$1' ++AC_DEFUN([LT_SUPPORTED_TAG], []) ++ ++ ++# C support is built-in for now ++m4_define([_LT_LANG_C_enabled], []) ++m4_define([_LT_TAGS], []) ++ ++ ++# LT_LANG(LANG) ++# ------------- ++# Enable libtool support for the given language if not already enabled. ++AC_DEFUN([LT_LANG], ++[AC_BEFORE([$0], [LT_OUTPUT])dnl ++m4_case([$1], ++ [C], [_LT_LANG(C)], ++ [C++], [_LT_LANG(CXX)], ++ [Java], [_LT_LANG(GCJ)], ++ [Fortran 77], [_LT_LANG(F77)], ++ [Fortran], [_LT_LANG(FC)], ++ [Windows Resource], [_LT_LANG(RC)], ++ [m4_ifdef([_LT_LANG_]$1[_CONFIG], ++ [_LT_LANG($1)], ++ [m4_fatal([$0: unsupported language: "$1"])])])dnl ++])# LT_LANG ++ ++ ++# _LT_LANG(LANGNAME) ++# ------------------ ++m4_defun([_LT_LANG], ++[m4_ifdef([_LT_LANG_]$1[_enabled], [], ++ [LT_SUPPORTED_TAG([$1])dnl ++ m4_append([_LT_TAGS], [$1 ])dnl ++ m4_define([_LT_LANG_]$1[_enabled], [])dnl ++ _LT_LANG_$1_CONFIG($1)])dnl ++])# _LT_LANG ++ ++ ++# _LT_LANG_DEFAULT_CONFIG ++# ----------------------- ++m4_defun([_LT_LANG_DEFAULT_CONFIG], ++[AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [LT_LANG(CXX)], ++ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [LT_LANG(F77)], ++ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_FC], ++ [LT_LANG(FC)], ++ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) ++ ++dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal ++dnl pulling things in needlessly. ++AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([LT_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [m4_ifdef([AC_PROG_GCJ], ++ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([A][M_PROG_GCJ], ++ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([LT_PROG_GCJ], ++ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) ++ ++AC_PROVIDE_IFELSE([LT_PROG_RC], ++ [LT_LANG(RC)], ++ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) ++])# _LT_LANG_DEFAULT_CONFIG ++ ++# Obsolete macros: ++AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) ++AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) ++AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) ++AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_CXX], []) ++dnl AC_DEFUN([AC_LIBTOOL_F77], []) ++dnl AC_DEFUN([AC_LIBTOOL_FC], []) ++dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) ++ ++ ++# _LT_TAG_COMPILER ++# ---------------- ++m4_defun([_LT_TAG_COMPILER], + [AC_REQUIRE([AC_PROG_CC])dnl + ++_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl ++_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl ++_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl ++_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl ++ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + +@@ -248,36 +871,20 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + + # Allow CC to be a program name with arguments. + compiler=$CC +-])# _LT_AC_SYS_COMPILER +- +- +-# _LT_CC_BASENAME(CC) +-# ------------------- +-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +-AC_DEFUN([_LT_CC_BASENAME], +-[for cc_temp in $1""; do +- case $cc_temp in +- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; +- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-]) ++])# _LT_TAG_COMPILER + + + # _LT_COMPILER_BOILERPLATE + # ------------------------ + # Check for compiler boilerplate output or warnings with + # the simple compiler test code. +-AC_DEFUN([_LT_COMPILER_BOILERPLATE], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl ++m4_defun([_LT_COMPILER_BOILERPLATE], ++[m4_require([_LT_DECL_SED])dnl + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` +-$rm conftest* ++$RM conftest* + ])# _LT_COMPILER_BOILERPLATE + + +@@ -285,39 +892,57 @@ $rm conftest* + # ---------------------- + # Check for linker boilerplate output or warnings with + # the simple link test code. +-AC_DEFUN([_LT_LINKER_BOILERPLATE], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl ++m4_defun([_LT_LINKER_BOILERPLATE], ++[m4_require([_LT_DECL_SED])dnl + ac_outfile=conftest.$ac_objext + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm -r conftest* ++$RM -r conftest* + ])# _LT_LINKER_BOILERPLATE + + # _LT_REQUIRED_DARWIN_CHECKS +-# -------------------------- +-# Check for some things on darwin +-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ ++# ------------------------- ++m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ AC_CHECK_TOOL([LIPO], [lipo], [:]) ++ AC_CHECK_TOOL([OTOOL], [otool], [:]) ++ AC_CHECK_TOOL([OTOOL64], [otool64], [:]) ++ _LT_DECL([], [DSYMUTIL], [1], ++ [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) ++ _LT_DECL([], [NMEDIT], [1], ++ [Tool to change global to local symbols on Mac OS X]) ++ _LT_DECL([], [LIPO], [1], ++ [Tool to manipulate fat objects and archives on Mac OS X]) ++ _LT_DECL([], [OTOOL], [1], ++ [ldd/readelf like tool for Mach-O binaries on Mac OS X]) ++ _LT_DECL([], [OTOOL64], [1], ++ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then +- # By default we will add the -single_module flag. You can override +- # by either setting the environment variable LT_MULTI_MODULE +- # non-empty at configure time, or by adding -multi_module to the +- # link flags. +- echo "int foo(void){return 1;}" > conftest.c +- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +- -dynamiclib ${wl}-single_module conftest.c +- if test -f libconftest.dylib; then +- lt_cv_apple_cc_single_mod=yes +- rm -rf libconftest.dylib* +- fi +- rm conftest.c ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ rm -rf libconftest.dylib* ++ echo "int foo(void){return 1;}" > conftest.c ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++ _lt_result=$? ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ lt_cv_apple_cc_single_mod=yes ++ else ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ fi ++ rm -rf libconftest.dylib* ++ rm -f conftest.* + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], +@@ -326,26 +951,26 @@ AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], +- [lt_cv_ld_exported_symbols_list=yes], +- [lt_cv_ld_exported_symbols_list=no]) +- LDFLAGS="$save_LDFLAGS" ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in +- rhapsody* | darwin1.[[0123]]) ++ rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- darwin*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- 10.[[012]]*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- 10.*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac +@@ -355,10 +980,10 @@ AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else +- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":"; then +- _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi +@@ -366,16 +991,51 @@ AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + esac + ]) + +-# _LT_AC_SYS_LIBPATH_AIX +-# ---------------------- ++ ++# _LT_DARWIN_LINKER_FEATURES ++# -------------------------- ++# Checks for linker and compiler features on darwin ++m4_defun([_LT_DARWIN_LINKER_FEATURES], ++[ ++ m4_require([_LT_REQUIRED_DARWIN_CHECKS]) ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=echo ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ m4_if([$1], [CXX], ++[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi ++],[]) ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++]) ++ ++# _LT_SYS_MODULE_PATH_AIX ++# ----------------------- + # Links a minimal program and checks the executable + # for the system default hardcoded library path. In most cases, + # this is /usr/lib:/lib, but when the MPI compilers are used + # the location of the communication and MPI libs are included too. + # If we don't find anything, use the default library path according + # to the aix ld manual. +-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl ++m4_defun([_LT_SYS_MODULE_PATH_AIX], ++[m4_require([_LT_DECL_SED])dnl + AC_LINK_IFELSE(AC_LANG_PROGRAM,[ + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -390,45 +1050,45 @@ if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +-])# _LT_AC_SYS_LIBPATH_AIX ++])# _LT_SYS_MODULE_PATH_AIX + + +-# _LT_AC_SHELL_INIT(ARG) +-# ---------------------- +-AC_DEFUN([_LT_AC_SHELL_INIT], ++# _LT_SHELL_INIT(ARG) ++# ------------------- ++m4_define([_LT_SHELL_INIT], + [ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) + $1 + AC_DIVERT_POP +-])# _LT_AC_SHELL_INIT ++])# _LT_SHELL_INIT + + +-# _LT_AC_PROG_ECHO_BACKSLASH +-# -------------------------- ++# _LT_PROG_ECHO_BACKSLASH ++# ----------------------- + # Add some code to the start of the generated configure script which + # will find an echo command which doesn't interpret backslashes. +-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +-[_LT_AC_SHELL_INIT([ ++m4_defun([_LT_PROG_ECHO_BACKSLASH], ++[_LT_SHELL_INIT([ + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +-case X$ECHO in ++case X$lt_ECHO in + X*--fallback-echo) + # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; + esac + +-echo=${ECHO-echo} ++ECHO=${lt_ECHO-echo} + if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $ECHO works! + : + else + # Restart under the correct shell. +@@ -438,9 +1098,9 @@ fi + if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift +- cat </dev/null 2>&1 && unset CDPATH + +-if test -z "$ECHO"; then +-if test "X${echo_test_string+set}" != Xset; then +-# find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if (echo_test_string=`eval $cmd`) 2>/dev/null && +- echo_test_string=`eval $cmd` && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break +- fi +- done +-fi ++if test -z "$lt_ECHO"; then ++ if test "X${echo_test_string+set}" != Xset; then ++ # find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++ then ++ break ++ fi ++ done ++ fi + +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +-else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++ else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. + +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$dir/echo" ++ break ++ fi ++ done + IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" + +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ if test "X$ECHO" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ ECHO='print -r' ++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} + else +- # maybe with a smaller string... +- prev=: ++ # Try using printf. ++ ECHO='printf %s\n' ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: + +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done + +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} +- else +- # Oops. We lost completely, so just stick with echo. +- echo=echo +- fi ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ ECHO=echo ++ fi ++ fi + fi + fi + fi + fi +-fi + + # Copy echo and quote the copy suitably for passing to libtool from + # the Makefile, instead of quoting the original, which is used later. +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++lt_ECHO=$ECHO ++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" + fi + +-AC_SUBST(ECHO) +-])])# _LT_AC_PROG_ECHO_BACKSLASH ++AC_SUBST(lt_ECHO) ++]) ++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) ++_LT_DECL([], [ECHO], [1], ++ [An echo program that does not interpret backslashes]) ++])# _LT_PROG_ECHO_BACKSLASH + + +-# _LT_AC_LOCK +-# ----------- +-AC_DEFUN([_LT_AC_LOCK], ++# _LT_ENABLE_LOCK ++# --------------- ++m4_defun([_LT_ENABLE_LOCK], + [AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) ++ [AS_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) + test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + # Some flags need to be propagated to the compiler or linker for good +@@ -576,12 +1239,12 @@ ia64-*-hpux*) + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; + esac + fi + rm -rf conftest* +@@ -590,80 +1253,79 @@ ia64-*-hpux*) + # Find out which ABI we are using. + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi + fi + rm -rf conftest* + ;; + + x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +-s390*-*linux*|sparc*-*linux*) ++s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in +- *32-bit*) +- case $host in +- x86_64-*kfreebsd*-gnu) +- LD="${LD-ld} -m elf_i386_fbsd" +- ;; +- x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *64-bit*) +- libsuff=64 +- case $host in +- x86_64-*kfreebsd*-gnu) +- LD="${LD-ld} -m elf_x86_64_fbsd" +- ;; +- x86_64-*linux*) +- LD="${LD-ld} -m elf_x86_64" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*|s390*-*tpf*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; + esac + fi + rm -rf conftest* +@@ -675,7 +1337,7 @@ s390*-*linux*|sparc*-*linux*) + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) +- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +@@ -691,7 +1353,7 @@ sparc*-*solaris*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; +@@ -701,30 +1363,63 @@ sparc*-*solaris*) + fi + rm -rf conftest* + ;; +- +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) +- ;; +- ]) + esac + + need_locks="$enable_libtool_lock" ++])# _LT_ENABLE_LOCK + +-])# _LT_AC_LOCK + ++# _LT_CMD_OLD_ARCHIVE ++# ------------------- ++m4_defun([_LT_CMD_OLD_ARCHIVE], ++[AC_CHECK_TOOL(AR, ar, false) ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1]) + +-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++AC_CHECK_TOOL(STRIP, strip, :) ++test -z "$STRIP" && STRIP=: ++_LT_DECL([], [STRIP], [1], [A symbol stripping program]) ++ ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++test -z "$RANLIB" && RANLIB=: ++_LT_DECL([], [RANLIB], [1], ++ [Commands used to install an old-style archive]) ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++_LT_DECL([], [old_postinstall_cmds], [2]) ++_LT_DECL([], [old_postuninstall_cmds], [2]) ++_LT_TAGDECL([], [old_archive_cmds], [2], ++ [Commands used to build an old-style archive]) ++])# _LT_CMD_OLD_ARCHIVE ++ ++ ++# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, + # [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) + # ---------------------------------------------------------------- + # Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED]) ++AC_DEFUN([_LT_COMPILER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl + AC_CACHE_CHECK([$1], [$2], + [$2=no +- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -744,29 +1439,35 @@ AC_CACHE_CHECK([$1], [$2], + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi +- $rm conftest* ++ $RM conftest* + ]) + + if test x"[$]$2" = xyes; then +- ifelse([$5], , :, [$5]) ++ m4_if([$5], , :, [$5]) + else +- ifelse([$6], , :, [$6]) ++ m4_if([$6], , :, [$6]) + fi +-])# AC_LIBTOOL_COMPILER_OPTION ++])# _LT_COMPILER_OPTION + ++# Old name: ++AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + +-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ------------------------------------------------------------ +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl ++ ++# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------- ++# Check whether the given linker option works ++AC_DEFUN([_LT_LINKER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl + AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" +@@ -778,7 +1479,7 @@ AC_CACHE_CHECK([$1], [$2], + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes +@@ -787,22 +1488,28 @@ AC_CACHE_CHECK([$1], [$2], + $2=yes + fi + fi +- $rm -r conftest* ++ $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + ]) + + if test x"[$]$2" = xyes; then +- ifelse([$4], , :, [$4]) ++ m4_if([$4], , :, [$4]) + else +- ifelse([$5], , :, [$5]) ++ m4_if([$5], , :, [$5]) + fi +-])# AC_LIBTOOL_LINKER_OPTION ++])# _LT_LINKER_OPTION + ++# Old name: ++AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + +-# AC_LIBTOOL_SYS_MAX_CMD_LEN +-# -------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +-[# find the maximum length of command line arguments ++ ++# LT_CMD_MAX_LEN ++#--------------- ++AC_DEFUN([LT_CMD_MAX_LEN], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++# find the maximum length of command line arguments + AC_MSG_CHECKING([the maximum length of command line arguments]) + AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 +@@ -824,7 +1531,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d + lt_cv_sys_max_cmd_len=-1; + ;; + +- cygwin* | mingw*) ++ cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, +@@ -879,7 +1586,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi +@@ -890,20 +1597,28 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ +- = "XX$teststring") >/dev/null 2>&1 && +- new_result=`expr "X$teststring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && ++ # If test is not a shell built-in, we'll probably end up computing a ++ # maximum length that is only half of the actual maximum length, but ++ # we can't tell. ++ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++ = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. ++ # Add a significant safety factor because C++ compilers can tack on ++ # massive amounts of additional arguments before passing them to the ++ # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; +@@ -914,27 +1629,35 @@ if test -n $lt_cv_sys_max_cmd_len ; then + else + AC_MSG_RESULT(none) + fi +-])# AC_LIBTOOL_SYS_MAX_CMD_LEN ++max_cmd_len=$lt_cv_sys_max_cmd_len ++_LT_DECL([], [max_cmd_len], [0], ++ [What is the maximum length of a command?]) ++])# LT_CMD_MAX_LEN ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + + +-# _LT_AC_CHECK_DLFCN +-# ------------------ +-AC_DEFUN([_LT_AC_CHECK_DLFCN], +-[AC_CHECK_HEADERS(dlfcn.h)dnl +-])# _LT_AC_CHECK_DLFCN ++# _LT_HEADER_DLFCN ++# ---------------- ++m4_defun([_LT_HEADER_DLFCN], ++[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl ++])# _LT_HEADER_DLFCN + + +-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# --------------------------------------------------------------------- +-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# ---------------------------------------------------------------- ++m4_defun([_LT_TRY_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl + if test "$cross_compiling" = yes; then : + [$4] + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF + [#line __oline__ "configure" + #include "confdefs.h" + +@@ -976,10 +1699,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -995,9 +1714,9 @@ int main () + else + puts (dlerror ()); + +- exit (status); ++ return status; + }] +-EOF ++_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? +@@ -1012,13 +1731,13 @@ EOF + fi + fi + rm -fr conftest* +-])# _LT_AC_TRY_DLOPEN_SELF ++])# _LT_TRY_DLOPEN_SELF + + +-# AC_LIBTOOL_DLOPEN_SELF +-# ---------------------- +-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++# LT_SYS_DLOPEN_SELF ++# ------------------ ++AC_DEFUN([LT_SYS_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown +@@ -1034,15 +1753,15 @@ else + lt_cv_dlopen_self=yes + ;; + +- mingw* | pw32*) ++ mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= +- ;; ++ ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= +- ;; ++ ;; + + darwin*) + # if libdl is installed we need to link against it +@@ -1052,7 +1771,7 @@ else + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) +- ;; ++ ;; + + *) + AC_CHECK_FUNC([shl_load], +@@ -1094,7 +1813,7 @@ else + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl +- _LT_AC_TRY_DLOPEN_SELF( ++ _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) +@@ -1102,8 +1821,8 @@ else + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], +- lt_cv_dlopen_self_static, [dnl +- _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static, [dnl ++ _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) +@@ -1125,19 +1844,32 @@ else + *) enable_dlopen_self_static=unknown ;; + esac + fi +-])# AC_LIBTOOL_DLOPEN_SELF ++_LT_DECL([dlopen_support], [enable_dlopen], [0], ++ [Whether dlopen is supported]) ++_LT_DECL([dlopen_self], [enable_dlopen_self], [0], ++ [Whether dlopen of programs is supported]) ++_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], ++ [Whether dlopen of statically linked programs is supported]) ++])# LT_SYS_DLOPEN_SELF + ++# Old name: ++AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + +-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +-# --------------------------------- +-# Check to see if options -c and -o are simultaneously supported by compiler +-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++ ++# _LT_COMPILER_C_O([TAGNAME]) ++# --------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler. ++# This macro does not hard code the compiler like AC_PROG_CC_C_O. ++m4_defun([_LT_COMPILER_C_O], ++[m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_TAG_COMPILER])dnl + AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no +- $rm -r conftest 2>/dev/null ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out +@@ -1161,37 +1893,41 @@ AC_CACHE_CHECK([if $compiler supports -c + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD +- $rm conftest* ++ $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out + cd .. +- rmdir conftest +- $rm conftest* ++ $RM -r conftest ++ $RM conftest* + ]) +-])# AC_LIBTOOL_PROG_CC_C_O ++_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], ++ [Does compiler simultaneously support -c and -o options?]) ++])# _LT_COMPILER_C_O + + +-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +-# ----------------------------------------- ++# _LT_COMPILER_FILE_LOCKS([TAGNAME]) ++# ---------------------------------- + # Check to see if we can do hard links to lock some files if needed +-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +-[AC_REQUIRE([_LT_AC_LOCK])dnl ++m4_defun([_LT_COMPILER_FILE_LOCKS], ++[m4_require([_LT_ENABLE_LOCK])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_COMPILER_C_O([$1]) + + hard_links="nottested" +-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes +- $rm conftest* ++ $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no +@@ -1204,12 +1940,13 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compi + else + need_locks=no + fi +-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS ++_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) ++])# _LT_COMPILER_FILE_LOCKS + + +-# AC_LIBTOOL_OBJDIR +-# ----------------- +-AC_DEFUN([AC_LIBTOOL_OBJDIR], ++# _LT_CHECK_OBJDIR ++# ---------------- ++m4_defun([_LT_CHECK_OBJDIR], + [AC_CACHE_CHECK([for objdir], [lt_cv_objdir], + [rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null +@@ -1221,40 +1958,46 @@ else + fi + rmdir .libs 2>/dev/null]) + objdir=$lt_cv_objdir +-])# AC_LIBTOOL_OBJDIR ++_LT_DECL([], [objdir], [0], ++ [The name of the directory that contains temporary libtool files])dnl ++m4_pattern_allow([LT_OBJDIR])dnl ++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", ++ [Define to the sub-directory in which libtool stores uninstalled libraries.]) ++])# _LT_CHECK_OBJDIR + + +-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +-# ---------------------------------------------- ++# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) ++# -------------------------------------- + # Check hardcoding attributes. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++m4_defun([_LT_LINKER_HARDCODE_LIBPATH], + [AC_MSG_CHECKING([how to hardcode library paths into programs]) +-_LT_AC_TAGVAR(hardcode_action, $1)= +-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++_LT_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || ++ test -n "$_LT_TAGVAR(runpath_var, $1)" || ++ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + +- # We can hardcode non-existant directories. +- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++ # We can hardcode non-existent directories. ++ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. +- _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++ _LT_TAGVAR(hardcode_action, $1)=immediate + fi + else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. +- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported ++ _LT_TAGVAR(hardcode_action, $1)=unsupported + fi +-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) ++AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then ++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || ++ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then + # Fast installation is not supported + enable_fast_install=no + elif test "$shlibpath_overrides_runpath" = yes || +@@ -1262,73 +2005,70 @@ elif test "$shlibpath_overrides_runpath" + # Fast installation is not necessary + enable_fast_install=needless + fi +-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH ++_LT_TAGDECL([], [hardcode_action], [0], ++ [How to hardcode a shared library path into an executable]) ++])# _LT_LINKER_HARDCODE_LIBPATH + + +-# AC_LIBTOOL_SYS_LIB_STRIP +-# ------------------------ +-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +-[striplib= ++# _LT_CMD_STRIPLIB ++# ---------------- ++m4_defun([_LT_CMD_STRIPLIB], ++[m4_require([_LT_DECL_EGREP]) ++striplib= + old_striplib= + AC_MSG_CHECKING([whether stripping libraries is possible]) +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- old_striplib="$STRIP -S" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +-fi +- ;; +- *) +- AC_MSG_RESULT([no]) ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) + ;; + esac + fi +-])# AC_LIBTOOL_SYS_LIB_STRIP ++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) ++_LT_DECL([], [striplib], [1]) ++])# _LT_CMD_STRIPLIB + + +-# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++# _LT_SYS_DYNAMIC_LINKER([TAG]) + # ----------------------------- + # PORTME Fill in your ld.so characteristics +-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl ++m4_defun([_LT_SYS_DYNAMIC_LINKER], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_OBJDUMP])dnl ++m4_require([_LT_DECL_SED])dnl + AC_MSG_CHECKING([dynamic linker characteristics]) +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-m4_if($1,[],[ ++m4_if([$1], ++ [], [ + if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then ++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. +- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else +- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. +@@ -1342,7 +2082,7 @@ if test "$GCC" = yes; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done +- lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' ++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; +@@ -1362,10 +2102,23 @@ BEGIN {RS=" "; FS="/|\n";} { + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } + }'` +- sys_lib_search_path_spec=`echo $lt_search_path_spec` ++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + fi]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -1402,7 +2155,7 @@ aix[[4-9]]*) + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no +@@ -1428,9 +2181,18 @@ aix[[4-9]]*) + ;; + + amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac + ;; + + beos*) +@@ -1453,25 +2215,28 @@ bsdi[[45]]*) + # libtool to hard-code these into programs + ;; + +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname' ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ +- $rm \$dlpath' ++ $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in +@@ -1480,20 +2245,20 @@ cygwin* | mingw* | pw32*) + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- mingw*) ++ mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) +@@ -1517,13 +2282,13 @@ darwin* | rhapsody*) + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- m4_if([$1], [],[ +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) ++m4_if([$1], [],[ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -1551,7 +2316,14 @@ freebsd* | dragonfly*) + *) objformat=elf ;; + esac + fi +- version_type=freebsd-$objformat ++ # Handle Gentoo/FreeBSD as it was Linux ++ case $host_vendor in ++ gentoo) ++ version_type=linux ;; ++ *) ++ version_type=freebsd-$objformat ;; ++ esac ++ + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +@@ -1562,6 +2334,12 @@ freebsd* | dragonfly*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; ++ linux) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ need_lib_prefix=no ++ need_version=no ++ ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in +@@ -1616,18 +2394,18 @@ hpux9* | hpux10* | hpux11*) + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH +@@ -1704,17 +2482,26 @@ linux* | k*bsd*-gnu) + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no ++ # Some binutils ld are patched to set DT_RUNPATH ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ ++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], ++ [shlibpath_overrides_runpath=yes])]) ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -1730,7 +2517,7 @@ netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' +@@ -1751,14 +2538,16 @@ newsos6) + shlibpath_overrides_runpath=yes + ;; + +-nto-qnx*) +- version_type=linux ++*nto* | *qnx*) ++ version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' + ;; + + openbsd*) +@@ -1767,13 +2556,13 @@ openbsd*) + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no +@@ -1845,7 +2634,6 @@ sysv4 | sysv4.3*) + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) +@@ -1876,13 +2664,12 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +@@ -1892,6 +2679,17 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -1906,288 +2704,58 @@ esac + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no + +-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +- + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi +-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER +- +- +-# _LT_AC_TAGCONFIG +-# ---------------- +-AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_ARG_WITH([tags], +- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], +- [include additional configurations @<:@automatic@:>@])], +- [tagnames="$withval"]) +- +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- AC_MSG_WARN([output file `$ofile' does not exist]) +- fi +- +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) +- else +- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) +- fi +- fi +- if test -z "$LTCFLAGS"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" +- fi +- +- # Extract list of available tagged configurations in $ofile. +- # Note that this assumes the entire list is on one line. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` +- +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in +- "") ;; +- *) AC_MSG_ERROR([invalid tag name: $tagname]) +- ;; +- esac +- +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- AC_MSG_ERROR([tag name \"$tagname\" already exists]) +- fi +- +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile +- +- case $tagname in +- CXX) +- if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_LIBTOOL_LANG_CXX_CONFIG +- else +- tagname="" +- fi +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- AC_LIBTOOL_LANG_F77_CONFIG +- else +- tagname="" +- fi +- ;; +- +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- AC_LIBTOOL_LANG_GCJ_CONFIG +- else +- tagname="" +- fi +- ;; +- +- RC) +- AC_LIBTOOL_LANG_RC_CONFIG +- ;; +- +- *) +- AC_MSG_ERROR([Unsupported tag name: $tagname]) +- ;; +- esac + +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi +- fi +- done +- IFS="$lt_save_ifs" +- +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" +- else +- rm -f "${ofile}T" +- AC_MSG_ERROR([unable to update list of available tagged configurations.]) +- fi ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + fi +-])# _LT_AC_TAGCONFIG +- +- +-# AC_LIBTOOL_DLOPEN +-# ----------------- +-# enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], +- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_DLOPEN +- +- +-# AC_LIBTOOL_WIN32_DLL +-# -------------------- +-# declare package support for building win32 DLLs +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_WIN32_DLL +- +- +-# AC_ENABLE_SHARED([DEFAULT]) +-# --------------------------- +-# implement the --enable-shared flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_SHARED], +-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([shared], +- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], +- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +-])# AC_ENABLE_SHARED +- +- +-# AC_DISABLE_SHARED +-# ----------------- +-# set the default shared flag to --disable-shared +-AC_DEFUN([AC_DISABLE_SHARED], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no) +-])# AC_DISABLE_SHARED +- +- +-# AC_ENABLE_STATIC([DEFAULT]) +-# --------------------------- +-# implement the --enable-static flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_STATIC], +-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([static], +- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], +- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_static=yes ;; +- no) enable_static=no ;; +- *) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_static=]AC_ENABLE_STATIC_DEFAULT) +-])# AC_ENABLE_STATIC +- +- +-# AC_DISABLE_STATIC +-# ----------------- +-# set the default static flag to --disable-static +-AC_DEFUN([AC_DISABLE_STATIC], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no) +-])# AC_DISABLE_STATIC +- +- +-# AC_ENABLE_FAST_INSTALL([DEFAULT]) +-# --------------------------------- +-# implement the --enable-fast-install flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_FAST_INSTALL], +-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([fast-install], +- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], +- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +-])# AC_ENABLE_FAST_INSTALL +- + +-# AC_DISABLE_FAST_INSTALL +-# ----------------------- +-# set the default to --disable-fast-install +-AC_DEFUN([AC_DISABLE_FAST_INSTALL], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no) +-])# AC_DISABLE_FAST_INSTALL ++_LT_DECL([], [variables_saved_for_relink], [1], ++ [Variables whose values should be saved in libtool wrapper scripts and ++ restored at link time]) ++_LT_DECL([], [need_lib_prefix], [0], ++ [Do we need the "lib" prefix for modules?]) ++_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) ++_LT_DECL([], [version_type], [0], [Library versioning type]) ++_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) ++_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) ++_LT_DECL([], [shlibpath_overrides_runpath], [0], ++ [Is shlibpath searched before the hard-coded library search path?]) ++_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) ++_LT_DECL([], [library_names_spec], [1], ++ [[List of archive names. First name is the real one, the rest are links. ++ The last name is the one that the linker finds with -lNAME]]) ++_LT_DECL([], [soname_spec], [1], ++ [[The coded name of the library, if different from the real name]]) ++_LT_DECL([], [postinstall_cmds], [2], ++ [Command to use after installation of a shared archive]) ++_LT_DECL([], [postuninstall_cmds], [2], ++ [Command to use after uninstallation of a shared archive]) ++_LT_DECL([], [finish_cmds], [2], ++ [Commands used to finish a libtool library installation in a directory]) ++_LT_DECL([], [finish_eval], [1], ++ [[As "finish_cmds", except a single script fragment to be evaled but ++ not shown]]) ++_LT_DECL([], [hardcode_into_libs], [0], ++ [Whether we should hardcode library paths into libraries]) ++_LT_DECL([], [sys_lib_search_path_spec], [2], ++ [Compile-time system search path for libraries]) ++_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], ++ [Run-time system search path for libraries]) ++])# _LT_SYS_DYNAMIC_LINKER + + +-# AC_LIBTOOL_PICMODE([MODE]) ++# _LT_PATH_TOOL_PREFIX(TOOL) + # -------------------------- +-# implement the --with-pic flag +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +-AC_DEFUN([AC_LIBTOOL_PICMODE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-pic_mode=ifelse($#,1,$1,default) +-])# AC_LIBTOOL_PICMODE +- +- +-# AC_PROG_EGREP +-# ------------- +-# This is predefined starting with Autoconf 2.54, so this conditional +-# definition can be removed once we require Autoconf 2.54 or later. +-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], +- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi]) +- EGREP=$ac_cv_prog_egrep +- AC_SUBST([EGREP]) +-])]) +- +- +-# AC_PATH_TOOL_PREFIX +-# ------------------- + # find a file program which can recognize shared library +-AC_DEFUN([AC_PATH_TOOL_PREFIX], +-[AC_REQUIRE([AC_PROG_EGREP])dnl ++AC_DEFUN([_LT_PATH_TOOL_PREFIX], ++[m4_require([_LT_DECL_EGREP])dnl + AC_MSG_CHECKING([for $1]) + AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, + [case $MAGIC_CMD in +@@ -2200,7 +2768,7 @@ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, + dnl $ac_dummy forces splitting on constant user-supplied paths. + dnl POSIX.2 word splitting is done only on the output of word expansions, + dnl not every word. This closes a longstanding sh security hole. +- ac_dummy="ifelse([$2], , $PATH, [$2])" ++ ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. +@@ -2215,7 +2783,7 @@ dnl not every word. This closes a longs + $EGREP "$file_magic_regex" > /dev/null; then + : + else +- cat <&2 ++ cat <<_LT_EOF 1>&2 + + *** Warning: the command libtool uses to detect shared libraries, + *** $file_magic_cmd, produces output that libtool cannot recognize. +@@ -2226,7 +2794,7 @@ dnl not every word. This closes a longs + *** may want to report the problem to your system manager and/or to + *** bug-libtool@gnu.org + +-EOF ++_LT_EOF + fi ;; + esac + fi +@@ -2243,37 +2811,47 @@ if test -n "$MAGIC_CMD"; then + else + AC_MSG_RESULT(no) + fi +-])# AC_PATH_TOOL_PREFIX ++_LT_DECL([], [MAGIC_CMD], [0], ++ [Used to examine libraries when file_magic_cmd begins with "file"])dnl ++])# _LT_PATH_TOOL_PREFIX + ++# Old name: ++AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + +-# AC_PATH_MAGIC +-# ------------- ++ ++# _LT_PATH_MAGIC ++# -------------- + # find a file program which can recognize a shared library +-AC_DEFUN([AC_PATH_MAGIC], +-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++m4_defun([_LT_PATH_MAGIC], ++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi + fi +-])# AC_PATH_MAGIC ++])# _LT_PATH_MAGIC + + +-# AC_PROG_LD ++# LT_PATH_LD + # ---------- + # find the pathname to the GNU or non-GNU linker +-AC_DEFUN([AC_PROG_LD], +-[AC_ARG_WITH([gnu-ld], +- [AC_HELP_STRING([--with-gnu-ld], +- [assume the C compiler uses GNU ld @<:@default=no@:>@])], +- [test "$withval" = no || with_gnu_ld=yes], +- [with_gnu_ld=no]) +-AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([AC_PROG_CC])dnl ++AC_DEFUN([LT_PATH_LD], ++[AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_DECL_EGREP])dnl ++ ++AC_ARG_WITH([gnu-ld], ++ [AS_HELP_STRING([--with-gnu-ld], ++ [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++ [test "$withval" = no || with_gnu_ld=yes], ++ [with_gnu_ld=no])dnl ++ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +@@ -2290,9 +2868,9 @@ if test "$GCC" = yes; then + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; +@@ -2342,15 +2920,24 @@ else + AC_MSG_RESULT(no) + fi + test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +-AC_PROG_LD_GNU +-])# AC_PROG_LD ++_LT_PATH_LD_GNU ++AC_SUBST([LD]) + ++_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) ++])# LT_PATH_LD + +-# AC_PROG_LD_GNU +-# -------------- +-AC_DEFUN([AC_PROG_LD_GNU], +-[AC_REQUIRE([AC_PROG_EGREP])dnl +-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, ++# Old names: ++AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) ++AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_PROG_LD], []) ++dnl AC_DEFUN([AC_PROG_LD], []) ++ ++ ++# _LT_PATH_LD_GNU ++#- -------------- ++m4_defun([_LT_PATH_LD_GNU], ++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, + [# I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &1 /dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. +@@ -2508,7 +3105,7 @@ linux* | k*bsd*-gnu) + ;; + + netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' +@@ -2521,12 +3118,12 @@ newos6*) + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown ++*nto* | *qnx*) ++ lt_cv_deplibs_check_method=pass_all + ;; + + openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' +@@ -2545,6 +3142,10 @@ solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ + sysv4 | sysv4.3*) + case $host_vendor in + motorola) +@@ -2572,7 +3173,7 @@ sysv4 | sysv4.3*) + esac + ;; + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++tpf*) + lt_cv_deplibs_check_method=pass_all + ;; + esac +@@ -2580,14 +3181,20 @@ esac + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +-])# AC_DEPLIBS_CHECK_METHOD + ++_LT_DECL([], [deplibs_check_method], [1], ++ [Method to check whether dependent libraries are shared objects]) ++_LT_DECL([], [file_magic_cmd], [1], ++ [Command to use when deplibs_check_method == "file_magic"]) ++])# _LT_CHECK_MAGIC_METHOD + +-# AC_PROG_NM ++ ++# LT_PATH_NM + # ---------- +-# find the pathname to a BSD-compatible name lister +-AC_DEFUN([AC_PROG_NM], +-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, ++# find the pathname to a BSD- or MS-compatible name lister ++AC_DEFUN([LT_PATH_NM], ++[AC_REQUIRE([AC_PROG_CC])dnl ++AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, + [if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +@@ -2629,16 +3236,51 @@ else + done + IFS="$lt_save_ifs" + done +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++ : ${lt_cv_path_NM=no} + fi]) +-NM="$lt_cv_path_NM" +-])# AC_PROG_NM ++if test "$lt_cv_path_NM" != "no"; then ++ NM="$lt_cv_path_NM" ++else ++ # Didn't find any BSD compatible name lister, look for dumpbin. ++ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) ++ AC_SUBST([DUMPBIN]) ++ if test "$DUMPBIN" != ":"; then ++ NM="$DUMPBIN" ++ fi ++fi ++test -z "$NM" && NM=nm ++AC_SUBST([NM]) ++_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + ++AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], ++ [lt_cv_nm_interface="BSD nm" ++ echo "int some_variable = 0;" > conftest.$ac_ext ++ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$ac_compile" 2>conftest.err) ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) ++ cat conftest.out >&AS_MESSAGE_LOG_FD ++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++ lt_cv_nm_interface="MS dumpbin" ++ fi ++ rm -f conftest*]) ++])# LT_PATH_NM + +-# AC_CHECK_LIBM +-# ------------- ++# Old names: ++AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) ++AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_PROG_NM], []) ++dnl AC_DEFUN([AC_PROG_NM], []) ++ ++ ++# LT_LIB_M ++# -------- + # check for math library +-AC_DEFUN([AC_CHECK_LIBM], ++AC_DEFUN([LT_LIB_M], + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + LIBM= + case $host in +@@ -2653,2155 +3295,46 @@ case $host in + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; + esac +-])# AC_CHECK_LIBM +- +- +-# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl convenience library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-convenience to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +-# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +-# (note the single quotes!). If your package is not flat and you're not +-# using automake, define top_builddir and top_srcdir appropriately in +-# the Makefiles. +-AC_DEFUN([AC_LIBLTDL_CONVENIENCE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- case $enable_ltdl_convenience in +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_CONVENIENCE +- +- +-# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl installable library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-install to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +-# and an installed libltdl is not found, it is assumed to be `libltdl'. +-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with +-# '${top_srcdir}/' (note the single quotes!). If your package is not +-# flat and you're not using automake, define top_builddir and top_srcdir +-# appropriately in the Makefiles. +-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +-AC_DEFUN([AC_LIBLTDL_INSTALLABLE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- AC_CHECK_LIB(ltdl, lt_dlinit, +- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], +- [if test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- else +- enable_ltdl_install=yes +- fi +- ]) +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- LTDLINCL= +- fi +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_INSTALLABLE +- +- +-# AC_LIBTOOL_CXX +-# -------------- +-# enable support for C++ libraries +-AC_DEFUN([AC_LIBTOOL_CXX], +-[AC_REQUIRE([_LT_AC_LANG_CXX]) +-])# AC_LIBTOOL_CXX +- +- +-# _LT_AC_LANG_CXX +-# --------------- +-AC_DEFUN([_LT_AC_LANG_CXX], +-[AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) +-])# _LT_AC_LANG_CXX +- +-# _LT_AC_PROG_CXXCPP +-# ------------------ +-AC_DEFUN([_LT_AC_PROG_CXXCPP], +-[ +-AC_REQUIRE([AC_PROG_CXX]) +-if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_PROG_CXXCPP +-fi +-])# _LT_AC_PROG_CXXCPP +- +-# AC_LIBTOOL_F77 +-# -------------- +-# enable support for Fortran 77 libraries +-AC_DEFUN([AC_LIBTOOL_F77], +-[AC_REQUIRE([_LT_AC_LANG_F77]) +-])# AC_LIBTOOL_F77 +- +- +-# _LT_AC_LANG_F77 +-# --------------- +-AC_DEFUN([_LT_AC_LANG_F77], +-[AC_REQUIRE([AC_PROG_F77]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) +-])# _LT_AC_LANG_F77 +- +- +-# AC_LIBTOOL_GCJ +-# -------------- +-# enable support for GCJ libraries +-AC_DEFUN([AC_LIBTOOL_GCJ], +-[AC_REQUIRE([_LT_AC_LANG_GCJ]) +-])# AC_LIBTOOL_GCJ +- +- +-# _LT_AC_LANG_GCJ +-# --------------- +-AC_DEFUN([_LT_AC_LANG_GCJ], +-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], +- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], +- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], +- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) +-])# _LT_AC_LANG_GCJ +- +- +-# AC_LIBTOOL_RC +-# ------------- +-# enable support for Windows resource files +-AC_DEFUN([AC_LIBTOOL_RC], +-[AC_REQUIRE([LT_AC_PROG_RC]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) +-])# AC_LIBTOOL_RC +- +- +-# AC_LIBTOOL_LANG_C_CONFIG +-# ------------------------ +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +-AC_DEFUN([_LT_AC_LANG_C_CONFIG], +-[lt_save_CC="$CC" +-AC_LANG_PUSH(C) +- +-# Source file extension for C test sources. +-ac_ext=c +- +-# Object file extension for compiled C test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}' +- +-_LT_AC_SYS_COMPILER +- +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE +- +-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF +- +-# Report which library types will actually be built +-AC_MSG_CHECKING([if libtool supports shared libraries]) +-AC_MSG_RESULT([$can_build_shared]) +- +-AC_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=no +- +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case $host_os in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +- +-aix[[4-9]]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; +-esac +-AC_MSG_RESULT([$enable_shared]) +- +-AC_MSG_CHECKING([whether to build static libraries]) +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-AC_MSG_RESULT([$enable_static]) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_POP +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_C_CONFIG +- +- +-# AC_LIBTOOL_LANG_CXX_CONFIG +-# -------------------------- +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) +-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], +-[AC_LANG_PUSH(C++) +-AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +- +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_AC_TAGVAR(allow_undefined_flag, $1)= +-_LT_AC_TAGVAR(always_export_symbols, $1)=no +-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_direct, $1)=no +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +-_LT_AC_TAGVAR(hardcode_automatic, $1)=no +-_LT_AC_TAGVAR(module_cmds, $1)= +-_LT_AC_TAGVAR(module_expsym_cmds, $1)= +-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_AC_TAGVAR(no_undefined_flag, $1)= +-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- +-# Dependencies to place before and after the object being linked: +-_LT_AC_TAGVAR(predep_objects, $1)= +-_LT_AC_TAGVAR(postdep_objects, $1)= +-_LT_AC_TAGVAR(predeps, $1)= +-_LT_AC_TAGVAR(postdeps, $1)= +-_LT_AC_TAGVAR(compiler_lib_search_path, $1)= +-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +- +-# Source file extension for C++ test sources. +-ac_ext=cpp +- +-# Object file extension for compiled C++ test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER +- +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE +- +-# Allow CC to be a program name with arguments. +-lt_save_CC=$CC +-lt_save_LD=$LD +-lt_save_GCC=$GCC +-GCC=$GXX +-lt_save_with_gnu_ld=$with_gnu_ld +-lt_save_path_LD=$lt_cv_path_LD +-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +-else +- $as_unset lt_cv_prog_gnu_ld +-fi +-if test -n "${lt_cv_path_LDCXX+set}"; then +- lt_cv_path_LD=$lt_cv_path_LDCXX +-else +- $as_unset lt_cv_path_LD +-fi +-test -z "${LDCXX+set}" || LD=$LDCXX +-CC=${CXX-"c++"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) +- +-# We don't want -fno-exception wen compiling C++ code, so set the +-# no_builtin_flag separately +-if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +-else +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +-fi +- +-if test "$GXX" = yes; then +- # Set up default GNU C++ configuration +- +- AC_PROG_LD +- +- # Check if GNU C++ uses GNU ld as the underlying linker, since the +- # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- +- # If archive_cmds runs LD, not CC, wlarc should be empty +- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to +- # investigate it a little bit more. (MM) +- wlarc='${wl}' +- +- # ancient GNU ld didn't support --whole-archive et. al. +- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ +- grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- else +- with_gnu_ld=no +- wlarc= +- +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- fi +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +-else +- GXX=no +- with_gnu_ld=no +- wlarc= +-fi +- +-# PORTME: fill in a description of your system's C++ link characteristics +-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-_LT_AC_TAGVAR(ld_shlibs, $1)=yes +-case $host_os in +- aix3*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aix[[4-9]]*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no +- +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done +- ;; +- esac +- +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi +- +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- if test "$GXX" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- : +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi +- +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +- +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- darwin* | rhapsody*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" +- if test "$GXX" = yes ; then +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- if test "$lt_cv_apple_cc_single_mod" != "yes"; then +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +- fi +- else +- case $cc_basename in +- xlc*) +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- ;; +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; +- +- dgux*) +- case $cc_basename in +- ec++*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- freebsd[[12]]*) +- # C++ shared libraries reported to be fairly broken before switch to ELF +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- freebsd-elf*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- ;; +- freebsd* | dragonfly*) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- ;; +- gnu*) +- ;; +- hpux9*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- case $host_cpu in +- hppa*64*|ia64*) ;; +- *) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; +- esac +- fi +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- esac +- +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- fi +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- interix[[3-9]]*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC*) +- # SGI C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- +- # Archives containing C++ object files must be created using +- # "CC -ar", where "CC" is the IRIX C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' +- ;; +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' +- fi +- fi +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; +- esac +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- linux* | k*bsd*-gnu) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- ;; +- icpc*) +- # Intel C++ +- with_gnu_ld=yes +- # version 8.0 and above of icpc choke on multiply defined symbols +- # if we add $predep_objects and $postdep_objects, however 7.1 and +- # earlier do not add the objects themselves. +- case `$CC -V 2>&1` in +- *"Version 7."*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- *) # Version 8.0 or newer +- tmp_idyn= +- case $host_cpu in +- ia64*) tmp_idyn=' -i_dynamic';; +- esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +- ;; +- pgCC* | pgcpp*) +- # Portland Group C++ compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- ;; +- cxx*) +- # Compaq C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' +- +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- case `$CC -V 2>&1 | sed 5q` in +- *Sun\ C*) +- # Sun C++ 5.9 +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- +- # Not sure whether something based on +- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 +- # would be better. +- output_verbose_link_cmd='echo' +- +- # Archives containing C++ object files must be created using +- # "CC -xar", where "CC" is the Sun C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' +- ;; +- esac +- ;; +- esac +- ;; +- lynxos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- m88k*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' +- wlarc= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; +- openbsd2*) +- # C++ shared libraries are fairly broken +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- openbsd*) +- if test -f /usr/libexec/ld.so; then +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- fi +- output_verbose_link_cmd='echo' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- osf3*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- osf4* | osf5*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ +- $rm $lib.exp' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- psos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- lcc*) +- # Lucid +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- # The compiler driver will combine and reorder linker options, +- # but understands `-z linker_flag'. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' +- ;; +- esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- output_verbose_link_cmd='echo' +- +- # Archives containing C++ object files must be created using +- # "CC -xar", where "CC" is the Sun C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- +- # The C++ compiler must be used to create the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +- ;; +- *) +- # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' +- if $CC --version | grep -v '^2\.7' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- fi +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' +- ;; +- esac +- fi +- ;; +- esac +- ;; +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' +- +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- ;; +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- # For security reasons, it is highly recommended that you always +- # use absolute paths for naming shared libraries, and exclude the +- # DT_RUNPATH tag from executables and libraries. But doing so +- # requires that you compile everything twice, which is a pain. +- # So that behaviour is only enabled if SCOABSPATH is set to a +- # non-empty value in the environment. Most likely only useful for +- # creating official distributions of packages. +- # This is a hack until libtool officially supports absolute path +- # names for shared libraries. +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' +- +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- vxworks*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +-esac +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +- +-_LT_AC_TAGVAR(GCC, $1)="$GXX" +-_LT_AC_TAGVAR(LD, $1)="$LD" +- +-AC_LIBTOOL_POSTDEP_PREDEP($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_POP +-CC=$lt_save_CC +-LDCXX=$LD +-LD=$lt_save_LD +-GCC=$lt_save_GCC +-with_gnu_ldcxx=$with_gnu_ld +-with_gnu_ld=$lt_save_with_gnu_ld +-lt_cv_path_LDCXX=$lt_cv_path_LD +-lt_cv_path_LD=$lt_save_path_LD +-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +-])# AC_LIBTOOL_LANG_CXX_CONFIG +- +-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +-# ------------------------------------ +-# Figure out "hidden" library dependencies from verbose +-# compiler output when linking a shared library. +-# Parse the compiler output and extract the necessary +-# objects, libraries and library flags. +-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-dnl we can't use the lt_simple_compile_test_code here, +-dnl because it contains code intended for an executable, +-dnl not a library. It's possible we should let each +-dnl tag define a new lt_????_link_test_code variable, +-dnl but it's only used here... +-ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&1 | sed 5q` in +- *Sun\ C*) +- # Sun C++ 5.9 +- # +- # The more standards-conforming stlport4 library is +- # incompatible with the Cstd library. Avoid specifying +- # it if it's in CXXFLAGS. Ignore libCrun as +- # -library=stlport4 depends on it. +- case " $CXX $CXXFLAGS " in +- *" -library=stlport4 "*) +- solaris_use_stlport4=yes +- ;; +- esac +- if test "$solaris_use_stlport4" != yes; then +- _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' +- fi +- ;; +- esac +- ;; +- +-solaris*) +- case $cc_basename in +- CC*) +- # The more standards-conforming stlport4 library is +- # incompatible with the Cstd library. Avoid specifying +- # it if it's in CXXFLAGS. Ignore libCrun as +- # -library=stlport4 depends on it. +- case " $CXX $CXXFLAGS " in +- *" -library=stlport4 "*) +- solaris_use_stlport4=yes +- ;; +- esac +- +- # Adding this requires a known-good setup of shared libraries for +- # Sun compiler versions before 5.6, else PIC objects from an old +- # archive will be linked into the output, leading to subtle bugs. +- if test "$solaris_use_stlport4" != yes; then +- _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' +- fi +- ;; +- esac +- ;; +-esac +-]) +-case " $_LT_AC_TAGVAR(postdeps, $1) " in +-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; +-esac +-])# AC_LIBTOOL_POSTDEP_PREDEP +- +-# AC_LIBTOOL_LANG_F77_CONFIG +-# -------------------------- +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) +-AC_DEFUN([_LT_AC_LANG_F77_CONFIG], +-[AC_REQUIRE([AC_PROG_F77]) +-AC_LANG_PUSH(Fortran 77) +- +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_AC_TAGVAR(allow_undefined_flag, $1)= +-_LT_AC_TAGVAR(always_export_symbols, $1)=no +-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_direct, $1)=no +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +-_LT_AC_TAGVAR(hardcode_automatic, $1)=no +-_LT_AC_TAGVAR(module_cmds, $1)= +-_LT_AC_TAGVAR(module_expsym_cmds, $1)= +-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_AC_TAGVAR(no_undefined_flag, $1)= +-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- +-# Source file extension for f77 test sources. +-ac_ext=f +- +-# Object file extension for compiled f77 test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="\ +- subroutine t +- return +- end +-" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code="\ +- program t +- end +-" +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER +- +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE +- +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${F77-"f77"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) +- +-AC_MSG_CHECKING([if libtool supports shared libraries]) +-AC_MSG_RESULT([$can_build_shared]) +- +-AC_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=no +- +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case $host_os in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +-aix[[4-9]]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; +-esac +-AC_MSG_RESULT([$enable_shared]) +- +-AC_MSG_CHECKING([whether to build static libraries]) +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-AC_MSG_RESULT([$enable_static]) +- +-_LT_AC_TAGVAR(GCC, $1)="$G77" +-_LT_AC_TAGVAR(LD, $1)="$LD" +- +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_POP +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_F77_CONFIG +- +- +-# AC_LIBTOOL_LANG_GCJ_CONFIG +-# -------------------------- +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) +-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], +-[AC_LANG_SAVE +- +-# Source file extension for Java test sources. +-ac_ext=java +- +-# Object file extension for compiled Java test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER +- +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE +- +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${GCJ-"gcj"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) +- +-# GCJ did not exist at the time GCC didn't implicitly link libc in. +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +- +-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_RESTORE +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_GCJ_CONFIG +- +- +-# AC_LIBTOOL_LANG_RC_CONFIG +-# ------------------------- +-# Ensure that the configuration vars for the Windows resource compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) +-AC_DEFUN([_LT_AC_LANG_RC_CONFIG], +-[AC_LANG_SAVE +- +-# Source file extension for RC test sources. +-ac_ext=rc +- +-# Object file extension for compiled RC test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' +- +-# Code to be used in simple link tests +-lt_simple_link_test_code="$lt_simple_compile_test_code" +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER +- +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE +- +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${RC-"windres"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) +-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_RESTORE +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_RC_CONFIG +- +- +-# AC_LIBTOOL_CONFIG([TAGNAME]) +-# ---------------------------- +-# If TAGNAME is not passed, then create an initial libtool script +-# with a default configuration from the untagged config vars. Otherwise +-# add code to config.status for appending the configuration named by +-# TAGNAME from the matching tagged config vars. +-AC_DEFUN([AC_LIBTOOL_CONFIG], +-[# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # See if we are running on zsh, and set the options which allow our commands through +- # without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- _LT_AC_TAGVAR(compiler, $1) \ +- _LT_AC_TAGVAR(CC, $1) \ +- _LT_AC_TAGVAR(LD, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ +- _LT_AC_TAGVAR(old_archive_cmds, $1) \ +- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ +- _LT_AC_TAGVAR(predep_objects, $1) \ +- _LT_AC_TAGVAR(postdep_objects, $1) \ +- _LT_AC_TAGVAR(predeps, $1) \ +- _LT_AC_TAGVAR(postdeps, $1) \ +- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ +- _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ +- _LT_AC_TAGVAR(archive_cmds, $1) \ +- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ +- _LT_AC_TAGVAR(postinstall_cmds, $1) \ +- _LT_AC_TAGVAR(postuninstall_cmds, $1) \ +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ +- _LT_AC_TAGVAR(allow_undefined_flag, $1) \ +- _LT_AC_TAGVAR(no_undefined_flag, $1) \ +- _LT_AC_TAGVAR(export_symbols_cmds, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ +- _LT_AC_TAGVAR(hardcode_automatic, $1) \ +- _LT_AC_TAGVAR(module_cmds, $1) \ +- _LT_AC_TAGVAR(module_expsym_cmds, $1) \ +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ +- _LT_AC_TAGVAR(fix_srcfile_path, $1) \ +- _LT_AC_TAGVAR(exclude_expsyms, $1) \ +- _LT_AC_TAGVAR(include_expsyms, $1); do +- +- case $var in +- _LT_AC_TAGVAR(old_archive_cmds, $1) | \ +- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ +- _LT_AC_TAGVAR(archive_cmds, $1) | \ +- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ +- _LT_AC_TAGVAR(module_cmds, $1) | \ +- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ +- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done +- +- case $lt_echo in +- *'\[$]0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` +- ;; +- esac +- +-ifelse([$1], [], +- [cfgfile="${ofile}T" +- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 +- $rm -f "$cfgfile" +- AC_MSG_NOTICE([creating $ofile])], +- [cfgfile="$ofile"]) +- +- cat <<__EOF__ >> "$cfgfile" +-ifelse([$1], [], +-[#! $SHELL +- +-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +-# NOTE: Changes made to this file will be lost: look at ltmain.sh. +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is part of GNU Libtool: +-# Originally by Gordon Matzigkeit , 1996 +-# +-# 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 of the License, 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. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-# +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# A sed program that does not truncate output. +-SED=$lt_SED +- +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e 1s/^X//" +- +-# The HP-UX ksh and POSIX shell print the target directory to stdout +-# if CDPATH is set. +-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +- +-# The names of the tagged configurations supported by this script. +-available_tags= +- +-# ### BEGIN LIBTOOL CONFIG], +-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) +- +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os +- +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os +- +-# An echo program that does not interpret backslashes. +-echo=$lt_echo +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# LTCC compiler flags. +-LTCFLAGS=$lt_LTCFLAGS +- +-# A language-specific compiler. +-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) +- +-# Is the compiler the GNU C compiler? +-with_gcc=$_LT_AC_TAGVAR(GCC, $1) +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_[]_LT_AC_TAGVAR(LD, $1) +- +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +- +-# A BSD-compatible nm program. +-NM=$lt_NM +- +-# A symbol stripping program +-STRIP=$lt_STRIP +- +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS="$AS" +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) +- +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) +-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) +-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +- +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) +- +-# Symbols that must always be exported. +-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) +- +-ifelse([$1],[], +-[# ### END LIBTOOL CONFIG], +-[# ### END LIBTOOL TAG CONFIG: $tagname]) +- +-__EOF__ +- +-ifelse([$1],[], [ +- case $host_os in +- aix3*) +- cat <<\EOF >> "$cfgfile" +- +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-EOF +- ;; +- esac +- +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) ++AC_SUBST([LIBM]) ++])# LT_LIB_M + +- mv -f "$cfgfile" "$ofile" || \ +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +-]) +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +-])# AC_LIBTOOL_CONFIG ++# Old name: ++AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_CHECK_LIBM], []) + + +-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) +-# ------------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++# _LT_COMPILER_NO_RTTI([TAGNAME]) ++# ------------------------------- ++m4_defun([_LT_COMPILER_NO_RTTI], ++[m4_require([_LT_TAG_COMPILER])dnl + +-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + +- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) + fi +-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI ++_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], ++ [Compiler flag to turn off builtin functions]) ++])# _LT_COMPILER_NO_RTTI + + +-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-# --------------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], +-[AC_REQUIRE([AC_CANONICAL_HOST]) +-AC_REQUIRE([LT_AC_PROG_SED]) +-AC_REQUIRE([AC_PROG_NM]) +-AC_REQUIRE([AC_OBJEXT]) ++# _LT_CMD_GLOBAL_SYMBOLS ++# ---------------------- ++m4_defun([_LT_CMD_GLOBAL_SYMBOLS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++AC_REQUIRE([LT_PATH_LD])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_TAG_COMPILER])dnl ++ + # Check for command to grab the raw symbol name followed by C symbol from nm. + AC_MSG_CHECKING([command to parse $NM output from $compiler object]) + AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +@@ -4815,33 +3348,18 @@ symcode='[[BCDEGRST]]' + # Regexp to match symbols that can be accessed directly from C. + sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +-# Transform an extracted symbol line into a proper C declaration +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" +- +-# Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" +- + # Define system-specific variables. + case $host_os in + aix*) + symcode='[[BCDT]]' + ;; +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +-hpux*) # Its linker distinguishes data from code symbols ++hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi +- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" +- ;; +-linux* | k*bsd*-gnu) +- if test "$host_cpu" = ia64; then +- symcode='[[ABCDGIRSTW]]' +- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" +- fi + ;; + irix* | nonstopux*) + symcode='[[BCDEGRST]]' +@@ -4866,44 +3384,72 @@ sysv4) + ;; + esac + ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[[ABCDGIRSTW]]' ;; ++esac ++ ++# Transform an extracted symbol line into a proper C declaration. ++# Some systems (esp. on ia64) link data and code symbols differently, ++# so use this general approach. ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ ++# Transform an extracted symbol line into symbol name and symbol address ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++ + # Handle CRLF in mingw tool chain + opt_cr= + case $build_os in + mingw*) +- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; + esac + +-# If we're using GNU nm, then use its standard symbol codes. +-case `$NM -V 2>&1` in +-*GNU* | *'with BFD'*) +- symcode='[[ABCDGIRSTW]]' ;; +-esac +- +-# Try without a prefix undercore, then with it. ++# Try without a prefix underscore, then with it. + for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ # Fake it for dumpbin and say T for any non-static function ++ # and D for any global variable. ++ # Also find C++ and __fastcall symbols from MSVC++, ++ # which start with @ or ?. ++ lt_cv_sys_global_symbol_pipe="$AWK ['"\ ++" {last_section=section; section=\$ 3};"\ ++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++" \$ 0!~/External *\|/{next};"\ ++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ ++" {if(hide[section]) next};"\ ++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ ++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ ++" s[1]~/^[@?]/{print s[1], s[1]; next};"\ ++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++" ' prfx=^$ac_symprfx]" ++ else ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ fi + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* +- cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF + #ifdef __cplusplus + extern "C" { + #endif + char nm_test_var; +-void nm_test_func(){} ++void nm_test_func(void); ++void nm_test_func(void){} + #ifdef __cplusplus + } + #endif + int main(){nm_test_var='a';nm_test_func();return(0);} +-EOF ++_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. +@@ -4917,48 +3463,50 @@ EOF + fi + + # Make sure that we snagged all the symbols we need. +- if grep ' nm_test_var$' "$nlist" >/dev/null; then +- if grep ' nm_test_func$' "$nlist" >/dev/null; then +- cat < conftest.$ac_ext ++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then ++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then ++ cat <<_LT_EOF > conftest.$ac_ext + #ifdef __cplusplus + extern "C" { + #endif + +-EOF ++_LT_EOF + # Now generate the symbol file. +- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + +- cat <> conftest.$ac_ext +-#if defined (__STDC__) && __STDC__ +-# define lt_ptr_t void * +-#else +-# define lt_ptr_t char * +-# define const +-#endif ++ cat <<_LT_EOF >> conftest.$ac_ext + +-/* The mapping between symbol names and symbols. */ ++/* The mapping between symbol names and symbols. */ + const struct { + const char *name; +- lt_ptr_t address; ++ void *address; + } +-lt_preloaded_symbols[[]] = ++lt__PROGRAM__LTX_preloaded_symbols[[]] = + { +-EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext +- cat <<\EOF >> conftest.$ac_ext +- {0, (lt_ptr_t) 0} ++ { "@PROGRAM@", (void *) 0 }, ++_LT_EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++ cat <<\_LT_EOF >> conftest.$ac_ext ++ {0, (void *) 0} + }; + ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt__PROGRAM__LTX_preloaded_symbols; ++} ++#endif ++ + #ifdef __cplusplus + } + #endif +-EOF ++_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" +- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +@@ -4995,56 +3543,78 @@ if test -z "$lt_cv_sys_global_symbol_pip + else + AC_MSG_RESULT(ok) + fi +-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++ ++_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], ++ [Take the output of nm and produce a listing of raw symbols and C names]) ++_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], ++ [Transform the output of nm in a proper C declaration]) ++_LT_DECL([global_symbol_to_c_name_address], ++ [lt_cv_sys_global_symbol_to_c_name_address], [1], ++ [Transform the output of nm in a C name address pair]) ++_LT_DECL([global_symbol_to_c_name_address_lib_prefix], ++ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], ++ [Transform the output of nm in a C name address pair when lib prefix is needed]) ++]) # _LT_CMD_GLOBAL_SYMBOLS + + +-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) +-# --------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], +-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= ++# _LT_COMPILER_PIC([TAGNAME]) ++# --------------------------- ++m4_defun([_LT_COMPILER_PIC], ++[m4_require([_LT_TAG_COMPILER])dnl ++_LT_TAGVAR(lt_prog_compiler_wl, $1)= ++_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++_LT_TAGVAR(lt_prog_compiler_static, $1)= + + AC_MSG_CHECKING([for $compiler option to produce PIC]) +- ifelse([$1],[CXX],[ ++m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; ++ + amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac + ;; ++ + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +- mingw* | cygwin* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. +@@ -5052,22 +3622,28 @@ AC_MSG_CHECKING([for $compiler option to + ;; + sysv4*MP*) + if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. + case $host_cpu in +- hppa*64*|ia64*) ++ hppa*64*) + ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else +@@ -5076,37 +3652,27 @@ AC_MSG_CHECKING([for $compiler option to + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler +- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- ;; +- esac +- ;; + dgux*) + case $cc_basename in + ec++*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; +@@ -5118,21 +3684,21 @@ AC_MSG_CHECKING([for $compiler option to + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; +@@ -5147,8 +3713,8 @@ AC_MSG_CHECKING([for $compiler option to + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) +@@ -5159,35 +3725,48 @@ AC_MSG_CHECKING([for $compiler option to + case $cc_basename in + KCC*) + # KAI C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; +- icpc* | ecpc*) +- # Intel C++ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ecpc* ) ++ # old Intel C++ for x86_64 which still supported -KPIC. ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ icpc* ) ++ # Intel C++, used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) +- # Portland Group C++ compiler. +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ # Portland Group C++ compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ xlc* | xlC*) ++ # IBM XL 8.0 on PPC ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; +@@ -5200,7 +3779,7 @@ AC_MSG_CHECKING([for $compiler option to + mvs*) + case $cc_basename in + cxx*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; +@@ -5208,22 +3787,27 @@ AC_MSG_CHECKING([for $compiler option to + ;; + netbsd*) + ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; +@@ -5235,13 +3819,13 @@ AC_MSG_CHECKING([for $compiler option to + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; +@@ -5251,82 +3835,104 @@ AC_MSG_CHECKING([for $compiler option to + case $cc_basename in + CC*) + # Sun C++ 4.x +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ esac ++ ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- esac +- ;; + vxworks*) + ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi + ], + [ + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | cygwin* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac + ;; + + interix[[3-9]]*) +@@ -5337,65 +3943,48 @@ AC_MSG_CHECKING([for $compiler option to + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; ++ + sysv4*MP*) + if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- ;; +- + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- ;; +- esac +- ;; + +- mingw* | cygwin* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in +@@ -5403,222 +3992,263 @@ AC_MSG_CHECKING([for $compiler option to + # +Z the default + ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- +- newsos6) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + linux* | k*bsd*-gnu) + case $cc_basename in +- icc* | ecc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ # old Intel for x86_64 which still supported -KPIC. ++ ecc*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; ++ xl*) ++ # IBM XL C 8.0/Fortran 10.1 on PPC ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ++ ;; + *) +- case `$CC -V 2>&1 | sed 5q` in ++ case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + esac + ;; + esac + ;; + ++ newsos6) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; ++ + osf3* | osf4* | osf5*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + rdos*) +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi + ]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) +- +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then +- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +- _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), +- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], +- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in +- "" | " "*) ;; +- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; +- esac], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +-fi + case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; + esac ++AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then ++ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], ++ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], ++ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in ++ "" | " "*) ;; ++ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++ esac], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++fi ++_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], ++ [Additional compiler flags for building library objects]) + + # + # Check to make sure the static flag actually works. + # +-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +- _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), ++wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" ++_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], +- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +-]) ++ [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) ++_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], ++ [Compiler flag to prevent dynamic linking]) ++])# _LT_COMPILER_PIC + + +-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +-# ------------------------------------ ++# _LT_LINKER_SHLIBS([TAGNAME]) ++# ---------------------------- + # See if the linker supports building shared libraries. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl ++m4_defun([_LT_LINKER_SHLIBS], ++[AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_TAG_COMPILER])dnl + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-ifelse([$1],[CXX],[ +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++m4_if([$1], [CXX], [ ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; +- cygwin* | mingw*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ cygwin* | mingw* | cegcc*) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; + *) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +-],[ ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++], [ + runpath_var= +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)= +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +- _LT_AC_TAGVAR(hardcode_automatic, $1)=no +- _LT_AC_TAGVAR(module_cmds, $1)= +- _LT_AC_TAGVAR(module_expsym_cmds, $1)= +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)= ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)= ++ _LT_TAGVAR(archive_expsym_cmds, $1)= ++ _LT_TAGVAR(compiler_needs_object, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(hardcode_automatic, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= ++ _LT_TAGVAR(hardcode_minus_L, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_TAGVAR(inherit_rpath, $1)=no ++ _LT_TAGVAR(link_all_deplibs, $1)=unknown ++ _LT_TAGVAR(module_cmds, $1)= ++ _LT_TAGVAR(module_expsym_cmds, $1)= ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)= ++ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++ _LT_TAGVAR(thread_safe_flag_spec, $1)= ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list +- _LT_AC_TAGVAR(include_expsyms, $1)= ++ _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot +@@ -5627,10 +4257,9 @@ ifelse([$1],[CXX],[ + # Exclude shared library initialization/finalization symbols. + dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= +- # Just being paranoid about ensuring that cc_basename is set. +- _LT_CC_BASENAME([$compiler]) ++ + case $host_os in +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -5647,7 +4276,7 @@ dnl Note also adjust exclude_expsyms for + ;; + esac + +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ _LT_TAGVAR(ld_shlibs, $1)=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' +@@ -5656,16 +4285,16 @@ dnl Note also adjust exclude_expsyms for + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in ++ case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -5678,8 +4307,8 @@ dnl Note also adjust exclude_expsyms for + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 + + *** Warning: the GNU linker, at least up to release 2.9.1, is reported + *** to be unable to reliably create shared libraries on AIX. +@@ -5687,49 +4316,50 @@ dnl Note also adjust exclude_expsyms for + *** really care for shared libraries, you may want to modify your PATH + *** so that a non-GNU linker is found, and then restart. + +-EOF ++_LT_EOF + fi + ;; + + amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- +- # Samuel A. Falvo II reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='' ++ ;; ++ m68k) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac + ;; + + beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; +@@ -5737,79 +4367,109 @@ EOF + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + interix[[3-9]]*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | k*bsd*-gnu) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ gnu* | linux* | tpf* | k*bsd*-gnu) ++ tmp_diet=no ++ if test "$host_os" = linux-dietlibc; then ++ case $cc_basename in ++ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) ++ esac ++ fi ++ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ ++ && test "$tmp_diet" = no ++ then + tmp_addflag= ++ tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in +- pgcc*) # Portland Group C compiler +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ pgcc*) # Portland Group C compiler ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; ++ lf95*) # Lahey Fortran 8.1 ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ tmp_sharedflag='--shared' ;; ++ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++ tmp_sharedflag='-qmkshrobj' ++ tmp_addflag= ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; +- *) +- tmp_sharedflag='-shared' ;; + esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + +- if test $supports_anon_versioning = yes; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ++ case $cc_basename in ++ xlf*) ++ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ esac + else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 ++ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 + + *** Warning: The releases 2.8.* of the GNU linker cannot reliably + *** create shared libraries on Solaris systems. Therefore, libtool +@@ -5818,19 +4478,19 @@ EOF + *** your PATH or compiler configuration so that the native linker is + *** used, and then restart. + +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++_LT_EOF ++ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + + *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +@@ -5843,54 +4503,58 @@ EOF + _LT_EOF + ;; + *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + +- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + +@@ -5904,10 +4568,10 @@ _LT_EOF + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + +@@ -5916,10 +4580,10 @@ _LT_EOF + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi + done + ;; + esac +@@ -5934,30 +4598,32 @@ _LT_EOF + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(archive_cmds, $1)='' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then +- # We have reworked collect2 +- : ++ # We have reworked collect2 ++ : + else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ # We have old collect2 ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac +@@ -5968,8 +4634,8 @@ _LT_EOF + else + # not using gcc + if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then +@@ -5980,129 +4646,94 @@ _LT_EOF + fi + fi + ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else ++ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else + if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- # see comment about different semantics on the GNU ld section +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='' ++ ;; ++ m68k) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac + ;; + + bsdi[[45]]*) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- if test "$GCC" = yes ; then +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- else +- case $cc_basename in +- xlc*) +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- ;; +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi ++ _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + freebsd1*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +@@ -6110,60 +4741,60 @@ _LT_EOF + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + +@@ -6171,45 +4802,45 @@ _LT_EOF + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi +@@ -6217,194 +4848,221 @@ _LT_EOF + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ # Try to use the -exported_symbol ld option, if it does not ++ # work, assume that -exports_file does not work either and ++ # implicitly export all symbols. ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE(int foo(void) {}, ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ ) ++ LDFLAGS="$save_LDFLAGS" + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(inherit_rpath, $1)=yes ++ _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac +- fi ++ fi + else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + os2*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ ++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' ++ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else +- wlarc='' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ case `$CC -V 2>&1` in ++ *"Compilers 5.0"*) ++ wlarc='' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++ ;; ++ *) ++ wlarc='${wl}' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ ;; ++ esac + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. +- # Supported since Solaris 2.6 (maybe 2.5.1?) ++ # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++ _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + +@@ -6415,50 +5073,65 @@ _LT_EOF + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac ++ ++ if test x$host_vendor = xsni; then ++ case $host in ++ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' ++ ;; ++ esac ++ fi + fi + ]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ ++_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld ++ ++_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl ++_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl ++_LT_DECL([], [extract_expsyms_cmds], [2], ++ [The commands to extract the exported symbol list from a shared archive]) + + # + # Do we need to explicitly link libc? + # +-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in ++case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in + x|xyes) + # Assume -lc should be added +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $_LT_AC_TAGVAR(archive_cmds, $1) in ++ case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; +@@ -6467,7 +5140,7 @@ x|xyes) + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) +- $rm conftest* ++ $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then +@@ -6475,135 +5148,1916 @@ x|xyes) + lib=conftest + libobjs=conftest.$ac_objext + deplibs= +- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest +- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) ++ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) ++ _LT_TAGVAR(allow_undefined_flag, $1)= ++ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no + else +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi +- $rm conftest* +- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) ++ $RM conftest* ++ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + ;; + esac + fi + ;; + esac +-])# AC_LIBTOOL_PROG_LD_SHLIBS + ++_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], ++ [Whether or not to add -lc for building shared libraries]) ++_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], ++ [enable_shared_with_static_runtimes], [0], ++ [Whether or not to disallow shared libs when runtime libs are static]) ++_LT_TAGDECL([], [export_dynamic_flag_spec], [1], ++ [Compiler flag to allow reflexive dlopens]) ++_LT_TAGDECL([], [whole_archive_flag_spec], [1], ++ [Compiler flag to generate shared objects directly from archives]) ++_LT_TAGDECL([], [compiler_needs_object], [1], ++ [Whether the compiler copes with passing no objects directly]) ++_LT_TAGDECL([], [old_archive_from_new_cmds], [2], ++ [Create an old-style archive from a shared archive]) ++_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], ++ [Create a temporary old-style archive to link instead of a shared archive]) ++_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) ++_LT_TAGDECL([], [archive_expsym_cmds], [2]) ++_LT_TAGDECL([], [module_cmds], [2], ++ [Commands used to build a loadable module if different from building ++ a shared archive.]) ++_LT_TAGDECL([], [module_expsym_cmds], [2]) ++_LT_TAGDECL([], [with_gnu_ld], [1], ++ [Whether we are building with GNU ld or not]) ++_LT_TAGDECL([], [allow_undefined_flag], [1], ++ [Flag that allows shared libraries with undefined symbols to be built]) ++_LT_TAGDECL([], [no_undefined_flag], [1], ++ [Flag that enforces no undefined symbols]) ++_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], ++ [Flag to hardcode $libdir into a binary during linking. ++ This must work even if $libdir does not exist]) ++_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], ++ [[If ld is used when linking, flag to hardcode $libdir into a binary ++ during linking. This must work even if $libdir does not exist]]) ++_LT_TAGDECL([], [hardcode_libdir_separator], [1], ++ [Whether we need a single "-rpath" flag with a separated argument]) ++_LT_TAGDECL([], [hardcode_direct], [0], ++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++ DIR into the resulting binary]) ++_LT_TAGDECL([], [hardcode_direct_absolute], [0], ++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++ DIR into the resulting binary and the resulting library dependency is ++ "absolute", i.e impossible to change by setting ${shlibpath_var} if the ++ library is relocated]) ++_LT_TAGDECL([], [hardcode_minus_L], [0], ++ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++ into the resulting binary]) ++_LT_TAGDECL([], [hardcode_shlibpath_var], [0], ++ [Set to "