From 8385713df974239b7cf5395873b4ad459953fa5e Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 18 Dec 2009 20:40:49 +0059 Subject: first draft Signed-off-by: Thorsten Glaser --- package/pkgmaker | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/pkgmaker (limited to 'package/pkgmaker') diff --git a/package/pkgmaker b/package/pkgmaker new file mode 100644 index 000000000..5cc957ff9 --- /dev/null +++ b/package/pkgmaker @@ -0,0 +1,29 @@ +export TOPDIR=$(realpath ..) +if gmake --help >/dev/null 2>&1; then + export GMAKE=gmake +else + export GMAKE=make +fi + +for subdir in bash; do + cd $subdir + pn=$($GMAKE show=PKG_NAME) + typeset -u pnu=$pn + pd=$($GMAKE show=PKG_DESCR) + ph=$($GMAKE show=PKG_URL) + (print "config ADK_PACKAGE_$pnu" + pnf=$pn + while (( ${#pnf} < 34 )); do + pnf=$pnf. + done + print "\tprompt \"$pnf ${pd:-$pn}\"" + print \\ttristate + print \\tdefault n + if [[ -n $pd$ph ]]; then + print \\thelp + [[ -n $pd ]] && print "\t $pd" + [[ -n $pd && -n $ph ]] && print '\t ' + [[ -n $ph ]] && print "\t $ph" + fi + ) >Config.in +done -- cgit v1.2.3 From c549fe094745b04e32a6f2419bbf7a2ac1b246e0 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 18 Dec 2009 20:51:46 +0059 Subject: next one, multi-packages Signed-off-by: Thorsten Glaser --- mk/package.mk | 2 ++ package/pkgmaker | 45 ++++++++++++++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 13 deletions(-) (limited to 'package/pkgmaker') diff --git a/mk/package.mk b/mk/package.mk index df2c027b2..22d60e23c 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -137,6 +137,8 @@ build-all-pkgs: ${_IPKGS_COOKIE} # cleaning (needed for toolchain packages like glibc/eglibc) # should be package format independent and modular in the future define PKG_template +ALL_PKGOPTS+= $(1) +PKGNAME_$(1)= $(2) IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX} IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) diff --git a/package/pkgmaker b/package/pkgmaker index 5cc957ff9..46b8b1b15 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -5,25 +5,44 @@ else export GMAKE=make fi -for subdir in bash; do +for subdir in bash bc; do cd $subdir pn=$($GMAKE show=PKG_NAME) + pa=$($GMAKE show=ALL_PKGOPTS) typeset -u pnu=$pn pd=$($GMAKE show=PKG_DESCR) ph=$($GMAKE show=PKG_URL) - (print "config ADK_PACKAGE_$pnu" - pnf=$pn - while (( ${#pnf} < 34 )); do - pnf=$pnf. - done - print "\tprompt \"$pnf ${pd:-$pn}\"" + + ( + print "config ADK_COMPILE_$pnu" print \\ttristate + print -n \\tdepends on + sp=' ' + for xu in $pa; do + print -n "${sp}ADK_PACKAGE_$xu" + sp=' || ' + done + print print \\tdefault n - if [[ -n $pd$ph ]]; then - print \\thelp - [[ -n $pd ]] && print "\t $pd" - [[ -n $pd && -n $ph ]] && print '\t ' - [[ -n $ph ]] && print "\t $ph" - fi + + for xu in $pa; do + x=$($GMAKE show=PKGNAME_$xu) + print \\nconfig ADK_PACKAGE_$xu + xf=$x + while (( ${#xf} < 34 )); do + xf=$xf. + done + print "\tprompt \"$xf ${pd:-$pn}\"" + print \\ttristate + print \\tdefault n + print \\tselect ADK_COMPILE_$pnu + if [[ -n $pd$ph ]]; then + print \\thelp + [[ -n $pd ]] && print "\t $pd" + [[ -n $pd && -n $ph ]] && print '\t ' + [[ -n $ph ]] && print "\t $ph" + fi + done ) >Config.in + cd .. done -- cgit v1.2.3 From 4f1b874dedde0c3ecdac4ae9843d04fb36d22029 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 18 Dec 2009 20:59:59 +0059 Subject: another round of features Signed-off-by: Thorsten Glaser --- package/mksh/Makefile | 3 +++ package/pkgmaker | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'package/pkgmaker') diff --git a/package/mksh/Makefile b/package/mksh/Makefile index aeb4fe44e..c85ebc585 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -15,6 +15,9 @@ PKG_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} DISTFILES= ${PKG_NAME}-R${PKG_VERSION}.cpio.gz WRKDIST= ${WRKDIR}/${PKG_NAME} +PKG_FLAVOURS= FULL +PKGFD_FULL= Include all features + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MKSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/pkgmaker b/package/pkgmaker index 46b8b1b15..ebca00493 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -5,10 +5,11 @@ else export GMAKE=make fi -for subdir in bash bc; do +for subdir in bash bc mksh; do cd $subdir pn=$($GMAKE show=PKG_NAME) pa=$($GMAKE show=ALL_PKGOPTS) + pfl=$($GMAKE show=PKG_FLAVOURS) typeset -u pnu=$pn pd=$($GMAKE show=PKG_DESCR) ph=$($GMAKE show=PKG_URL) @@ -43,6 +44,17 @@ for subdir in bash bc; do [[ -n $ph ]] && print "\t $ph" fi done + + for pf in $pfl; do + pfd=$($GMAKE show=PKGFD_$pf) + print + print config ADK_PACKAGE_${pnu}_$pf + print "\tbool \"${pfd:-flavour ADK_PACKAGE_${pnu}_$pf}\"" + print \\tdefault n + print \\tdepends on ADK_COMPILE_$pnu + print \\thelp + print "\t flavour ADK_PACKAGE_${pnu}_$pf" + done ) >Config.in cd .. done -- cgit v1.2.3 From fd193780483f7f18a5060df04e88090021a9fbbe Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 18 Dec 2009 22:13:45 +0059 Subject: add comment on varnames Signed-off-by: Thorsten Glaser --- package/pkgmaker | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/pkgmaker b/package/pkgmaker index ebca00493..4a2cd3ff8 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -7,29 +7,29 @@ fi for subdir in bash bc mksh; do cd $subdir - pn=$($GMAKE show=PKG_NAME) - pa=$($GMAKE show=ALL_PKGOPTS) - pfl=$($GMAKE show=PKG_FLAVOURS) - typeset -u pnu=$pn - pd=$($GMAKE show=PKG_DESCR) - ph=$($GMAKE show=PKG_URL) + pn=$($GMAKE show=PKG_NAME) # pn: package name + pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options + pfl=$($GMAKE show=PKG_FLAVOURS) # pfl: all package flavours + typeset -u pnu=$pn # pnu: package name uppercase + pd=$($GMAKE show=PKG_DESCR) # pd: package description + ph=$($GMAKE show=PKG_URL) # ph: package homepage ( print "config ADK_COMPILE_$pnu" print \\ttristate print -n \\tdepends on - sp=' ' - for xu in $pa; do + sp=' ' # local sp: space (or ' || ') + for xu in $pa; do # xu: package option uppercase print -n "${sp}ADK_PACKAGE_$xu" sp=' || ' done print print \\tdefault n - for xu in $pa; do - x=$($GMAKE show=PKGNAME_$xu) + for xu in $pa; do # xu: package option uppercase + x=$($GMAKE show=PKGNAME_$xu) # x: subpackage name print \\nconfig ADK_PACKAGE_$xu - xf=$x + xf=$x # xf: subpackage name ........ while (( ${#xf} < 34 )); do xf=$xf. done @@ -45,7 +45,7 @@ for subdir in bash bc mksh; do fi done - for pf in $pfl; do + for pf in $pfl; do # pf: package flavour pfd=$($GMAKE show=PKGFD_$pf) print print config ADK_PACKAGE_${pnu}_$pf -- cgit v1.2.3 From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 22:53:46 +0059 Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all Makefiles Signed-off-by: Thorsten Glaser --- mk/build.mk | 5 +- package/Depends.mk | 425 ------------------------------------- package/aircrack-ng/Makefile | 2 +- package/alsa-utils/Makefile | 2 +- package/apr-util/Makefile | 1 + package/apr/Makefile | 4 +- package/arpd/Makefile | 2 +- package/arpwatch/Makefile | 1 + package/asterisk/Makefile | 7 + package/atftp/Makefile | 2 +- package/atk/Makefile | 2 +- package/avahi/Makefile | 2 +- package/bind/Makefile | 1 + package/bitlbee/Makefile | 1 + package/bluez/Makefile | 1 + package/bogofilter/Makefile | 1 + package/cairo/Makefile | 1 + package/cbtt/Makefile | 4 + package/collectd/Makefile | 1 + package/cryptinit/Makefile | 1 + package/cryptsetup/Makefile | 1 + package/ctorrent/Makefile | 4 + package/cups/Makefile | 1 + package/curl/Makefile | 1 + package/cxxtools/Makefile | 4 + package/cyrus-sasl/Makefile | 1 + package/dansguardian/Makefile | 4 + package/davfs2/Makefile | 4 + package/dbus/Makefile | 1 + package/deco/Makefile | 1 + package/depmaker | 20 ++ package/digitemp/Makefile | 1 + package/dsniff/Makefile | 1 + package/elinks/Makefile | 1 + package/esound/Makefile | 1 + package/exmap/Makefile | 1 + package/fetchmail/Makefile | 3 + package/fprobe/Makefile | 1 + package/freeradius-client/Makefile | 1 + package/freeradius-server/Makefile | 10 + package/freetype/Makefile | 1 + package/gatling/Makefile | 1 + package/gcc/Makefile | 1 + package/gdb/Makefile | 1 + package/gettext/Makefile | 1 + package/git/Makefile | 1 + package/gkrellmd/Makefile | 1 + package/glib/Makefile | 1 + package/gmediaserver/Makefile | 1 + package/gnutls/Makefile | 1 + package/gpsd/Makefile | 4 + package/gtk+/Makefile | 1 + package/heimdal/Makefile | 7 + package/hostapd/Makefile | 1 + package/httping/Makefile | 1 + package/icecast/Makefile | 1 + package/id3lib/Makefile | 4 + package/iftop/Makefile | 1 + package/ipcad/Makefile | 1 + package/iperf/Makefile | 3 + package/iproute2/Makefile | 3 + package/ipsec-tools/Makefile | 1 + package/iptables-snmp/Makefile | 1 + package/iptraf/Makefile | 1 + package/irssi/Makefile | 4 + package/iw/Makefile | 1 + package/jamvm/Makefile | 1 + package/kismet/Makefile | 4 + package/knock/Makefile | 1 + package/krb5/Makefile | 1 + package/l2tpns/Makefile | 1 + package/less/Makefile | 1 + package/libICE/Makefile | 1 + package/libSM/Makefile | 1 + package/libX11/Makefile | 1 + package/libXaw/Makefile | 1 + package/libXext/Makefile | 1 + package/libXfont/Makefile | 1 + package/libXmu/Makefile | 1 + package/libXt/Makefile | 1 + package/libXv/Makefile | 1 + package/libXxf86dga/Makefile | 1 + package/libfontenc/Makefile | 1 + package/libgcrypt/Makefile | 1 + package/libgd/Makefile | 1 + package/libid3tag/Makefile | 1 + package/libnet/Makefile | 1 + package/libnids/Makefile | 1 + package/libp11/Makefile | 1 + package/libpng/Makefile | 1 + package/libshout/Makefile | 1 + package/libtirpc/Makefile | 1 + package/libtorrent/Makefile | 1 + package/libusb-compat/Makefile | 1 + package/libvirt/Makefile | 1 + package/libvorbis/Makefile | 1 + package/libxml2/Makefile | 1 + package/libxslt/Makefile | 1 + package/lighttpd/Makefile | 4 + package/links/Makefile | 1 + package/logrotate/Makefile | 1 + package/lynx/Makefile | 1 + package/madplay/Makefile | 1 + package/maradns/Makefile | 1 + package/mc/Makefile | 1 + package/miax/Makefile | 1 + package/mini_httpd/Makefile | 3 + package/miredo/Makefile | 3 + package/moc/Makefile | 1 + package/monit/Makefile | 1 + package/motion/Makefile | 3 + package/mpd/Makefile | 31 +++ package/mplayer/Makefile | 1 + package/mrd6/Makefile | 3 + package/mt-daapd/Makefile | 1 + package/mtr/Makefile | 1 + package/mutt/Makefile | 1 + package/mysql/Makefile | 1 + package/nano/Makefile | 1 + package/neon/Makefile | 1 + package/net-snmp/Makefile | 1 + package/nfs-utils/Makefile | 7 + package/nmap/Makefile | 4 + package/nss/Makefile | 1 + package/nut/Makefile | 9 + package/obexftp/Makefile | 1 + package/opencdk/Makefile | 1 + package/openct/Makefile | 1 + package/openldap/Makefile | 1 + package/openobex/Makefile | 1 + package/opensips/Makefile | 1 + package/openssh/Makefile | 7 + package/openssl-pkcs11/Makefile | 1 + package/openssl/Makefile | 1 + package/openswan/Makefile | 1 + package/openvpn/Makefile | 6 + package/oprofile/Makefile | 1 + package/osiris/Makefile | 1 + package/palantir/Makefile | 1 + package/parted/Makefile | 1 + package/pciutils/Makefile | 1 + package/php/Makefile | 28 +++ package/pkgmaker | 1 + package/pmacct/Makefile | 10 + package/popt/Makefile | 1 + package/portmap/Makefile | 3 + package/postgresql/Makefile | 1 + package/privoxy/Makefile | 1 + package/procps/Makefile | 1 + package/ptunnel/Makefile | 1 + package/quagga/Makefile | 1 + package/raddump/Makefile | 1 + package/rarpd/Makefile | 1 + package/readline/Makefile | 1 + package/rpm/Makefile | 1 + package/rrdcollect/Makefile | 1 + package/rrdtool/Makefile | 1 + package/rrs/Makefile | 7 + package/rsync/Makefile | 1 + package/rtorrent/Makefile | 1 + package/sane-backends/Makefile | 1 + package/scanlogd/Makefile | 1 + package/screen/Makefile | 1 + package/serdisplib/Makefile | 1 + package/siproxd/Makefile | 1 + package/sipsak/Makefile | 1 + package/sispmctl/Makefile | 1 + package/snort-wireless/Makefile | 1 + package/snort/Makefile | 1 + package/socat/Makefile | 1 + package/sqlite/Makefile | 1 + package/squid/Makefile | 1 + package/ssltunnel/Makefile | 1 + package/subversion/Makefile | 4 + package/swconfig/Makefile | 1 + package/syslog-ng/Makefile | 1 + package/tcpdump/Makefile | 1 + package/tinc/Makefile | 1 + package/tntnet/Makefile | 6 + package/tor/Makefile | 1 + package/ulogd/Makefile | 13 ++ package/usbutils/Makefile | 1 + package/ussp-push/Makefile | 1 + package/util-linux-ng/Makefile | 1 + package/vilistextum/Makefile | 1 + package/vim/Makefile | 1 + package/vnc-reflector/Makefile | 1 + package/vpnc/Makefile | 1 + package/vtun/Makefile | 1 + package/wdfs/Makefile | 1 + package/weechat/Makefile | 1 + package/wpa_supplicant/Makefile | 3 + package/xf86-video-cirrus/Makefile | 1 + package/xf86-video-geode/Makefile | 1 + package/xf86dga/Makefile | 1 + package/xfsprogs/Makefile | 1 + package/xkeyboard-config/Makefile | 1 + package/xorg-server/Makefile | 1 + 198 files changed, 410 insertions(+), 433 deletions(-) delete mode 100644 package/Depends.mk create mode 100644 package/depmaker (limited to 'package/pkgmaker') diff --git a/mk/build.mk b/mk/build.mk index 9f35a3827..c1828599f 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -79,6 +79,9 @@ include ${TOPDIR}/mk/split-cfg.mk all: world +${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config + mksh ${TOPDIR}/package/depmaker + .NOTPARALLEL: .PHONY: all world clean cleantarget cleandir distclean image_clean @@ -120,7 +123,7 @@ ${STAGING_DIR}/etc/ipkg.conf: ${STAGING_DIR}/etc echo "dest root /" >${STAGING_DIR}/etc/ipkg.conf echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf -package/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf +package/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk $(MAKE) -C package $(patsubst package/%,%,$@) target/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG diff --git a/package/Depends.mk b/package/Depends.mk deleted file mode 100644 index bf77d2106..000000000 --- a/package/Depends.mk +++ /dev/null @@ -1,425 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -aircrack-ng-compile: openssl-compile libpcap-compile -alsa-utils-compile: alsa-lib-compile -apr-util-compile: expat-compile apr-compile -arpd-compile: libpcap-compile libdnet-compile libevent-compile -arpwatch-compile: libpcap-compile -atftp-compile: readline-compile ncurses-compile -atk-compile: glib-compile -avahi-compile: libdaemon-compile expat-compile gdbm-compile glib-compile - -bind-compile: openssl-compile -bitlbee-compile: libiconv-compile openssl-compile glib-compile -bluez-compile: libusb-compile dbus-compile glib-compile -bogofilter-compile: libiconv-compile libdb-compile - -cairo-compile: libpng-compile pixman-compile freetype-compile fontconfig-compile libX11-compile -ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y) -cbtt-compile: uclibc++-compile -endif -cbtt-compile: mysql-compile zlib-compile -collectd-compile: libpthread-compile -cryptinit-compile: cryptsetup-compile -cryptsetup-compile: libgcrypt-compile popt-compile e2fsprogs-compile lvm-compile -ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y) -ctorrent-compile: uclibc++-compile -endif -ctorrent-compile: openssl-compile -cups-compile: zlib-compile -curl-compile: openssl-compile zlib-compile -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -cxxtools-compile: uclibc++-compile -endif -cxxtools-compile: libiconv-compile -cyrus-sasl-compile: openssl-compile - -ifeq (${ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX},y) -dansguardian-compile: uclibc++-compile -endif -dansguardian-compile: pcre-compile zlib-compile -ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},) -davfs2-compile: fuse-compile -endif -davfs2-compile: libiconv-compile neon-compile - -dbus-compile: expat-compile -deco-compile: ncurses-compile -dhcpv6-compile: libnl-compile ncurses-compile -digitemp-compile: libusb-compile libusb-compat-compile -dsniff-compile: libnids-compile openssl-compile gdbm-compile -elinks-compile: openssl-compile -esound-compile: libaudiofile-compile -ettercap-compile: pcap-compile libnet-compile -exmap-compile: glib-compile readline-compile -fprobe-compile: libpcap-compile -freetype-compile: zlib-compile -gatling-compile: libowfat-compile libiconv-compile -gcc-compile: gmp-compile mpfr-compile -gdb-compile: ncurses-compile readline-compile -gettext-compile: libiconv-compile libpthread-compile -git-compile: openssl-compile curl-compile expat-compile -gkrellmd-compile: glib-compile -glib-compile: gettext-compile libiconv-compile -gmediaserver-compile: id3lib-compile libupnp-compile -gnutls-compile: libgcrypt-compile liblzo-compile libtasn1-compile opencdk-compile zlib-compile ncurses-compile - -ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) -gpsd-compile: uclibc++-compile -endif -gpsd-compile: ncurses-compile - -gtk+-compile: cairo-compile atk-compile pango-compile libXext-compile renderproto-compile libXrender-compile - -ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y) -heimdal-compile: libdb-compile -endif -ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y) -heimdal-compile: openldap-compile -endif -heimdal-compile: openssl-compile ncurses-compile e2fsprogs-compile - -httping-compile: openssl-compile -icecast-compile: curl-compile libvorbis-compile libxml2-compile libxslt-compile -ifeq (${ADK_COMPILE_ID3LIB_WITH_UCLIBCXX},y) -id3lib-compile: uclibc++-compile -endif -id3lib-compile: zlib-compile libiconv-compile -iftop-compile: libpcap-compile libpthread-compile ncurses-compile -ipcad-compile: libpcap-compile -ifeq (${ADK_COMPILE_IPERF_WITH_UCLIBCXX},y) -iperf-compile: uclibc++-compile -endif -ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),) -iproute2-compile: linux-atm-compile -endif -ipsec-tools-compile: openssl-compile -iptables-snmp-compile: net-snmp-compile -iptraf-compile: ncurses-compile -irssi-compile: glib-compile ncurses-compile -iw-compile: libnl-compile -jamvm-compile: libffi-compile zlib-compile -ifeq (${ADK_COMPILE_KISMET_WITH_UCLIBCXX},y) -kismet-compile: uclibc++-compile -endif -kismet-compile: libpcap-compile ncurses-compile -knock-compile: libpcap-compile -krb5-compile: ncurses-compile e2fsprogs-compile -l2tpns-compile: libcli-compile -less-compile: ncurses-compile -libgcrypt-compile: libgpg-error-compile -libgd-compile: libpng-compile jpeg-compile -libid3tag-compile: zlib-compile -libnet-compile: libpcap-compile -libnids-compile: libnet-compile libpcap-compile -libp11-compile: openssl-compile libtool-compile -libpng-compile: zlib-compile -libshout-compile: libvorbis-compile -libusb-compat-compile: libusb-compile -libtirpc-compile: libgssglue-compile -libtorrent-compile: openssl-compile libsigc++-compile -libvorbis-compile: libogg-compile -libvirt-compile: libxml2-compile gnutls-compile python-compile -libfontenc-compile: xproto-compile zlib-compile -libICE-compile: xtrans-compile -libSM-compile: libICE-compile -libXt-compile: libSM-compile -libXv-compile: libX11-compile videoproto-compile -libXmu-compile: libXt-compile -libXext-compile: libX11-compile -libXaw-compile: libXext-compile libXmu-compile libXpm-compile -libX11-compile: xproto-compile xextproto-compile xtrans-compile libXdmcp-compile \ - libXau-compile xcmiscproto-compile bigreqsproto-compile kbproto-compile \ - inputproto-compile -libXfont-compile: freetype-compile fontcacheproto-compile fontsproto-compile libfontenc-compile -libxml2-compile: zlib-compile -libxslt-compile: libxml2-compile -ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) -lighttpd-compile: openssl-compile -endif -lighttpd-compile: pcre-compile libxml2-compile sqlite-compile -links-compile: openssl-compile libpng-compile jpeg-compile gpm-compile -logrotate-compile: popt-compile -lynx-compile: ncurses-compile openssl-compile zlib-compile -madplay-compile: libid3tag-compile libmad-compile -maradns-compile: libpthread-compile -mc-compile: glib-compile ncurses-compile -miax-compile: bluez-compile -ifeq (${ADK_COMPILE_MIREDO_WITH_UCLIBCXX},y) -miredo-compile: uclibc++-compile -endif -moc-compile: libvorbis-compile curl-compile libmad-compile flac-compile ffmpeg-compile -monit-compile: openssl-compile -ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) -mrd6-compile: uclibc++-compile -endif -mt-daapd-compile: gdbm-compile libid3tag-compile -mtr-compile: ncurses-compile -mutt-compile: ncurses-compile openssl-compile -mysql-compile: ncurses-compile zlib-compile readline-compile -nano-compile: ncurses-compile -neon-compile: libpthread-compile libxml2-compile openssl-compile zlib-compile -net-snmp-compile: libelf-compile -ifeq (${ADK_COMPILE_NFS_UTILS_WITH_KRB5},y) -nfs-utils-compile: libnfsidmap-compile krb5-compile libevent-compile libgssglue-compile librpcsecgss-compile -endif -ifeq (${ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL},y) -nfs-utils-compile: libnfsidmap-compile heimdal-compile libevent-compile librpcsecgss-compile -endif -nfs-utils-compile: libtirpc-compile -ifeq (${ADK_COMPILE_NMAP_WITH_UCLIBCXX},y) -nmap-compile: uclibc++-compile -endif -nmap-compile: pcre-compile libpcap-compile -obexftp-compile: openobex-compile libiconv-compile -opencdk-compile: libgcrypt-compile libgpg-error-compile zlib-compile -openct-compile: libtool-compile libusb-compile -openldap-compile: cyrus-sasl-compile openssl-compile libdb-compile -openobex-compile: bluez-compile -opensips-compile: openssl-compile -ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y) -openssh-compile: krb5-compile -endif -ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y) -openssh-compile: heimdal-compile -endif -openssh-compile: zlib-compile openssl-compile -openssl-compile: zlib-compile -openssl-pkcs11-compile: libp11-compile -openswan-compile: gmp-compile -oprofile-compile: popt-compile -osiris-compile: openssl-compile -palantir-compile: jpeg-compile -parted-compile: e2fsprogs-compile lvm-compile readline-compile -pciutils-compile: zlib-compile -popt-compile: libiconv-compile -ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),) -portmap-compile: tcp_wrappers-compile -endif -postgresql-compile: zlib-compile -privoxy-compile: pcre-compile -procps-compile: ncurses-compile -ptunnel-compile: libpcap-compile -quagga-compile: readline-compile ncurses-compile -raddump-compile: openssl-compile libpcap-compile -radiusclient-ng-compile: openssl-compile -rarpd-compile: libnet-compile -readline-compile: ncurses-compile -nss-compile: nspr-compile zlib-compile -rpm-compile: nss-compile libdb-compile -rrdcollect-compile: rrdtool-compile -rrdtool-compile: libxml2-compile cgilib-compile freetype-compile libart-compile libpng-compile -rsync-compile: popt-compile -rtorrent-compile: ncurses-compile libtorrent-compile curl-compile -sane-backends-compile: libpthread-compile libusb-compile -scanlogd-compile: libpcap-compile libnids-compile libnet-compile -screen-compile: ncurses-compile -serdisplib-compile: libgd-compile libusb-compile -siproxd-compile: libosip2-compile -sipsak-compile: openssl-compile -sispmctl-compile: libusb-compile -snort-compile: libnet-compile libpcap-compile pcre-compile -snort-wireless-compile: libnet-compile libpcap-compile pcre-compile -socat-compile: openssl-compile -sqlite-compile: ncurses-compile readline-compile -squid-compile: openssl-compile -ssltunnel-compile: openssl-compile ppp-compile -subversion-compile: apr-util-compile expat-compile apr-compile zlib-compile libiconv-compile -swconfig-compile: libnl-compile -syslog-ng-compile: libol-compile tcp_wrappers-compile -tcpdump-compile: libpcap-compile -tinc-compile: zlib-compile openssl-compile liblzo-compile -tntnet-compile: cxxtools-compile zlib-compile -ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},) -tntnet-compile: openssl-compile -else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},) -tntnet-compile: gnutls-compile -endif -tor-compile: libevent-compile openssl-compile zlib-compile -trafshow: ncurses-compile libpcap-compile -usbutils-compile: libusb-compile -ussp-push-compile: openobex-compile -util-linux-ng-compile: e2fsprogs-compile ncurses-compile -vilistextum-compile: libiconv-compile -vim-compile: ncurses-compile -vnc-reflector-compile: jpeg-compile zlib-compile -vpnc-compile: libgcrypt-compile libgpg-error-compile -vtun-compile: zlib-compile openssl-compile liblzo-compile -wdfs-compile: openssl-compile fuse-compile neon-compile glib-compile -weechat-compile: ncurses-compile gnutls-compile lua-compile libiconv-compile -wknock-compile: libpcap-compile -ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y) -wpa_supplicant-compile: openssl-compile -endif -wx200d-compile: postgresql-compile -xfsprogs-compile: e2fsprogs-compile -libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile -xkeyboard-config-compile: xkbcomp-compile -xf86-video-geode-compile: xorg-server-compile -xf86-video-cirrus-compile: xorg-server-compile -xf86dga-compile: libXxf86dga-compile -xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \ - damageproto-compile scrnsaverproto-compile resourceproto-compile \ - fontsproto-compile videoproto-compile compositeproto-compile \ - evieext-compile libxkbfile-compile libXfont-compile pixman-compile \ - libpciaccess-compile openssl-compile - -ifeq ($(ADK_PACKAGE_APR_THREADING),y) -apr-compile: libpthread-compile -endif - -asterisk-compile: ncurses-compile openssl-compile zlib-compile curl-compile popt-compile -ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),) -asterisk-compile: speex-compile -endif -ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),) -asterisk-compile: postgresql-compile -endif - -freeradius-client-compile: openssl-compile -freeradius-server-compile: libtool-compile openssl-compile -ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),) -freeradius-server-compile: openldap-compile -endif -ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),) -freeradius-server-compile: mysql-compile -endif -ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),) -freeradius-server-compile: postgresql-compile -endif - -hostapd-compile: libnl-compile openssl-compile - -ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),) -mini_httpd-compile: openssl-compile -endif - -ifneq ($(ADK_PACKAGE_MOTION),) -motion-compile: jpeg-compile -endif - -mplayer-compile: alsa-lib-compile libmad-compile libvorbis-compile faad2-compile ncurses-compile zlib-compile - -mpd-compile: alsa-lib-compile glib-compile - -ifneq ($(ADK_COMPILE_MPD_WITH_MP3),) -mpd-compile: libid3tag-compile libmad-compile -endif -ifneq ($(ADK_COMPILE_MPD_WITH_MP4),) -mpd-compile: faad2-compile -endif -ifneq ($(ADK_COMPILE_MPD_WITH_OGG),) -mpd-compile: libvorbis-compile -endif -ifneq ($(ADK_COMPILE_MPD_WITH_TREMOR),) -mpd-compile: libvorbisidec-compile -endif -ifneq ($(ADK_COMPILE_MPD_WITH_FLAC),) -mpd-compile: flac-compile -endif -ifneq ($(ADK_COMPILE_MPD_WITH_WAV),) -mpd-compile: libaudiofile-compile -endif -ifneq ($(ADK_COMPILE_MPD_WITH_SHOUT),) -mpd-compile: lame-compile -endif -ifneq ($(ADK_COMPILE_MPD_WITH_CURL),) -mpd-compile: curl-compile -endif -ifneq ($(ADK_COMPILE_MPD_WITH_MMS),) -mpd-compile: libmms-compile -endif -ifneq ($(ADK_COMPILE_MPD_WITH_FFMPEG),) -mpd-compile: ffmpeg-compile -endif - -ifneq (${ADK_PACKAGE_NUT_SSL},) -nut-compile: openssl-compile -endif -ifneq (${ADK_PACKAGE_NUT_USB},) -nut-compile: libusb-compile -endif -ifneq (${ADK_PACKAGE_NUT_SNMP},) -nut-compile: net-snmp-compile -endif - -ifeq ($(ADK_PACKAGE_LIBOPENSSL),y) -openvpn-compile: openssl-compile -endif -ifeq ($(ADK_PACKAGE_OPENVPN_LZO),y) -openvpn-compile: liblzo-compile -endif - -php-compile: openssl-compile zlib-compile -ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),) -php-compile: curl-compile -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_GD),) -php-compile: libgd-compile libpng-compile -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),) -php-compile: gmp-compile -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),) -php-compile: openldap-compile -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_MYSQL),) -php-compile: mysql-compile -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_PCRE),) -php-compile: pcre-compile -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),) -php-compile: postgresql-compile -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_SQLITE),) -php-compile: sqlite-compile -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_XML),) -php-compile: expat-compile -endif - -pmacct-compile: libpcap-compile -ifneq ($(ADK_COMPILE_PMACCT_MYSQL),) -pmacct-compile: mysql-compile -endif -ifneq ($(ADK_COMPILE_PMACCT_PGSQL),) -pmacct-compile: postgresql-compile -endif -ifneq ($(ADK_COMPILE_PMACCT_SQLITE),) -pmacct-compile: sqlite-compile -endif - -ifeq (${ADK_COMPILE_RRS_WITH_UCLIBCXX},y) -rrs-compile: uclibc++-compile -endif -rrs-compile: zlib-compile -ifneq ($(ADK_PACKAGE_RRS),) -rrs-compile: openssl-compile -endif - -ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),) -subversion-compile: neon-compile -endif - -ulogd-compile: iptables-compile -ifneq ($(ADK_PACKAGE_ULOGD_MOD_MYSQL),) -ulogd-compile: mysql-compile -endif -ifneq ($(ADK_PACKAGE_ULOGD_MOD_PCAP),) -ulogd-compile: libpcap-compile -endif -ifneq ($(ADK_PACKAGE_ULOGD_MOD_PGSQL),) -ulogd-compile: postgresql-compile -endif -ifneq ($(ADK_PACKAGE_ULOGD_MOD_SQLITE),) -ulogd-compile: sqlite-compile -endif -ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y) -fetchmail-compile: openssl-compile -endif -ifeq (${ADK_PACKAGE_IRSSI_SSL},y) -irssi-compile: openssl-compile -endif - diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index db1099923..c03c57915 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= aircrack-ng PKG_VERSION:= 1.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl libpcap PKG_MD5SUM:= dafbfaf944ca9d523fde4bae86f0c067 PKG_DESCR:= set of tools for auditing wireless networks PKG_SECTION:= net PKG_DEPENDS:= libpthread libopenssl libpcap -PKG_BUILDDEP:= openssl libpcap PKG_URL:= http://www.aircrack-ng.org PKG_SITES:= http://download.aircrack-ng.org/ diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 936ef8119..9cbf7356c 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils PKG_VERSION:= 1.0.21 PKG_RELEASE:= 1 +PKG_BUILDDEP+= alsa-lib PKG_MD5SUM:= 3672287c2608040d111ce45495ba7602 PKG_DESCR:= ALSA mixer utility PKG_DEPENDS:= alsa-lib -PKG_BUILDDEP:= alsa-lib PKG_SECTION:= utils PKG_URL:= http://www.alsa-project.org PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index ecc96942f..6b4142600 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= apr-util PKG_VERSION:= 0.9.15 PKG_RELEASE:= 1 +PKG_BUILDDEP+= expat apr PKG_MD5SUM:= dc772ae295f49ddb8ee8e69a9716c53b PKG_DESCR:= Apache Portable Runtime utility library PKG_SECTION:= libs diff --git a/package/apr/Makefile b/package/apr/Makefile index 24210df59..bc9758d8e 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -6,9 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= apr PKG_VERSION:= 0.9.17 PKG_RELEASE:= 1 +ifeq ($(ADK_PACKAGE_APR_THREADING),y) +PKG_BUILDDEP+= libpthread +endif PKG_MD5SUM:= ca1e22d98081a03a33c2a0b8684eb192 PKG_DESCR:= Apache Portable Runtime library -PKG_BUILDDEP:= expat apr PKG_SECTION:= libs PKG_URL:= http://apr.apache.org PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 3c8a71b91..2dc9cfed8 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= arpd PKG_VERSION:= 0.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap libdnet libevent PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d PKG_DESCR:= Generates ARP responses for IP address ranges PKG_SECTION:= net PKG_DEPENDS:= libpcap libdnet libevent -PKG_BUILDDEP:= libpcap libdnet libevent PKG_URL:= http://niels.xtdnet.nl/honeyd/ PKG_SITES:= http://niels.xtdnet.nl/honeyd/ diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index 1b3c0d7aa..7f181cb31 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= arpwatch PKG_VERSION:= 2.1a15 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap PKG_MD5SUM:= cebfeb99c4a7c2a6cee2564770415fe7 PKG_DESCR:= Ethernet monitor program for keeping track of ethernet/ip address pairings PKG_SECTION:= net diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index ecb33b52d..228707faf 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -6,6 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk PKG_VERSION:= 1.4.27.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses openssl zlib curl popt +ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),) +PKG_BUILDDEP+= speex +endif +ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),) +PKG_BUILDDEP+= postgresql +endif PKG_MD5SUM:= e09ca163a6e90018c92c65a50b9ec398 PKG_DESCR:= Open Source PBX PKG_SECTION:= net diff --git a/package/atftp/Makefile b/package/atftp/Makefile index 1582a81b5..7cea94e68 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= atftp PKG_VERSION:= 0.7 PKG_RELEASE:= 2 +PKG_BUILDDEP+= readline ncurses PKG_MD5SUM:= 3b27365772d918050b2251d98a9c7c82 PKG_DESCR:= TFTP client PKG_SECTION:= net PKG_DEPENDS:= libreadline libncurses -PKG_BUILDDEP:= readline ncurses PKG_URL:= http://freshmeat.net/projects/atftp PKG_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ PKG_DESCR_1:= TFTP server diff --git a/package/atk/Makefile b/package/atk/Makefile index 70f6faf9d..f7172b76b 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -6,9 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= atk PKG_VERSION:= 1.29.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= glib PKG_MD5SUM:= f587d9285b2d0ac35ea95acef673517c PKG_DESCR:= atk library -PKG_BUILDDEP:= glib PKG_SECTION:= libs PKG_URL:= http://www.gnome.org PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/1.29/} diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 047824ebf..a85b4dcd1 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= avahi PKG_VERSION:= 0.6.25 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libdaemon expat gdbm glib PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e PKG_DESCR:= mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon PKG_SECTION:= net PKG_DEPENDS:= libavahi libdaemon libexpat -PKG_BUILDDEP:= libdaemon expat gdbm glib PKG_URL:= http://avahi.org PKG_SITES:= http://avahi.org/download/ diff --git a/package/bind/Makefile b/package/bind/Makefile index a4e783e03..e1adae348 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bind PKG_VERSION:= 9.4.1 PKG_RELEASE:= 4 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= 09b54d35036cb0423b2e618f21766285 PKG_DESCR:= popular DNS server PKG_SECTION:= net diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index ccfea817f..8efc3c104 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bitlbee PKG_VERSION:= 1.2.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libiconv openssl glib PKG_MD5SUM:= 2b1674d98804970809de3da3edf0bed2 PKG_DESCR:= IRC gateway to IM chat networks PKG_SECTION:= net diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 8ba8f00ca..8abb8954d 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bluez PKG_VERSION:= 4.57 PKG_RELEASE:= 2 +PKG_BUILDDEP+= libusb dbus glib PKG_MD5SUM:= dc29e54f1204ac4215caeeee062b26f6 PKG_DESCR:= bluetooth libraries and applications PKG_SECTION:= bluetooth diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index dc7bb574c..5b88d1b5c 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bogofilter PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libiconv libdb PKG_MD5SUM:= 4bbc9adc30d4f8e3a547f9be18a1cb74 PKG_DESCR:= mail filter PKG_SECTION:= mail diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 7dd034a18..39e1caf35 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo PKG_VERSION:= 1.8.8 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpng pixman freetype fontconfig libX11 PKG_MD5SUM:= d3e1a1035ae563812d4dd44a74fb0dd0 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile index 913b2d8e6..569fd9916 100644 --- a/package/cbtt/Makefile +++ b/package/cbtt/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cbtt PKG_VERSION:= 20060211 PKG_RELEASE:= 1 +PKG_BUILDDEP+= mysql zlib +ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 19abea2817c49ccc9438e9671c402984 PKG_DESCR:= Bittorrent tracker PKG_SECTION:= net diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 84de63ccb..076fa0063 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= collectd PKG_VERSION:= 4.7.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpthread PKG_MD5SUM:= b077e3398bd6fac0e53e9df4794db264 PKG_DESCR:= System statistics collection daemon PKG_SECTION:= console diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index f186247f7..5f1d250bf 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cryptinit PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= cryptsetup PKG_DESCR:= init for encrypted rootfilesystem PKG_SECTION:= base diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index c9970fe7a..ad4129fee 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cryptsetup PKG_VERSION:= 1.0.7 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm PKG_MD5SUM:= 5eea2a77391a8a1a651b31cbaef59e22 PKG_DESCR:= LUKS cryptsetup tools PKG_SECTION:= crypto diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index a73cef591..db9c54378 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ctorrent PKG_VERSION:= dnh3.3.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl +ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= net diff --git a/package/cups/Makefile b/package/cups/Makefile index 608b043b7..fc9db155b 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cups PKG_VERSION:= 1.4.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib PKG_MD5SUM:= d95e2d588e3d36e563027a963b117b1b PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net diff --git a/package/curl/Makefile b/package/curl/Makefile index 69768dc63..52b05d89d 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= curl PKG_VERSION:= 7.19.7 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl zlib PKG_MD5SUM:= ecb2e37e45c9933e2a963cabe03670ab PKG_DESCR:= a client-side URL transfer tool PKG_SECTION:= net diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 36e91f35c..a8b926ba9 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cxxtools PKG_VERSION:= 1.4.8 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libiconv +ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af PKG_DESCR:= a collection of general-purpose C++ classes PKG_SECTION:= net diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index 4b8dabba2..60bb943ef 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cyrus-sasl PKG_VERSION:= 2.1.22 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= 45dde9d19193ae9dd388eb68b2027bc9 PKG_DESCR:= a general purpose authentication library PKG_SECTION:= libs diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 2a21584c5..6397610e6 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dansguardian PKG_VERSION:= 2.10.1.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= pcre zlib +ifeq (${ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a PKG_DESCR:= web content filter proxy PKG_SECTION:= net diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index ffd292acd..00480bc32 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME= davfs2 PKG_VERSION= 1.3.3 PKG_RELEASE= 1 +PKG_BUILDDEP+= libiconv neon +ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},) +PKG_BUILDDEP+= fuse +endif PKG_MD5SUM= 57def26e4d6d63527e01612d10fd0515 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= admin diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 46739bfa2..6bb63c302 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dbus PKG_VERSION:= 1.2.16 PKG_RELEASE:= 1 +PKG_BUILDDEP+= expat PKG_MD5SUM:= c7a47b851ebe02f6726b65b78d1b730b PKG_DESCR:= DBUS library PKG_SECTION:= net diff --git a/package/deco/Makefile b/package/deco/Makefile index 0a0fe35dd..d0cab8dba 100644 --- a/package/deco/Makefile +++ b/package/deco/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= deco PKG_VERSION:= 39 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses PKG_MD5SUM:= f77f60e8be0cae1f814cba1ef61bf4d0 PKG_DESCR:= Text-based, full featured file manager PKG_SECTION:= misc diff --git a/package/depmaker b/package/depmaker new file mode 100644 index 000000000..06f5a9e28 --- /dev/null +++ b/package/depmaker @@ -0,0 +1,20 @@ +cd "$(dirname "$0")" +export TOPDIR=$(realpath ..) +if gmake --help >/dev/null 2>&1; then + export GMAKE=gmake +else + export GMAKE=make +fi + +for subdir in */Makefile; do + subdir=${subdir%/*} + cd $subdir + deps=$($GMAKE show=PKG_BUILDDEP) + cd .. + [[ -n $deps ]] || continue + x="${subdir}-compile:" + for dep in $deps; do + x="$x ${dep}-compile" + done + print -r -- $x +done >Depends.mk diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index 13cc6bedc..a03d7e1f1 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= digitemp PKG_VERSION:= 3.6.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libusb libusb-compat PKG_MD5SUM:= 9be2e48db37920f21925ae6e88f83b84 PKG_DESCR:= simple to use program for reading values from 1-wire devices PKG_SECTION:= misc diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile index bd54813c5..3e7925e41 100644 --- a/package/dsniff/Makefile +++ b/package/dsniff/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dsniff PKG_VERSION:= 2.4b1 PKG_RELEASE:= 2 +PKG_BUILDDEP+= libnids openssl gdbm PKG_MD5SUM:= 2f761fa3475682a7512b0b43568ee7d6 PKG_DESCR:= tools for network auditing and penetration testing PKG_SECTION:= net diff --git a/package/elinks/Makefile b/package/elinks/Makefile index d4f3d8641..cb810d76f 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= elinks PKG_VERSION:= 0.11.7 PKG_RELEASE:= 2 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= 145c510cae41c204d0f23dce4bdd23ab PKG_DESCR:= advanced text web browser PKG_SECTION:= text diff --git a/package/esound/Makefile b/package/esound/Makefile index 123ade95c..b6ceecc2c 100644 --- a/package/esound/Makefile +++ b/package/esound/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= esound PKG_VERSION:= 0.2.41 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libaudiofile PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688 PKG_DESCR:= Enlightened Sound Daemon PKG_SECTION:= net diff --git a/package/exmap/Makefile b/package/exmap/Makefile index 092ba4a34..c21e25a40 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= exmap PKG_VERSION:= 0.4.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= glib readline PKG_MD5SUM:= 55aec784e214037e61400287a55b5426 PKG_DESCR:= memory analysing tool PKG_SECTION:= utils diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index c35add42e..22a616412 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= fetchmail PKG_VERSION:= 6.3.9 PKG_RELEASE:= 1 +ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y) +PKG_BUILDDEP+= openssl +endif PKG_MD5SUM:= 72c20ad2b9629f1a109668b05a84d823 PKG_DESCR:= fetch mail from a POP, IMAP, ETRN, or ODMR-capable server PKG_SECTION:= text diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile index 66d2b4abf..6e4edf980 100644 --- a/package/fprobe/Makefile +++ b/package/fprobe/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= fprobe PKG_VERSION:= 1.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap PKG_MD5SUM:= 65850d0470078269b33eee58cba77ac2 PKG_DESCR:= NetFlow probe PKG_SECTION:= net diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile index 19f6a236c..6eaa74e8a 100644 --- a/package/freeradius-client/Makefile +++ b/package/freeradius-client/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= freeradius-client PKG_VERSION:= 1.1.6 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= edd4d904e802ff66d35532be1475cfa7 PKG_DESCR:= RADIUS client PKG_SECTION:= net diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index 1e5304103..2a6b5404f 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -6,6 +6,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= freeradius-server PKG_VERSION:= 2.1.7 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libtool openssl +ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),) +PKG_BUILDDEP+= openldap +endif +ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),) +PKG_BUILDDEP+= mysql +endif +ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),) +PKG_BUILDDEP+= postgresql +endif PKG_MD5SUM:= b1f77c5e3116bcb0ac0aa9080a06ebf1 PKG_DESCR:= a flexible RADIUS server PKG_SECTION:= net diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 63700c539..ead8b9fc8 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libfreetype PKG_VERSION:= 2.3.11 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib PKG_MD5SUM:= 519c7cbf5cbd72ffa822c66844d3114c PKG_DESCR:= A free, high-quality and portable font engine PKG_SECTION:= libs diff --git a/package/gatling/Makefile b/package/gatling/Makefile index 623008b31..d8efdb125 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME= gatling PKG_VERSION= 0.10 PKG_RELEASE= 1 +PKG_BUILDDEP+= libowfat libiconv PKG_MD5SUM= 04e8434156d91657c77a8a038c5b27cf PKG_DESCR:= small non-forking webserver PKG_SECTION:= net diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 0e6384a5b..074b9a711 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -8,6 +8,7 @@ PKG_DESCR:= GNU compiler collection PKG_SECTION:= comp PKG_DEPENDS:= mpfr PKG_OPTS:= noremove +PKG_BUILDDEP+= gmp mpfr include ${TOPDIR}/mk/package.mk diff --git a/package/gdb/Makefile b/package/gdb/Makefile index bd3c14cfb..b8cbfd502 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -7,6 +7,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_DESCR:= GNU debugger PKG_SECTION:= comp PKG_DEPENDS:= libthread_db libncurses +PKG_BUILDDEP+= ncurses readline include ${TOPDIR}/mk/package.mk diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 6d1349a0c..248eea1ea 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME= gettext PKG_VERSION= 0.16.1 PKG_RELEASE= 1 +PKG_BUILDDEP+= libiconv libpthread PKG_MD5SUM= 3d9ad24301c6d6b17ec30704a13fe127 PKG_DESCR:= internationalisation library PKG_SECTION:= libs diff --git a/package/git/Makefile b/package/git/Makefile index d8a3ca22e..312e758ef 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git PKG_VERSION:= 1.6.5.5 PKG_RELEASE:= 2 +PKG_BUILDDEP+= openssl curl expat PKG_MD5SUM:= 50fb736021ef89916af622cb4772bbea PKG_DESCR:= fast version control system PKG_SECTION:= misc diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile index dba286e4b..51daec7b3 100644 --- a/package/gkrellmd/Makefile +++ b/package/gkrellmd/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gkrellmd PKG_VERSION:= 2.3.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= glib PKG_MD5SUM:= db8a983a60577a6b4886db96d6def011 PKG_DESCR:= The GNU Krell Monitors Server PKG_SECTION:= net diff --git a/package/glib/Makefile b/package/glib/Makefile index 4d555f7bf..a2e5a3fc2 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib PKG_VERSION:= 2.22.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= gettext libiconv PKG_MD5SUM:= 00eb873975e2ef9361b8177131c7c943 PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index bfc0f135c..eb38904cd 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gmediaserver PKG_VERSION:= 0.13.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= id3lib libupnp PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3 PKG_DESCR:= An UPnP music media server PKG_SECTION:= net diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 235be1de4..8d2c41abc 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gnutls PKG_VERSION:= 2.8.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libgcrypt liblzo libtasn1 opencdk zlib ncurses PKG_MD5SUM:= e3b2788b79bfc82acbe717e3c54d4e92 PKG_DESCR:= GNU TLS library PKG_SECTION:= libs diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index ced495739..30e30e5a6 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gpsd PKG_VERSION:= 2.39 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses +ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 3db437196a6840c252fca99b6c19d4d0 PKG_DESCR:= An interface daemon for GPS receivers PKG_SECTION:= net diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index d4e3b19e9..45e00ca4a 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gtk+ PKG_VERSION:= 2.18.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= cairo atk pango libXext renderproto libXrender PKG_MD5SUM:= 8b34f75642ff6cc783dfa7e3af0ba443 PKG_DESCR:= GTK+ library PKG_SECTION:= libs diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 4af746246..ae97de3a3 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -6,6 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= heimdal PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl ncurses e2fsprogs +ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y) +PKG_BUILDDEP+= libdb +endif +ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y) +PKG_BUILDDEP+= openldap +endif PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e PKG_DESCR:= Kerberos 5 server PKG_SECTION:= net diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index cf6b8c73c..2bf6da3b3 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= hostapd PKG_VERSION:= 0.6.9 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libnl openssl PKG_MD5SUM:= 83630d11fa66ade9091f1b304fccd74c PKG_DESCR:= an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator PKG_SECTION:= net diff --git a/package/httping/Makefile b/package/httping/Makefile index e494d9bd2..7d4e0b754 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= httping PKG_VERSION:= 1.3.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= 41c912a9ecc904e51d7260053fc2195c PKG_DESCR:= Httping is like 'ping' but for http-requests PKG_SECTION:= net diff --git a/package/icecast/Makefile b/package/icecast/Makefile index 55ac16f1e..fe9d193ca 100644 --- a/package/icecast/Makefile +++ b/package/icecast/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= icecast PKG_VERSION:= 2.3.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= curl libvorbis libxml2 libxslt PKG_MD5SUM:= ff516b3ccd2bcc31e68f460cd316093f PKG_DESCR:= A streaming media server PKG_SECTION:= net diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index f7c7976a4..d27b46369 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= id3lib PKG_VERSION:= 3.8.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib libiconv +ifeq (${ADK_COMPILE_ID3LIB_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 19f27ddd2dda4b2d26a559a4f0f402a7 PKG_DESCR:= An ID3v1/ID3v2 tagging library PKG_SECTION:= libs diff --git a/package/iftop/Makefile b/package/iftop/Makefile index 0a83c3b8e..a5bd4e555 100644 --- a/package/iftop/Makefile +++ b/package/iftop/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iftop PKG_VERSION:= 0.17 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap libpthread ncurses PKG_MD5SUM:= 062bc8fb3856580319857326e0b8752d PKG_DESCR:= display bandwith usage on an interface PKG_SECTION:= net diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile index 2c96da8b7..d238b86ab 100644 --- a/package/ipcad/Makefile +++ b/package/ipcad/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ipcad PKG_VERSION:= 3.7.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap PKG_MD5SUM:= 125605249958894148ec26d3c88189f5 PKG_DESCR:= IP Cisco Accounting Daemon PKG_SECTION:= net diff --git a/package/iperf/Makefile b/package/iperf/Makefile index dfc9b4732..139aa8608 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iperf PKG_VERSION:= 2.0.4 PKG_RELEASE:= 1 +ifeq (${ADK_COMPILE_IPERF_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 8c5bc14cc2ea55f18f22afe3c23e3dcb PKG_DESCR:= Internet Protocol bandwidth measuring tool PKG_SECTION:= net diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index feae51b1c..00d453020 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iproute2 PKG_VERSION:= 2.6.29-1 PKG_RELEASE:= 2 +ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),) +PKG_BUILDDEP+= linux-atm +endif PKG_MD5SUM:= c1bc258a6c345905e79935ac7a3cc582 PKG_DESCR:= iproute2 routing control utility PKG_SECTION:= net diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index f33dfca0e..f17d09f22 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ipsec-tools PKG_VERSION:= 0.7.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= 72861f005746ee27984b2ee715ecc629 PKG_DESCR:= IPsec management tools PKG_SECTION:= net diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile index a05a07d4d..4b3bff57f 100644 --- a/package/iptables-snmp/Makefile +++ b/package/iptables-snmp/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= iptables-snmp PKG_VERSION:= 0.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= net-snmp PKG_MD5SUM:= 8370d2f0c899461a053da491400119d1 PKG_DESCR:= iptables support for net-snmp PKG_SECTION:= net diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index d8d01ef8b..ccd333219 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptraf PKG_VERSION:= 3.0.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses PKG_MD5SUM:= 377371c28ee3c21a76f7024920649ea8 PKG_DESCR:= A console-based network monitoring program. PKG_SECTION:= net diff --git a/package/irssi/Makefile b/package/irssi/Makefile index 35f196048..68079651b 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= irssi PKG_VERSION:= 0.8.13 PKG_RELEASE:= 1 +PKG_BUILDDEP+= glib ncurses +ifeq (${ADK_PACKAGE_IRSSI_SSL},y) +PKG_BUILDDEP+= openssl +endif PKG_MD5SUM:= 0d6fc2203832b514eff014fffd574664 PKG_DESCR:= IRC text client PKG_SECTION:= text diff --git a/package/iw/Makefile b/package/iw/Makefile index 606fbadf6..786dda0fb 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iw PKG_VERSION:= 0.9.17 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libnl PKG_MD5SUM:= 427841093ac11c5cbc025a3e13aac139 PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211) PKG_SECTION:= net diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 6b4c7782e..3668e5562 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= jamvm PKG_VERSION:= 1.5.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libffi zlib PKG_MD5SUM:= ce886163658d748113b0570dfae12aea PKG_DESCR:= A Java Virtual Machine (JVM) implementation PKG_SECTION:= misc diff --git a/package/kismet/Makefile b/package/kismet/Makefile index 1cff83cd8..160cc75a4 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= kismet PKG_VERSION:= 2008-05-R1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap ncurses +ifeq (${ADK_COMPILE_KISMET_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 6ee365d36354b4dee4945e67f8149294 PKG_SITES:= http://www.kismetwireless.net/code/ diff --git a/package/knock/Makefile b/package/knock/Makefile index c99b9a7b5..60c0af0bb 100644 --- a/package/knock/Makefile +++ b/package/knock/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= knock PKG_VERSION:= 0.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap PKG_MD5SUM:= ca09d61458974cff90a700aba6120891 PKG_DESCR:= A port-knocking client PKG_SECTION:= net diff --git a/package/krb5/Makefile b/package/krb5/Makefile index f1261ba64..41742cb64 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= krb5 PKG_VERSION:= 1.7 PKG_RELEASE:= 2 +PKG_BUILDDEP+= ncurses e2fsprogs PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564 PKG_DESCR:= MIT kerberos server PKG_SECTION:= net diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile index b3512d9f0..a87f1e79f 100644 --- a/package/l2tpns/Makefile +++ b/package/l2tpns/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= l2tpns PKG_VERSION:= 2.1.21 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libcli PKG_MD5SUM:= 385c58055723ebc6c38062acd2db9c2c PKG_DESCR:= A layer 2 tunneling protocol network server (LNS) PKG_SECTION:= net diff --git a/package/less/Makefile b/package/less/Makefile index 38e963bd3..ff82edefc 100644 --- a/package/less/Makefile +++ b/package/less/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= less PKG_VERSION:= 429 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses PKG_MD5SUM:= 206f2f13b9b0a35e45df660fcb6af31d PKG_DESCR:= A text mode pager PKG_SECTION:= text diff --git a/package/libICE/Makefile b/package/libICE/Makefile index 75931d4f2..d779ab1db 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libICE PKG_VERSION:= 1.0.6 PKG_RELEASE:= 1 +PKG_BUILDDEP+= xtrans PKG_MD5SUM:= 4a8f09f15fc92196b91d61e2dc9afcea PKG_DESCR:= Inter-Client Exchange library PKG_SECTION:= x11 diff --git a/package/libSM/Makefile b/package/libSM/Makefile index e7114af7b..d00f16fb0 100644 --- a/package/libSM/Makefile +++ b/package/libSM/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libSM PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libICE PKG_MD5SUM:= 1ee90d479298e48df7bb86a7ccbe00c9 PKG_DESCR:= X11 Session Management library PKG_SECTION:= x11 diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 6a820cf15..3e76da9eb 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libX11 PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto PKG_MD5SUM:= b68aebbfcac1174c4c95d260e9369766 PKG_DESCR:= X11 client-side library PKG_SECTION:= x11 diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile index 15beb5fdb..fd707feb1 100644 --- a/package/libXaw/Makefile +++ b/package/libXaw/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXaw PKG_VERSION:= 1.0.7 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libXext libXmu libXpm PKG_MD5SUM:= 67662e6b2dceb2907159215c83364c5a PKG_DESCR:= X11 Athena Widget library PKG_SECTION:= x11 diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 7eb32914e..259a66019 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXext PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libX11 PKG_MD5SUM:= 6b61b3f657befded8ae66e04085c413e PKG_DESCR:= X client interface to extensions of the X protocol PKG_SECTION:= x11 diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index 9b8243bdf..e6dcbd766 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXfont PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= freetype fontcacheproto fontsproto libfontenc PKG_MD5SUM:= bf134b9f79a7fc6507577bf5b6d4f412 PKG_DESCR:= X font Library PKG_SECTION:= x11 diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile index 21d42aa38..ae021e974 100644 --- a/package/libXmu/Makefile +++ b/package/libXmu/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXmu PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libXt PKG_MD5SUM:= f49e3587cdc299707da0786a681f9c05 PKG_DESCR:= miscellaneous utility functions for X libraries PKG_SECTION:= x11 diff --git a/package/libXt/Makefile b/package/libXt/Makefile index e004885a3..e14d75f1a 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXt PKG_VERSION:= 1.0.7 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libSM PKG_MD5SUM:= 28f627c7a5ca08c2413ce91d21c177d8 PKG_DESCR:= X Toolkit Intrinsics PKG_SECTION:= x11 diff --git a/package/libXv/Makefile b/package/libXv/Makefile index 025f52bc1..9d51fbf1c 100644 --- a/package/libXv/Makefile +++ b/package/libXv/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXv PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libX11 videoproto PKG_MD5SUM:= 6ee98790de6b3cd470074e60057d5c5c PKG_DESCR:= X11 Xvideo extensions PKG_SECTION:= x11 diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile index 4259e7735..c850aa81e 100644 --- a/package/libXxf86dga/Makefile +++ b/package/libXxf86dga/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXxf86dga PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= xf86dgaproto libXext libXaw PKG_MD5SUM:= ecb81708157e1a1eeaba0e124f0ade08 PKG_DESCR:= client library for the XFree86-DGA extension PKG_SECTION:= x11 diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile index 5776c67f3..f815b6c72 100644 --- a/package/libfontenc/Makefile +++ b/package/libfontenc/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libfontenc PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= xproto zlib PKG_MD5SUM:= 0fa1988d08021225d18ced519a30d2b1 PKG_DESCR:= helps to deal with different encodings of fonts PKG_SECTION:= x11 diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 4ee013601..49b89f430 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libgcrypt PKG_VERSION:= 1.4.4 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libgpg-error PKG_MD5SUM:= 9e6dcf7fef1ae96b57207a1de91fdaa4 PKG_DESCR:= GNU crypto library PKG_SECTION:= libs diff --git a/package/libgd/Makefile b/package/libgd/Makefile index e84ad6066..b6eac8885 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gd PKG_VERSION:= 2.0.35 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpng jpeg PKG_MD5SUM:= 982963448dc36f20cb79b6e9ba6fdede PKG_DESCR:= A library for the dynamic creation of images PKG_SECTION:= libs diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile index 34b2417cc..3ab98c3c2 100644 --- a/package/libid3tag/Makefile +++ b/package/libid3tag/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libid3tag PKG_VERSION:= 0.15.1b PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib PKG_MD5SUM:= e5808ad997ba32c498803822078748c3 PKG_DESCR:= an ID3 tag manipulation library PKG_SECTION:= libs diff --git a/package/libnet/Makefile b/package/libnet/Makefile index 26f2d23bd..e1ad7ca7b 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libnet PKG_VERSION:= 1.1.4 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap PKG_MD5SUM:= c5e06418a89cc4209f677a776a798fd9 PKG_DESCR:= a low-level packet creation library PKG_SECTION:= libs diff --git a/package/libnids/Makefile b/package/libnids/Makefile index fe439d17c..3129465d3 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libnids PKG_VERSION:= 1.23 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libnet libpcap PKG_MD5SUM:= af35e8ef403a0ca95df2da94db856428 PKG_DESCR:= Network Intrusion Detection System library PKG_SECTION:= libs diff --git a/package/libp11/Makefile b/package/libp11/Makefile index 12565f97c..92ab3a367 100644 --- a/package/libp11/Makefile +++ b/package/libp11/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libp11 PKG_VERSION:= 0.2.4 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl libtool PKG_MD5SUM:= 9e2c5cbececde245e2d2f535bd49ce35 PKG_DESCR:= library implementing a small layer on top of PKCS11 API PKG_SECTION:= libs diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 9a685a1a3..d8f206b59 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libpng PKG_VERSION:= 1.2.36 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib PKG_MD5SUM:= 4779cd011409ea9b591e11638781f0bf PKG_DESCR:= A library for reading/writing PNG images PKG_SECTION:= libs diff --git a/package/libshout/Makefile b/package/libshout/Makefile index f91cd809c..fef009845 100644 --- a/package/libshout/Makefile +++ b/package/libshout/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libshout PKG_VERSION:= 2.2.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libvorbis PKG_MD5SUM:= 4f75fc9901c724b712c371c9a1e782d3 PKG_DESCR:= Library which can be used to write a source client for streaming PKG_SECTION:= libs diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 08031a3c8..8b48c0818 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtirpc PKG_VERSION:= 0.2.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libgssglue PKG_MD5SUM:= b3b513a8825aa227deac63ea38c64f41 PKG_DESCR:= a transport independent RPC library PKG_SECTION:= libs diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 331086440..5df9a7040 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtorrent PKG_VERSION:= 0.12.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl libsigc++ PKG_MD5SUM:= fe8155d364b220713074423100d4bf29 PKG_DESCR:= A bittorrent library PKG_SECTION:= libs diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile index 81dcfcd49..63048e40c 100644 --- a/package/libusb-compat/Makefile +++ b/package/libusb-compat/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libusb-compat PKG_VERSION:= 0.1.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libusb PKG_MD5SUM:= 32c775b97da7a11c6be7c487a0c9fc00 PKG_DESCR:= a Library for accessing Linux USB devices PKG_SECTION:= libs diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index 06de43a1f..eb5cb3de7 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libvirt PKG_VERSION:= 0.7.4 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libxml2 gnutls python PKG_MD5SUM:= 1645975662a326969d2f42d5c04574aa PKG_DESCR:= virtualization API PKG_SECTION:= utils diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index a78edf31d..3837f47f7 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libvorbis PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libogg PKG_MD5SUM:= 478646358c49f34aedcce58948793619 PKG_DESCR:= The Vorbis General Audio Compression Codec library PKG_SECTION:= libs diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 2025a1a64..d2fa1fc54 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libxml2 PKG_VERSION:= 2.7.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib PKG_MD5SUM:= 8f4fda3969237c2a33bdb1583b5d06b2 PKG_DESCR:= XML C parser and toolkit PKG_SECTION:= libs diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 447fa5e7f..6e648c26b 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libxslt PKG_VERSION:= 1.1.24 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libxml2 PKG_MD5SUM:= e83ec5d27fc4c10c6f612879bea9a153 PKG_DESCR:= XSLT Library PKG_SECTION:= libs diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index b20841a24..a08e4e597 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -6,6 +6,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= lighttpd PKG_VERSION:= 1.4.25 PKG_RELEASE:= 1 +PKG_BUILDDEP+= pcre libxml2 sqlite +ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) +PKG_BUILDDEP+= openssl +endif PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704 PKG_DESCR:= a flexible and lightweight web server PKG_SECTION:= net diff --git a/package/links/Makefile b/package/links/Makefile index 5238c599f..0c69aa24d 100644 --- a/package/links/Makefile +++ b/package/links/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= links PKG_VERSION:= 2.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl libpng jpeg gpm PKG_MD5SUM:= c9937f9ed0061f264973182f871fb667 PKG_DESCR:= web browser with console graphic support PKG_SECTION:= net diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile index bd2b102ef..36b667534 100644 --- a/package/logrotate/Makefile +++ b/package/logrotate/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= logrotate PKG_VERSION:= 3.7.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= popt PKG_MD5SUM:= 552639142e163745f6bcd4f1f3816d8a PKG_DESCR:= logfile rotation utility PKG_SECTION:= misc diff --git a/package/lynx/Makefile b/package/lynx/Makefile index 12a04f7f1..443dd82de 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME= lynx PKG_VERSION= 2.8.7dev.7 PKG_RELEASE= 2 +PKG_BUILDDEP+= ncurses openssl zlib PKG_MD5SUM= 83891107c873421e5ac917cc0ab53fe8 PKG_DESCR:= Standard text browser PKG_SECTION:= text diff --git a/package/madplay/Makefile b/package/madplay/Makefile index e890cc3c2..1ac596651 100644 --- a/package/madplay/Makefile +++ b/package/madplay/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= madplay PKG_VERSION:= 0.15.2b PKG_RELEASE:= 1 +PKG_BUILDDEP+= libid3tag libmad PKG_MD5SUM:= 6814b47ceaa99880c754c5195aa1aac1 PKG_DESCR:= MPEG audio player in fixed point PKG_SECTION:= sound diff --git a/package/maradns/Makefile b/package/maradns/Makefile index 174e60ccc..dc627ffe6 100644 --- a/package/maradns/Makefile +++ b/package/maradns/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= maradns PKG_VERSION:= 1.3.07.09 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpthread PKG_MD5SUM:= 1d221438fb4d9317263555262b9c652c PKG_DESCR:= small and secure DNS server PKG_SECTION:= net diff --git a/package/mc/Makefile b/package/mc/Makefile index 056ff02b6..20b232bc1 100644 --- a/package/mc/Makefile +++ b/package/mc/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME= mc PKG_VERSION= 4.6.1 PKG_RELEASE= 1 +PKG_BUILDDEP+= glib ncurses PKG_MD5SUM= 18b20db6e40480a53bac2870c56fc3c4 PKG_DESCR:= norton commander clone PKG_SECTION:= misc diff --git a/package/miax/Makefile b/package/miax/Makefile index f028a4879..3f66f9cb7 100644 --- a/package/miax/Makefile +++ b/package/miax/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= miax PKG_VERSION:= 1.4 PKG_RELEASE:= 1 +PKG_BUILDDEP+= bluez PKG_MD5SUM:= 44f0d2ef46ee2697d890b7b96846adc7 PKG_DESCR:= A console iax (asterisk) client PKG_SECTION:= bluetooth diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index e43e7f4bf..3c86442a4 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mini-httpd PKG_VERSION:= 1.19 PKG_RELEASE:= 10 +ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),) +PKG_BUILDDEP+= openssl +endif PKG_MD5SUM:= 7c68293ad265ecfe2edea917912f6f1f PKG_DESCR:= A small HTTP server PKG_SECTION:= net diff --git a/package/miredo/Makefile b/package/miredo/Makefile index d6fa6a968..8fbe95b48 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= miredo PKG_VERSION:= 1.1.6 PKG_RELEASE:= 1 +ifeq (${ADK_COMPILE_MIREDO_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= bf49c1ddc068746760787d0cf76e40de PKG_DESCR:= A Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon PKG_SECTION:= net diff --git a/package/moc/Makefile b/package/moc/Makefile index 994ced6c6..18a255ae1 100644 --- a/package/moc/Makefile +++ b/package/moc/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= moc PKG_VERSION:= 2.4.4 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libvorbis curl libmad flac ffmpeg PKG_MD5SUM:= 647c770a5542a4ae5437386807a89796 PKG_DESCR:= console music player PKG_SECTION:= sound diff --git a/package/monit/Makefile b/package/monit/Makefile index 99bc8e68e..80a6caa0a 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= monit PKG_VERSION:= 5.0.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= dae7859ec10551fc941daeae60dee9d3 PKG_DESCR:= An utility for system services monitoring PKG_SECTION:= admin diff --git a/package/motion/Makefile b/package/motion/Makefile index 80f70edc0..c3a49e3be 100644 --- a/package/motion/Makefile +++ b/package/motion/Makefile @@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= motion PKG_VERSION:= 3.2.11 PKG_RELEASE:= 1 +ifneq ($(ADK_PACKAGE_MOTION),) +PKG_BUILDDEP+= jpeg +endif PKG_MD5SUM:= 3a26c00f3250eacf6fa93c7a7e0249d9 PKG_DESCR:= Webcam motion sensing and logging PKG_SECTION:= multimedia diff --git a/package/mpd/Makefile b/package/mpd/Makefile index e0da5805d..150391af3 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -6,6 +6,37 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.15.6 PKG_RELEASE:= 1 +PKG_BUILDDEP+= alsa-lib glib +ifneq ($(ADK_COMPILE_MPD_WITH_MP3),) +PKG_BUILDDEP+= libid3tag libmad +endif +ifneq ($(ADK_COMPILE_MPD_WITH_MP4),) +PKG_BUILDDEP+= faad2 +endif +ifneq ($(ADK_COMPILE_MPD_WITH_OGG),) +PKG_BUILDDEP+= libvorbis +endif +ifneq ($(ADK_COMPILE_MPD_WITH_TREMOR),) +PKG_BUILDDEP+= libvorbisidec +endif +ifneq ($(ADK_COMPILE_MPD_WITH_FLAC),) +PKG_BUILDDEP+= flac +endif +ifneq ($(ADK_COMPILE_MPD_WITH_WAV),) +PKG_BUILDDEP+= libaudiofile +endif +ifneq ($(ADK_COMPILE_MPD_WITH_SHOUT),) +PKG_BUILDDEP+= lame +endif +ifneq ($(ADK_COMPILE_MPD_WITH_CURL),) +PKG_BUILDDEP+= curl +endif +ifneq ($(ADK_COMPILE_MPD_WITH_MMS),) +PKG_BUILDDEP+= libmms +endif +ifneq ($(ADK_COMPILE_MPD_WITH_FFMPEG),) +PKG_BUILDDEP+= ffmpeg +endif PKG_MD5SUM:= c78b8933e4902c5dc407d59925f8b10e PKG_DESCR:= A music player daemon PKG_SECTION:= net diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index fc32bf9b2..ac0c50c92 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer PKG_VERSION:= 1.0-29987 PKG_RELEASE:= 1 +PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib PKG_MD5SUM:= 416fa6a247987305d74572d03dc6dde7 PKG_DESCR:= popular video player PKG_SECTION:= video diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 6f6ffb363..6ab7e889c 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mrd6 PKG_VERSION:= 0.9.6 PKG_RELEASE:= 1 +ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b PKG_DESCR:= IPv6 multicast routing daemon PKG_SECTION:= net diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile index b42b26654..213dcee68 100644 --- a/package/mt-daapd/Makefile +++ b/package/mt-daapd/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mt-daapd PKG_VERSION:= 0.2.4 PKG_RELEASE:= 10 +PKG_BUILDDEP+= gdbm libid3tag PKG_MD5SUM:= 2e1cdbe6b94ef153e915806f80a28dca PKG_DESCR:= a multi-threaded DAAP (Digital Audio Access Protocol) daemon PKG_SECTION:= net diff --git a/package/mtr/Makefile b/package/mtr/Makefile index a53f2ee8d..3147750b2 100644 --- a/package/mtr/Makefile +++ b/package/mtr/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mtr PKG_VERSION:= 0.75 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses PKG_MD5SUM:= 23baca52d0922c2ecba7eba05317868c PKG_DESCR:= ncurses traceroute/ping tool PKG_SECTION:= net diff --git a/package/mutt/Makefile b/package/mutt/Makefile index 4645ec40c..cf698f6d3 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mutt PKG_VERSION:= 1.5.20 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses openssl PKG_MD5SUM:= 027cdd9959203de0c3c64149a7ee351c PKG_DESCR:= Mail text client PKG_SECTION:= text diff --git a/package/mysql/Makefile b/package/mysql/Makefile index 7c3ffbcd2..db20a04af 100644 --- a/package/mysql/Makefile +++ b/package/mysql/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mysql PKG_VERSION:= 5.0.85 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses zlib readline PKG_MD5SUM:= f672ec5154f8ea3db87fec5e0b227f4c PKG_DESCR:= MySQL client library PKG_SECTION:= libs diff --git a/package/nano/Makefile b/package/nano/Makefile index 455bc7972..8878b3e22 100644 --- a/package/nano/Makefile +++ b/package/nano/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nano PKG_VERSION:= 2.0.9 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses PKG_MD5SUM:= 2be94dc43fb60fff4626a2401a977220 PKG_DESCR:= An enhanced clone of the Pico text editor PKG_SECTION:= admin diff --git a/package/neon/Makefile b/package/neon/Makefile index e0d6c88d8..b284df38b 100644 --- a/package/neon/Makefile +++ b/package/neon/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME= neon PKG_VERSION= 0.28.4 PKG_RELEASE= 1 +PKG_BUILDDEP+= libpthread libxml2 openssl zlib PKG_MD5SUM= 6c3b94362af743d046e198e9fcbe4a85 PKG_DESCR:= HTTP and WebDAV library PKG_SECTION:= libs diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index ebd3b3d41..ffa2c7950 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= net-snmp PKG_VERSION:= 5.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libelf PKG_MD5SUM:= 5b2551e7bd024fbbee84dca22a5f13a1 PKG_DESCR:= SNMP Agent PKG_SECTION:= net diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 0b4090cca..c2cb0d806 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -6,6 +6,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libtirpc +ifeq (${ADK_COMPILE_NFS_UTILS_WITH_KRB5},y) +PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss +endif +ifeq (${ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL},y) +PKG_BUILDDEP+= libnfsidmap heimdal libevent librpcsecgss +endif PKG_MD5SUM:= 779cf81044e92cb51ad590960e7b3671 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 269a84ce3..4b0ea6d5c 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nmap PKG_VERSION:= 5.00 PKG_RELEASE:= 1 +PKG_BUILDDEP+= pcre libpcap +ifeq (${ADK_COMPILE_NMAP_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 32d27de32166c02d670bb4a086185886 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net diff --git a/package/nss/Makefile b/package/nss/Makefile index 48022d2f2..19f53ea3a 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= nss PKG_VERSION:= 3.12.4 PKG_RELEASE:= 2 +PKG_BUILDDEP+= nspr zlib PKG_MD5SUM:= 1ee3ed9c1900079319bd1de51388d856 PKG_DESCR:= Network Security Services (NSS) library PKG_SECTION:= libs diff --git a/package/nut/Makefile b/package/nut/Makefile index 8c0c2c7c6..e01d4dcc0 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -6,6 +6,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nut PKG_VERSION:= 2.4.1 PKG_RELEASE:= 1 +ifneq (${ADK_PACKAGE_NUT_SSL},) +PKG_BUILDDEP+= openssl +endif +ifneq (${ADK_PACKAGE_NUT_USB},) +PKG_BUILDDEP+= libusb +endif +ifneq (${ADK_PACKAGE_NUT_SNMP},) +PKG_BUILDDEP+= net-snmp +endif PKG_MD5SUM:= 609ebaf2123fc7171d25a6c742dd7d66 PKG_DESCR:= Network UPS Tools PKG_SECTION:= sys diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index 55d108e76..c9d7c9a82 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= obexftp PKG_VERSION:= 0.23 PKG_RELEASE:= 2 +PKG_BUILDDEP+= openobex libiconv PKG_MD5SUM:= f20762061b68bc921e80be4aebc349eb PKG_DESCR:= bluetooth ftp application PKG_SECTION:= bluetooth diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile index 844f800a7..06cea155b 100644 --- a/package/opencdk/Makefile +++ b/package/opencdk/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= opencdk PKG_VERSION:= 0.6.4 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libgcrypt libgpg-error zlib PKG_MD5SUM:= 7bfc820bcdc08f0c31f860710368071e PKG_DESCR:= Open Crypto Development Kit library PKG_SECTION:= libs diff --git a/package/openct/Makefile b/package/openct/Makefile index 0a53477be..d110e5c02 100644 --- a/package/openct/Makefile +++ b/package/openct/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openct PKG_VERSION:= 0.6.16 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libtool libusb PKG_MD5SUM:= d8d8c63269985303a303a218c4b953d7 PKG_DESCR:= drivers for several smart card readers PKG_SECTION:= libs diff --git a/package/openldap/Makefile b/package/openldap/Makefile index c2d01b253..f2a42debb 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openldap PKG_VERSION:= 2.4.19 PKG_RELEASE:= 1 +PKG_BUILDDEP+= cyrus-sasl openssl libdb PKG_MD5SUM:= 4a6dab2711fcf141f19bb680bc335887 PKG_DESCR:= OpenLDAP client libraries PKG_SECTION:= libs diff --git a/package/openobex/Makefile b/package/openobex/Makefile index a1fb09a0e..96a82afa8 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openobex PKG_VERSION:= 1.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= bluez PKG_MD5SUM:= 0d83dc86445a46a1b9750107ba7ab65c PKG_DESCR:= implementation of the Object Exchange (OBEX) protocol PKG_SECTION:= bluetooth diff --git a/package/opensips/Makefile b/package/opensips/Makefile index 142570f14..e49516e02 100644 --- a/package/opensips/Makefile +++ b/package/opensips/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= opensips PKG_VERSION:= 1.5.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= 87c6fe40c143775d6a1be1beb75c3eb2 PKG_DESCR:= a high-performance, configurable, free SIP server PKG_SECTION:= net diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 2bf5163eb..e7fe57098 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -6,6 +6,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh PKG_VERSION:= 5.3p1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib openssl +ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y) +PKG_BUILDDEP+= krb5 +endif +ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y) +PKG_BUILDDEP+= heimdal +endif PKG_MD5SUM:= 13563dbf61f36ca9a1e4254260131041 PKG_DESCR:= OpenSSH server PKG_SECTION:= net diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile index 9e3054c4a..13d869e36 100644 --- a/package/openssl-pkcs11/Makefile +++ b/package/openssl-pkcs11/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl-pkcs11 PKG_VERSION:= 0.1.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libp11 PKG_MD5SUM:= 840af6e54dc21445c54f74e15005ba4d PKG_DESCR:= pkcs11 engine for openssl PKG_SECTION:= crypto diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 698f96ddf..b74664d3a 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl PKG_VERSION:= 0.9.8l PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib PKG_MD5SUM:= 05a0ece1372392a2cf310ebb96333025 PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries PKG_SECTION:= libs diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 912d1abdc..0fd7c6710 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openswan PKG_VERSION:= 2.6.22 PKG_RELEASE:= 1 +PKG_BUILDDEP+= gmp PKG_MD5SUM:= 9a30009bade8a1b09fba27680c87cf72 PKG_DESCR:= IPSec software PKG_SECTION:= net diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 40b690ed8..e4fbce369 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -6,6 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openvpn PKG_VERSION:= 2.1.0 PKG_RELEASE:= 1 +ifeq ($(ADK_PACKAGE_LIBOPENSSL),y) +PKG_BUILDDEP+= openssl +endif +ifeq ($(ADK_PACKAGE_OPENVPN_LZO),y) +PKG_BUILDDEP+= liblzo +endif PKG_MD5SUM:= 452a83326ae198cf961e9ae02539c8fb PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 0e680b4ea..2f19a4fc0 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= oprofile PKG_VERSION:= 0.9.4 PKG_RELEASE:= 1 +PKG_BUILDDEP+= popt PKG_MD5SUM:= 82b059379895cf125261d7d773465915 PKG_DESCR:= system-wide profiles PKG_SECTION:= utils diff --git a/package/osiris/Makefile b/package/osiris/Makefile index 97f1e9d52..e7dcd3c1c 100644 --- a/package/osiris/Makefile +++ b/package/osiris/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= osiris PKG_VERSION:= 4.2.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= 1951c7dc0fe729af9ffaf58910340d12 PKG_DESCR:= Host Integrity Monitoring System (scanning agent) PKG_SECTION:= admin diff --git a/package/palantir/Makefile b/package/palantir/Makefile index e87cb295c..e3c1e1130 100644 --- a/package/palantir/Makefile +++ b/package/palantir/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= palantir PKG_VERSION:= 2.7 PKG_RELEASE:= 1 +PKG_BUILDDEP+= jpeg PKG_MD5SUM:= 3a5b1fb340857f6d8e357bf39b77583e PKG_DESCR:= A multichannel interactive streaming solution PKG_SECTION:= net diff --git a/package/parted/Makefile b/package/parted/Makefile index 63a83105d..f845eb866 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= parted PKG_VERSION:= 1.9.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= e2fsprogs lvm readline PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d PKG_DESCR:= GNU parted PKG_DEPENDS:= libuuid libreadline device-mapper diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index d6530bc1c..23994bb29 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pciutils PKG_VERSION:= 3.0.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib PKG_MD5SUM:= d07da501bb11e6af40acd036536c2e9a PKG_DESCR:= PCI Utilities PKG_SECTION:= sys diff --git a/package/php/Makefile b/package/php/Makefile index 9a479fb5d..d5b00c054 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -6,6 +6,34 @@ include $(TOPDIR)/rules.mk PKG_NAME:= php PKG_VERSION:= 5.3.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl zlib +ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),) +PKG_BUILDDEP+= curl +endif +ifneq ($(ADK_PACKAGE_PHP_MOD_GD),) +PKG_BUILDDEP+= libgd libpng +endif +ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),) +PKG_BUILDDEP+= gmp +endif +ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),) +PKG_BUILDDEP+= openldap +endif +ifneq ($(ADK_PACKAGE_PHP_MOD_MYSQL),) +PKG_BUILDDEP+= mysql +endif +ifneq ($(ADK_PACKAGE_PHP_MOD_PCRE),) +PKG_BUILDDEP+= pcre +endif +ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),) +PKG_BUILDDEP+= postgresql +endif +ifneq ($(ADK_PACKAGE_PHP_MOD_SQLITE),) +PKG_BUILDDEP+= sqlite +endif +ifneq ($(ADK_PACKAGE_PHP_MOD_XML),) +PKG_BUILDDEP+= expat +endif PKG_MD5SUM:= 41fbb368d86acb13fc3519657d277681 PKG_DESCR:= PHP CLI PKG_SECTION:= net diff --git a/package/pkgmaker b/package/pkgmaker index 4a2cd3ff8..15ee78901 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -1,3 +1,4 @@ +cd "$(dirname "$0")" export TOPDIR=$(realpath ..) if gmake --help >/dev/null 2>&1; then export GMAKE=gmake diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index c57e9008a..ac7aa9249 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -6,6 +6,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pmacct PKG_VERSION:= 0.11.6 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap +ifneq ($(ADK_COMPILE_PMACCT_MYSQL),) +PKG_BUILDDEP+= mysql +endif +ifneq ($(ADK_COMPILE_PMACCT_PGSQL),) +PKG_BUILDDEP+= postgresql +endif +ifneq ($(ADK_COMPILE_PMACCT_SQLITE),) +PKG_BUILDDEP+= sqlite +endif PKG_MD5SUM:= e0f3bcba9a73b7a70bbf5a303cd22f77 PKG_DESCR:= IP accounting daemons PKG_SECTION:= net diff --git a/package/popt/Makefile b/package/popt/Makefile index d08c20801..6645d5c0e 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= popt PKG_VERSION:= 1.15 PKG_RELEASE:= 2 +PKG_BUILDDEP+= libiconv PKG_MD5SUM:= c61ef795fa450eb692602a661ec8d7f1 PKG_DESCR:= a command line option parsing library PKG_SECTION:= libs diff --git a/package/portmap/Makefile b/package/portmap/Makefile index d6ffd9404..85faa8d2f 100644 --- a/package/portmap/Makefile +++ b/package/portmap/Makefile @@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= portmap PKG_VERSION:= 6.0 PKG_RELEASE:= 1 +ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),) +PKG_BUILDDEP+= tcp_wrappers +endif PKG_MD5SUM:= ac108ab68bf0f34477f8317791aaf1ff PKG_DESCR:= RPC portmapper PKG_SECTION:= net diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index fa676f312..d06cca865 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= postgresql PKG_VERSION:= 8.3.7 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib PKG_MD5SUM:= 6e36f3b4dd27ae0c352376ea9f843de2 PKG_DESCR:= PostgreSQL database library PKG_SECTION:= libs diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile index 0416b5e78..aa6fa2b2f 100644 --- a/package/privoxy/Makefile +++ b/package/privoxy/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= privoxy PKG_VERSION:= 3.0.15 PKG_RELEASE:= 1 +PKG_BUILDDEP+= pcre PKG_VARIANT:= beta PKG_MD5SUM:= 6571dc9524e945e79c2af62fefe7b107 PKG_DESCR:= web proxy with advanced filtering capabilities diff --git a/package/procps/Makefile b/package/procps/Makefile index 3839b3133..a917a7009 100644 --- a/package/procps/Makefile +++ b/package/procps/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= procps PKG_VERSION:= 3.2.7 PKG_RELEASE:= 4 +PKG_BUILDDEP+= ncurses PKG_MD5SUM:= f490bca772b16472962c7b9f23b1e97d PKG_DESCR:= The /proc file system utilities PKG_SECTION:= utils diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile index dab849974..9389aa5bc 100644 --- a/package/ptunnel/Makefile +++ b/package/ptunnel/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ptunnel PKG_VERSION:= 0.61 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap PKG_MD5SUM:= b45f73875f2af48f101816672f83a5fe PKG_DESCR:= Tunnel TCP connections over ICMP packets PKG_SECTION:= net diff --git a/package/quagga/Makefile b/package/quagga/Makefile index 301fb2dbc..aec761417 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= quagga PKG_VERSION:= 0.99.15 PKG_RELEASE:= 1 +PKG_BUILDDEP+= readline ncurses PKG_MD5SUM:= 8975414c76a295f4855a417af0b5ddce PKG_DESCR:= A routing software package PKG_SECTION:= net diff --git a/package/raddump/Makefile b/package/raddump/Makefile index 28c84e709..9a84d3bd6 100755 --- a/package/raddump/Makefile +++ b/package/raddump/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= raddump PKG_VERSION:= 0.3.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl libpcap PKG_MD5SUM:= f8c29c67141ea78bb6ae8b97d5149480 PKG_DESCR:= interprets captured RADIUS packets PKG_SECTION:= net diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile index 5e09b743a..b7805f693 100644 --- a/package/rarpd/Makefile +++ b/package/rarpd/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rarpd PKG_VERSION:= 1.1 PKG_RELEASE:= 11 +PKG_BUILDDEP+= libnet PKG_MD5SUM:= 04e2ca849e758d0b88c8281775ec3b58 PKG_DESCR:= Reverse ARP Daemon PKG_SECTION:= net diff --git a/package/readline/Makefile b/package/readline/Makefile index a9d81fa1e..68f68cbea 100644 --- a/package/readline/Makefile +++ b/package/readline/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= readline PKG_VERSION:= 5.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses PKG_MD5SUM:= e39331f32ad14009b9ff49cc10c5e751 PKG_DESCR:= Command line editing library PKG_SECTION:= libs diff --git a/package/rpm/Makefile b/package/rpm/Makefile index 8526288be..89b50a647 100644 --- a/package/rpm/Makefile +++ b/package/rpm/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= rpm PKG_VERSION:= 4.7.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= nss libdb PKG_MD5SUM:= 224715646325df4cd3904e3ac9e16186 PKG_DESCR:= Package Manager PKG_SECTION:= base diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile index cc711c505..78c67ebab 100644 --- a/package/rrdcollect/Makefile +++ b/package/rrdcollect/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rrdcollect PKG_VERSION:= 0.2.3 PKG_RELEASE:= 8 +PKG_BUILDDEP+= rrdtool PKG_MD5SUM:= 5e4305c612bc3cccbaf802c275c81a11 PKG_DESCR:= Round-Robin Database (RRD) collecting daemon PKG_SECTION:= admin diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index e1c09b1e5..6c729367e 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rrdtool PKG_VERSION:= 1.2.30 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libxml2 cgilib freetype libart libpng PKG_MD5SUM:= 19b24f7184a8dbf7b48c1bbb565ad9fb PKG_DESCR:= Round Robin Database (RRD) management library and tools PKG_SECTION:= libs diff --git a/package/rrs/Makefile b/package/rrs/Makefile index fe16bdd2c..f88b71eaa 100644 --- a/package/rrs/Makefile +++ b/package/rrs/Makefile @@ -6,6 +6,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rrs PKG_VERSION:= 1.70 PKG_RELEASE:= 2 +PKG_BUILDDEP+= zlib +ifeq (${ADK_COMPILE_RRS_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif +ifneq ($(ADK_PACKAGE_RRS),) +PKG_BUILDDEP+= openssl +endif PKG_MD5SUM:= b400d03c0e39e3e78a7327ba78f789f0 PKG_DESCR:= A reverse (connecting) remote shell, with SSL support. PKG_SECTION:= net diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 013bffe81..b34584534 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rsync PKG_VERSION:= 3.0.6 PKG_RELEASE:= 1 +PKG_BUILDDEP+= popt PKG_MD5SUM:= e9865d093a18e4668b9d31b635dc8e99 PKG_DESCR:= utility that provides fast incremental file transfer PKG_SECTION:= net diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index c2de864ba..863cad6c8 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rtorrent PKG_VERSION:= 0.8.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses libtorrent curl PKG_MD5SUM:= e701095e1824b7e512a17000f4c0a783 PKG_DESCR:= console torrent application PKG_SECTION:= net diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index 55785bcd9..deba7ab65 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= sane-backends PKG_VERSION:= 1.0.20 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpthread libusb PKG_MD5SUM:= a0cfdfdebca2feb4f2ba5d3418b15a42 PKG_DESCR:= Scanner access now easy PKG_SECTION:= misc diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile index f0b66541d..9d06cfc3d 100644 --- a/package/scanlogd/Makefile +++ b/package/scanlogd/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= scanlogd PKG_VERSION:= 2.2.6 PKG_RELEASE:= 8 +PKG_BUILDDEP+= libpcap libnids libnet PKG_MD5SUM:= 7b8187ea718ebe47f22805b921b909ab PKG_DESCR:= Portscan logger PKG_SECTION:= net diff --git a/package/screen/Makefile b/package/screen/Makefile index 5ce7ed6e4..424c3de5f 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= screen PKG_VERSION:= 4.0.3 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses PKG_MD5SUM:= 8506fd205028a96c741e4037de6e3c42 PKG_DESCR:= A window manager for the terminal session PKG_SECTION:= misc diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile index 9dbf0356c..e49d1e224 100644 --- a/package/serdisplib/Makefile +++ b/package/serdisplib/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= serdisplib PKG_VERSION:= 1.97.8 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libgd libusb PKG_MD5SUM:= 2aa91c43d01d2dfc9fbc1116e3063ae1 PKG_DESCR:= display drivers (serial, parallel, USB) PKG_SECTION:= misc diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile index d04603641..8443ec888 100644 --- a/package/siproxd/Makefile +++ b/package/siproxd/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= siproxd PKG_VERSION:= 0.7.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libosip2 PKG_MD5SUM:= 45e5a44803181e2bf3361d562060c904 PKG_DESCR:= a SIP (Session Initiation Protocol) proxy PKG_SECTION:= net diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 45ba006c9..2249c2cf5 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= sipsak PKG_VERSION:= 0.9.6 PKG_RELEASE:= 2 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= c4eb8e282902e75f4f040f09ea9d99d5 PKG_DESCR:= a SIP stress and diagnostics utility PKG_SECTION:= net diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile index ad6c7ee93..86feb2d30 100644 --- a/package/sispmctl/Makefile +++ b/package/sispmctl/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= sispmctl PKG_VERSION:= 2.7 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libusb PKG_MD5SUM:= 2457f76cd129f880634f3381be0aeb76 PKG_DESCR:= control application for power sockets PKG_SECTION:= misc diff --git a/package/snort-wireless/Makefile b/package/snort-wireless/Makefile index 829b9410f..4cb773d6f 100644 --- a/package/snort-wireless/Makefile +++ b/package/snort-wireless/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= snort-wireless PKG_VERSION:= 2.4.3-alpha04 PKG_RELEASE:= 9 +PKG_BUILDDEP+= libnet libpcap pcre PKG_MD5SUM:= 1aa699ae279bf7a1140cf6cca02f9999 PKG_DESCR:= a flexible Wireless Network Intrusion Detection System (NIDS) PKG_SECTION:= net diff --git a/package/snort/Makefile b/package/snort/Makefile index d57a6c555..7ceadf1d6 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= snort PKG_VERSION:= 2.6.1.2 PKG_RELEASE:= 8 +PKG_BUILDDEP+= libnet libpcap pcre PKG_MD5SUM:= 22c448e25538cdf74c62abe586aeac0a PKG_DESCR:= a flexible Network Intrusion Detection System (NIDS) PKG_SECTION:= net diff --git a/package/socat/Makefile b/package/socat/Makefile index ab6d5c059..5ca41edc1 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= socat PKG_VERSION:= 1.7.0.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= 82967132b5a8ca4d07e54370fdcb2662 PKG_DESCR:= A multipurpose relay (SOcket CAT) PKG_SECTION:= net diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index f01b739b0..bd2825e71 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= sqlite PKG_VERSION:= 3.6.20 PKG_RELEASE:= 1 +PKG_BUILDDEP+= ncurses readline PKG_MD5SUM:= 0faf8fc8ccff5297513c6532b2b4ce23 PKG_DESCR:= Self-contained, embeddable, zero-configuration SQL database PKG_SECTION:= libs diff --git a/package/squid/Makefile b/package/squid/Makefile index cfc35061c..d3993c979 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= squid PKG_VERSION:= 3.0.STABLE20 PKG_RELEASE:= 2 +PKG_BUILDDEP+= openssl PKG_MD5SUM:= b69577cfc5cfb6808ec426e3a933220d PKG_DESCR:= squid web and cache proxy PKG_SECTION:= net diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile index 738fa125c..87f653380 100644 --- a/package/ssltunnel/Makefile +++ b/package/ssltunnel/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ssltunnel PKG_VERSION:= 1.16 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl ppp PKG_MD5SUM:= 4039b50566a33a4077883ea974e476d5 PKG_DESCR:= A PPP over SSL vpn tool PKG_SECTION:= net diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 8d847faa1..9203f9510 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= subversion PKG_VERSION:= 1.6.6 PKG_RELEASE:= 1 +PKG_BUILDDEP+= apr-util expat apr zlib libiconv +ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),) +PKG_BUILDDEP+= neon +endif PKG_MD5SUM:= 0ab0f26f6eb056add1b9d3059a3f4247 PKG_DESCR:= revision control program PKG_SECTION:= net diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile index 26f96f449..2c4586712 100644 --- a/package/swconfig/Makefile +++ b/package/swconfig/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= swconfig PKG_VERSION:= 1.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libnl PKG_DESCR:= switch configuration utility PKG_SECTION:= misc diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile index 2080c51fd..5bd1daa0c 100644 --- a/package/syslog-ng/Makefile +++ b/package/syslog-ng/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= syslog-ng PKG_VERSION:= 1.6.12 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libol tcp_wrappers PKG_MD5SUM:= a3cbfdb6e1e5beea181a7349749719f3 PKG_DESCR:= A powerful syslog daemon PKG_SECTION:= admin diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index cce37c8fc..7e92a9fa4 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcpdump PKG_VERSION:= 4.0.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libpcap PKG_MD5SUM:= b22ca72890df2301d922c9f2d17867f9 PKG_DESCR:= A tool for network monitoring and data acquisition. PKG_SECTION:= net diff --git a/package/tinc/Makefile b/package/tinc/Makefile index efa122a5e..0b697916e 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tinc PKG_VERSION:= 1.0.11 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib openssl liblzo PKG_MD5SUM:= ee0b1a3366c6e379cae34be6fa5dcb15 PKG_DESCR:= VPN tunnel daemon PKG_SECTION:= net diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index c251da7a9..8eed06493 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -6,6 +6,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tntnet PKG_VERSION:= 1.6.4 PKG_RELEASE:= 1 +PKG_BUILDDEP+= cxxtools zlib +ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},) +PKG_BUILDDEP+= openssl +else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},) +PKG_BUILDDEP+= gnutls +endif PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996 PKG_DESCR:= small C++ application server PKG_SECTION:= net diff --git a/package/tor/Makefile b/package/tor/Makefile index 4eebf0243..f25a3f5bb 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tor PKG_VERSION:= 0.2.1.20 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libevent openssl zlib PKG_MD5SUM:= 0d62ee2332fdd95de43debac7435df19 PKG_DESCR:= An anonymous Internet communication system PKG_SECTION:= net diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index bf3c56d1e..a7dcfa015 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -6,6 +6,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ulogd PKG_VERSION:= 1.24 PKG_RELEASE:= 7 +PKG_BUILDDEP+= iptables +ifneq ($(ADK_PACKAGE_ULOGD_MOD_MYSQL),) +PKG_BUILDDEP+= mysql +endif +ifneq ($(ADK_PACKAGE_ULOGD_MOD_PCAP),) +PKG_BUILDDEP+= libpcap +endif +ifneq ($(ADK_PACKAGE_ULOGD_MOD_PGSQL),) +PKG_BUILDDEP+= postgresql +endif +ifneq ($(ADK_PACKAGE_ULOGD_MOD_SQLITE),) +PKG_BUILDDEP+= sqlite +endif PKG_MD5SUM:= 05b4ed2926b9a22aaeaf642917bbf8ff PKG_DESCR:= Netfilter userspace logging daemon PKG_SECTION:= net diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index 8e032cc0e..43aafc6df 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= usbutils PKG_VERSION:= 0.73 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libusb PKG_MD5SUM:= 88978b4ad891f610620b1b8e5e0f43eb PKG_DESCR:= A program to list USB devices PKG_SECTION:= misc diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile index c62f5a885..f22f474fb 100644 --- a/package/ussp-push/Makefile +++ b/package/ussp-push/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ussp-push PKG_VERSION:= 0.11 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openobex PKG_MD5SUM:= 5c44983ee27809867041feff6bb4423a PKG_DESCR:= OBEX push command PKG_SECTION:= bluetooth diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index f7b3d7d1e..b3343b8a7 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux-ng PKG_VERSION:= 2.16.1 PKG_RELEASE:= 2 +PKG_BUILDDEP+= e2fsprogs ncurses PKG_MD5SUM:= fc57e5fd5be9e569b026b5077fafe84f PKG_DESCR:= Linux utilities PKG_SECTION:= admin diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile index f96ca2103..95cdbaa92 100644 --- a/package/vilistextum/Makefile +++ b/package/vilistextum/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vilistextum PKG_VERSION:= 2.6.9 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libiconv PKG_MD5SUM:= 5ba56ffdc56758da716bb46c3e0f517e PKG_DESCR:= html to ascii converter PKG_SECTION:= text diff --git a/package/vim/Makefile b/package/vim/Makefile index 8aa47d59a..a831bf041 100644 --- a/package/vim/Makefile +++ b/package/vim/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME= vim PKG_VERSION= 7.2 PKG_RELEASE= 1 +PKG_BUILDDEP+= ncurses PKG_MD5SUM= f0901284b338e448bfd79ccca0041254 PKG_DESCR:= The text editor PKG_SECTION:= text diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile index 0e7bbd9be..b83ff00f8 100644 --- a/package/vnc-reflector/Makefile +++ b/package/vnc-reflector/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vnc-reflector PKG_VERSION:= 1.2.4 PKG_RELEASE:= 1 +PKG_BUILDDEP+= jpeg zlib PKG_MD5SUM:= c3f88bc62f228b335c25c07f9744ab0c PKG_DESCR:= specialized VNC server which acts as a proxy PKG_SECTION:= net diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile index f38d055df..c6129d9b2 100644 --- a/package/vpnc/Makefile +++ b/package/vpnc/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vpnc PKG_VERSION:= 0.4.0 PKG_RELEASE:= 2 +PKG_BUILDDEP+= libgcrypt libgpg-error PKG_MD5SUM:= 604807e7dd90fce00a4e2344ee29c76d PKG_DESCR:= client for cisco3000 VPN Concentrator. PKG_SECTION:= net diff --git a/package/vtun/Makefile b/package/vtun/Makefile index 513d6ccdc..854f5850d 100644 --- a/package/vtun/Makefile +++ b/package/vtun/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vtun PKG_VERSION:= 3.0.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= zlib openssl liblzo PKG_MD5SUM:= c342ffe77055d4248a38f0b380f28c1b PKG_DESCR:= A VPN tunnel daemon PKG_SECTION:= net diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile index 744770fa1..280e610e2 100644 --- a/package/wdfs/Makefile +++ b/package/wdfs/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME= wdfs PKG_VERSION= 1.4.2 PKG_RELEASE= 2 +PKG_BUILDDEP+= openssl fuse neon glib PKG_MD5SUM= 628bb44194d04c1cf8aacc446ed0a230 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= net diff --git a/package/weechat/Makefile b/package/weechat/Makefile index 59529b51e..804657cf8 100644 --- a/package/weechat/Makefile +++ b/package/weechat/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= weechat PKG_VERSION:= 0.1.8 PKG_RELEASE:= 2 +PKG_BUILDDEP+= ncurses gnutls lua libiconv PKG_MD5SUM:= 73d6bc211ac32c597f0d278506480a20 PKG_DESCR:= Lightweight IRC client PKG_SECTION:= net diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index d1f8fd190..9e4ae77ff 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= wpa_supplicant PKG_VERSION:= 0.6.9 PKG_RELEASE:= 1 +ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y) +PKG_BUILDDEP+= openssl +endif PKG_MD5SUM:= 0efb8fcedf0a8acf6f423dfdb0658fdd PKG_DESCR:= WPA Supplicant with support for WPA and WPA2 PKG_SECTION:= net diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile index 4e40f4d0b..370aac976 100644 --- a/package/xf86-video-cirrus/Makefile +++ b/package/xf86-video-cirrus/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86-video-cirrus PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= xorg-server PKG_MD5SUM:= c63a29917c48d0c317445991fc36d09a PKG_DESCR:= X11 driver for Cirrus VGA chips PKG_SECTION:= x11 diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index 083c15703..f124fc201 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86-video-geode PKG_VERSION:= 2.11.6 PKG_RELEASE:= 1 +PKG_BUILDDEP+= xorg-server PKG_MD5SUM:= a673c0f88037d12fbb96d9fefc82785b PKG_DESCR:= X11 driver for AMD Geode VGA chip PKG_SECTION:= x11 diff --git a/package/xf86dga/Makefile b/package/xf86dga/Makefile index 70e0d5e39..1adb287ae 100644 --- a/package/xf86dga/Makefile +++ b/package/xf86dga/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86dga PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libXxf86dga PKG_MD5SUM:= ac30b5705f487554c5de0b466e846c31 PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index bdb09fe91..f323ef9e6 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= xfsprogs PKG_VERSION:= 3.0.0 PKG_RELEASE:= 1 +PKG_BUILDDEP+= e2fsprogs PKG_MD5SUM:= ec734f935ec87ebb8be890d29380a3e6 PKG_DESCR:= Utilities to create and check XFS filesystems PKG_SECTION:= admin diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 710dd1eb6..cb105a795 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config PKG_VERSION:= 1.7 PKG_RELEASE:= 1 +PKG_BUILDDEP+= xkbcomp PKG_MD5SUM:= c024a6e2a5b8c4ce3d9d1f1286466163 PKG_DESCR:= X keyboard config PKG_SECTION:= x11 diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 34b77a158..f20811848 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xorg-server PKG_VERSION:= 1.7.1 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9 PKG_DESCR:= Xorg server PKG_SECTION:= x11 -- cgit v1.2.3 From c43aee42a122248712f1c31d481afcfce8331f64 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 22:58:11 +0059 Subject: tr - _ for uppercasing pkgnames for COMPILE symbols Signed-off-by: Thorsten Glaser --- package/pkgmaker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/pkgmaker b/package/pkgmaker index 15ee78901..59228d753 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -6,12 +6,12 @@ else export GMAKE=make fi -for subdir in bash bc mksh; do +for subdir in alsa-lib bash bc mksh; do cd $subdir pn=$($GMAKE show=PKG_NAME) # pn: package name pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options pfl=$($GMAKE show=PKG_FLAVOURS) # pfl: all package flavours - typeset -u pnu=$pn # pnu: package name uppercase + typeset -u pnu=${pn//-/_} # pnu: package name uppercase pd=$($GMAKE show=PKG_DESCR) # pd: package description ph=$($GMAKE show=PKG_URL) # ph: package homepage -- cgit v1.2.3 From 1b111741aee8028b8bbb0dc3ad7b456e953f9aad Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 23:06:42 +0059 Subject: also create list of package subdirs automatically; fix name mangling Signed-off-by: Thorsten Glaser --- package/Makefile | 430 ------------------------------------------------------- package/depmaker | 8 ++ package/pkgmaker | 15 +- 3 files changed, 16 insertions(+), 437 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/Makefile b/package/Makefile index ce92c1cb0..1b3943f36 100644 --- a/package/Makefile +++ b/package/Makefile @@ -6,124 +6,6 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/package/Depends.mk -ifneq (${ADK_PACKAGE_CGILIB},) -ADK_COMPILE_CGILIB=${ADK_PACKAGE_CGILIB} -else -ifneq (${ADK_COMPILE_RRDTOOL},) -ADK_COMPILE_CGILIB=m -else -ADK_COMPILE_CGILIB= -endif -endif - -package-$(ADK_PACKAGE_6TUNNEL) += 6tunnel -package-$(ADK_PACKAGE_AICCU) += aiccu -package-$(ADK_PACKAGE_AIRCRACK_NG) += aircrack-ng -package-$(ADK_PACKAGE_ALSA_LIB) += alsa-lib -package-$(ADK_PACKAGE_ALSA_UTILS) += alsa-utils -package-$(ADK_PACKAGE_APR) += apr -package-$(ADK_PACKAGE_APR_UTIL) += apr-util -package-$(ADK_PACKAGE_ARPD) += arpd -package-$(ADK_PACKAGE_ARPWATCH) += arpwatch -package-$(ADK_PACKAGE_ASTERISK) += asterisk -package-$(ADK_COMPILE_ATFTP) += atftp -package-$(ADK_PACKAGE_ATK) += atk -package-$(ADK_PACKAGE_AUFS_UTIL) += aufs2-util -package-$(ADK_PACKAGE_AUTOCONF) += autoconf -package-$(ADK_PACKAGE_AUTOMAKE) += automake -package-$(ADK_PACKAGE_AUTOSSH) += autossh -package-$(ADK_COMPILE_AVAHI) += avahi -package-$(ADK_COMPILE_AXTLS) += axtls -package-$(ADK_PACKAGE_BASH) += bash -package-$(ADK_COMPILE_BC) += bc -package-$(ADK_PACKAGE_BISON) += bison -package-$(ADK_PACKAGE_BZIP2) += bzip2 -package-$(ADK_PACKAGE_CA_CERTS) += ca-certificates -package-$(ADK_PACKAGE_CAIRO) += cairo -package-$(ADK_PACKAGE_CFGFS) += cfgfs -package-$(ADK_PACKAGE_CFINSTALL) += cfinstall -package-$(ADK_PACKAGE_CPIO) += cpio -package-$(ADK_PACKAGE_CRYPTINIT) += cryptinit -package-$(ADK_PACKAGE_BIGREQSPROTO) += bigreqsproto -package-$(ADK_COMPILE_BIND) += bind -package-$(ADK_PACKAGE_BINUTILS) += binutils -package-$(ADK_PACKAGE_BITLBEE) += bitlbee -package-$(ADK_PACKAGE_BOGOFILTER) += bogofilter -package-$(ADK_PACKAGE_BLUEZ_FIRMWARE) += bluez-firmware -package-$(ADK_PACKAGE_BLUEZ) += bluez -package-$(ADK_PACKAGE_BRIDGE_UTILS) += bridge-utils -package-$(ADK_PACKAGE_BUSYBOX) += busybox -package-$(ADK_PACKAGE_BWM) += bwm -package-$(ADK_PACKAGE_CBTT) += cbtt -package-$(ADK_COMPILE_CGILIB) += cgilib -package-$(ADK_PACKAGE_CHILLISPOT) += chillispot -package-$(ADK_PACKAGE_CLICK) += click -package-$(ADK_PACKAGE_COLLECTD) += collectd -package-$(ADK_PACKAGE_COMGT) += comgt -package-$(ADK_PACKAGE_COMPOSITEPROTO) += compositeproto -package-$(ADK_PACKAGE_CTORRENT) += ctorrent -package-$(ADK_PACKAGE_CUPS) += cups -package-$(ADK_COMPILE_CURL) += curl -package-$(ADK_PACKAGE_CUTTER) += cutter -package-$(ADK_PACKAGE_CRYPTSETUP) += cryptsetup -package-$(ADK_COMPILE_CYRUS_SASL) += cyrus-sasl -package-$(ADK_PACKAGE_CXXTOOLS) += cxxtools -package-$(ADK_PACKAGE_DAMAGEPROTO) += damageproto -package-$(ADK_PACKAGE_DANSGUARDIAN) += dansguardian -package-$(ADK_PACKAGE_DAVFS2) += davfs2 -package-$(ADK_PACKAGE_DBUS) += dbus -package-$(ADK_PACKAGE_DECO) += deco -package-$(ADK_COMPILE_DHCP) += dhcp -package-$(ADK_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder -package-$(ADK_PACKAGE_DIFFUTILS) += diffutils -package-$(ADK_PACKAGE_DIGITEMP) += digitemp -package-$(ADK_PACKAGE_DNSMASQ) += dnsmasq -package-$(ADK_PACKAGE_DOSFSTOOLS) += dosfstools -package-$(ADK_PACKAGE_DOVECOT) += dovecot -package-$(ADK_PACKAGE_DROPBEAR) += dropbear -package-$(ADK_PACKAGE_DSNIFF) += dsniff -package-$(ADK_PACKAGE_E2FSPROGS) += e2fsprogs -package-$(ADK_PACKAGE_LIBUUID) += e2fsprogs -package-$(ADK_PACKAGE_LIBBLKID) += e2fsprogs -package-$(ADK_PACKAGE_EBTABLES) += ebtables -package-$(ADK_PACKAGE_ELINKS) += elinks -package-$(ADK_PACKAGE_ESOUND) += esound -package-$(ADK_PACKAGE_ETHER_WAKE) += ether-wake -package-$(ADK_PACKAGE_ETHTOOL) += ethtool -package-$(ADK_PACKAGE_EVIEEXT) += evieext -package-$(ADK_COMPILE_EXPAT) += expat -package-$(ADK_COMPILE_EXMAP) += exmap -package-$(ADK_PACKAGE_EZIPUPDATE) += ez-ipupdate -package-$(ADK_COMPILE_FAAD2) += faad2 -package-$(ADK_PACKAGE_FAKEIDENTD) += fakeidentd -package-$(ADK_PACKAGE_FBSET) += fbset -package-$(ADK_PACKAGE_FETCHMAIL) += fetchmail -package-$(ADK_PACKAGE_FFMPEG) += ffmpeg -package-$(ADK_PACKAGE_FILE) += file -package-$(ADK_PACKAGE_FIXESPROTO) += fixesproto -package-$(ADK_COMPILE_FLAC) += flac -package-$(ADK_PACKAGE_FLEX) += flex -package-$(ADK_PACKAGE_FONTCONFIG) += fontconfig -package-$(ADK_PACKAGE_FONTSPROTO) += fontsproto -package-$(ADK_PACKAGE_FONTCACHEPROTO) += fontcacheproto -package-$(ADK_PACKAGE_FPING) += fping -package-$(ADK_PACKAGE_FPROBE) += fprobe -package-$(ADK_PACKAGE_FPROBE_ULOG) += fprobe-ulog -package-$(ADK_COMPILE_FREERADIUS_CLIENT) += freeradius-client -package-$(ADK_PACKAGE_FREERADIUS_SERVER) += freeradius-server -package-$(ADK_COMPILE_FREETYPE) += freetype -package-$(ADK_PACKAGE_FRICKIN) += frickin -package-$(ADK_COMPILE_FUSE) += fuse -package-$(ADK_PACKAGE_GATLING) += gatling -package-$(ADK_PACKAGE_GAWK) += gawk -package-$(ADK_PACKAGE_GCC) += gcc -package-$(ADK_PACKAGE_GDB) += gdb -package-$(ADK_PACKAGE_GDBSERVER) += gdbserver -package-$(ADK_PACKAGE_GETTEXT) += gettext -package-$(ADK_PACKAGE_GIT) += git -package-$(ADK_PACKAGE_GKRELLMD) += gkrellmd -package-$(ADK_PACKAGE_GLIB) += glib -package-$(ADK_PACKAGE_GTK) += gtk+ ifeq (${ADK_TARGET_LIB_GLIBC},y) package-$(ADK_PACKAGE_GLIBC) += glibc endif @@ -133,327 +15,15 @@ endif ifeq (${ADK_NATIVE},y) package-$(ADK_PACKAGE_LIBC) += libc endif -package-$(ADK_PACKAGE_GMEDIASERVER) += gmediaserver -package-$(ADK_COMPILE_GMP) += gmp -package-$(ADK_COMPILE_GNUTLS) += gnutls -package-$(ADK_PACKAGE_GPERF) += gperf -package-$(ADK_PACKAGE_GPG) += gpg -package-$(ADK_PACKAGE_GPM) += gpm -package-$(ADK_PACKAGE_GPSD) += gpsd -package-$(ADK_PACKAGE_GRUB) += grub -package-$(ADK_PACKAGE_GRUB_BIN) += grub-bin -package-$(ADK_COMPILE_GSM) += gsm -package-$(ADK_PACKAGE_HASERL) += haserl -package-$(ADK_PACKAGE_HDPARM) += hdparm -package-$(ADK_COMPILE_HEIMDAL) += heimdal -package-$(ADK_PACKAGE_HEYU) += heyu -package-$(ADK_COMPILE_HOSTAPD) += hostapd -package-$(ADK_PACKAGE_HTPDATE) += htpdate -package-$(ADK_PACKAGE_HTTPING) += httping -package-$(ADK_PACKAGE_HTTPTUNNEL) += httptunnel -package-$(ADK_PACKAGE_ICECAST) += icecast -package-$(ADK_PACKAGE_ID3LIB) += id3lib -package-$(ADK_PACKAGE_IFTOP) += iftop -package-$(ADK_PACKAGE_IGMPPROXY) += igmpproxy -package-$(ADK_PACKAGE_INPUTPROTO) += inputproto -package-$(ADK_PACKAGE_IPCAD) += ipcad -package-$(ADK_PACKAGE_IPERF) += iperf -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 -package-$(ADK_PACKAGE_JAMVM) += jamvm -package-$(ADK_COMPILE_JPEG) += jpeg -package-$(ADK_PACKAGE_KBPROTO) += kbproto -package-$(ADK_COMPILE_KISMET) += kismet -package-$(ADK_COMPILE_KNOCK) += knock -package-$(ADK_COMPILE_KRB5) += krb5 -package-$(ADK_PACKAGE_L2TPNS) += l2tpns -package-$(ADK_COMPILE_LAME) += lame -package-$(ADK_PACKAGE_LESS) += less -package-$(ADK_PACKAGE_LIBAO) += libao -package-$(ADK_PACKAGE_LIBART) += libart -package-$(ADK_PACKAGE_LIBAUDIOFILE) += libaudiofile -package-$(ADK_PACKAGE_LIBCLI) += libcli -package-$(ADK_PACKAGE_LIBDAEMON) += libdaemon -package-$(ADK_COMPILE_DB) += libdb -package-$(ADK_PACKAGE_LIBDNET) += libdnet -package-$(ADK_PACKAGE_LIBELF) += libelf -package-$(ADK_PACKAGE_LIBEVENT) += libevent -package-$(ADK_PACKAGE_LIBFFI) += libffi -package-$(ADK_PACKAGE_LIBFONTENC) += libfontenc -package-$(ADK_PACKAGE_LIBGCRYPT) += libgcrypt -package-$(ADK_PACKAGE_LIBGD) += libgd -package-$(ADK_PACKAGE_LIBGDBM) += gdbm -package-$(ADK_PACKAGE_LIBGPG_ERROR) += libgpg-error -package-$(ADK_PACKAGE_LIBGSSGLUE) += libgssglue -package-$(ADK_PACKAGE_LIBICONV) += libiconv -package-$(ADK_PACKAGE_LIBID3TAG) += libid3tag -package-$(ADK_PACKAGE_LIBLZO) += liblzo -package-$(ADK_PACKAGE_LIBMAD) += libmad -package-$(ADK_PACKAGE_LIBMMS) += libmms -package-$(ADK_PACKAGE_LIBNET) += libnet -package-$(ADK_PACKAGE_LIBNFSIDMAP) += libnfsidmap -package-$(ADK_PACKAGE_LIBNIDS) += libnids -package-$(ADK_PACKAGE_LIBNL) += libnl -package-$(ADK_PACKAGE_LIBOGG) += libogg -package-$(ADK_PACAKGE_LIBOL) += libol -package-$(ADK_PACKAGE_LIBOSIP2) += libosip2 -package-$(ADK_COMPILE_LIBOWFAT) += libowfat -package-$(ADK_PACKAGE_LIBP11) += libp11 -package-$(ADK_PACKAGE_LIBPCAP) += libpcap -package-$(ADK_PACKAGE_LIBPCIACCESS) += libpciaccess -package-$(ADK_PACKAGE_LIBPNG) += libpng -package-$(ADK_PACKAGE_LIBPRI) += libpri ifneq (${ADK_NATIVE},y) package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread endif -package-$(ADK_COMPILE_LIBSHOUT) += libshout -package-$(ADK_PACKAGE_LIBSIGCXX) += libsigc++ -package-$(ADK_PACKAGE_LIBSTDCXX) += libstdcxx -package-$(ADK_PACKAGE_LIBRPCSECGSS) += librpcsecgss -package-$(ADK_PACKAGE_LIBTASN1) += libtasn1 -package-$(ADK_PACKAGE_LIBTHREAD_DB) += libthread_db -package-$(ADK_PACKAGE_LIBTIFF) += libtiff -package-$(ADK_PACKAGE_LIBTIRPC) += libtirpc -package-$(ADK_PACKAGE_LIBTORRENT) += libtorrent -package-$(ADK_COMPILE_LIBTOOL) += libtool -package-$(ADK_PACKAGE_LIBUPNP) += libupnp -package-$(ADK_PACKAGE_LIBUSB) += libusb -package-$(ADK_PACKAGE_LIBUSB_COMPAT) += libusb-compat -package-$(ADK_PACKAGE_LIBVIRT) += libvirt -package-$(ADK_PACKAGE_LIBVORBIS) += libvorbis -package-$(ADK_PACKAGE_LIBVORBISIDEC) += libvorbisidec -package-$(ADK_PACKAGE_LIBICE) += libICE -package-$(ADK_PACKAGE_LIBSM) += libSM -package-$(ADK_PACKAGE_LIBX11) += libX11 -package-$(ADK_PACKAGE_LIBXAU) += libXau -package-$(ADK_PACKAGE_LIBXAW) += libXaw -package-$(ADK_PACKAGE_LIBXPM) += libXpm -package-$(ADK_PACKAGE_LIBXRENDER) += libXrender -package-$(ADK_PACKAGE_LIBXV) += libXv -package-$(ADK_PACKAGE_LIBXDMCP) += libXdmcp -package-$(ADK_PACKAGE_LIBXEXT) += libXext -package-$(ADK_PACKAGE_LIBXFONT) += libXfont -package-$(ADK_PACKAGE_LIBXKBFILE) += libxkbfile -package-$(ADK_PACKAGE_LIBXXF86DGA) += libXxf86dga -package-$(ADK_PACKAGE_LIBXML2) += libxml2 -package-$(ADK_PACKAGE_LIBXMU) += libXmu -package-$(ADK_PACKAGE_LIBXSLT) += libxslt -package-$(ADK_PACKAGE_LIBXT) += libXt -package-$(ADK_PACKAGE_LIGHTTPD) += lighttpd -package-$(ADK_PACKAGE_LINKS) += links -package-$(ADK_COMPILE_LINUX_ATM) += linux-atm -package-$(ADK_PACKAGE_LOGROTATE) += logrotate -package-$(ADK_PACKAGE_LRZSZ) += lrzsz -package-${ADK_PACKAGE_LYNX} += lynx -package-$(ADK_COMPILE_LUA) += lua -package-$(ADK_COMPILE_LVM) += lvm -package-$(ADK_PACKAGE_MACCHANGER) += macchanger -package-$(ADK_PACKAGE_MADPLAY) += madplay -package-$(ADK_PACKAGE_M4) += m4 -package-$(ADK_PACKAGE_MAKE) += make -package-$(ADK_PACKAGE_MARADNS) += maradns -package-$(ADK_PACKAGE_MGETTY) += mgetty -package-$(ADK_PACKAGE_MC) += mc -package-$(ADK_PACKAGE_MDADM) += mdadm -package-$(ADK_PACKAGE_MIAU) += miau -package-$(ADK_PACKAGE_MIAX) += miax -package-$(ADK_PACKAGE_MICROPERL) += microperl -package-$(ADK_COMPILE_MINI_HTTPD) += mini_httpd -package-$(ADK_PACKAGE_MINI_SENDMAIL) += mini_sendmail -package-$(ADK_COMPILE_MIREDO) += miredo -package-$(ADK_PACKAGE_MKSH) += mksh -package-$(ADK_PACKAGE_MOC) += moc -package-$(ADK_PACKAGE_MONIT) += monit -package-$(ADK_PACKAGE_MOTION) += motion -package-$(ADK_PACKAGE_MPD) += mpd -package-$(ADK_PACKAGE_MPFR) += mpfr -package-$(ADK_PACKAGE_MPLAYER) += mplayer -package-$(ADK_PACKAGE_MRD6) += mrd6 -package-$(ADK_PACKAGE_MT_DAAPD) += mt-daapd -package-$(ADK_PACKAGE_MTD) += mtd -package-$(ADK_PACKAGE_MTR) += mtr -package-$(ADK_PACKAGE_MUTT) += mutt -package-$(ADK_COMPILE_MYSQL) += mysql -package-$(ADK_PACKAGE_NANO) += nano -package-$(ADK_COMPILE_NCURSES) += ncurses -package-$(ADK_PACKAGE_NUT) += nut -package-$(ADK_PACKAGE_LIBNCURSES) += ncurses -package-$(ADK_COMPILE_NDISC6) += ndisc -package-$(ADK_PACKAGE_NEON) += neon -package-$(ADK_COMPILE_NET_SNMP) += net-snmp -package-$(ADK_PACKAGE_NETPERF) += netperf -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_NTPCLIENT) += ntpclient -package-$(ADK_PACKAGE_NSS) += nss -package-$(ADK_COMPILE_OBEXFTP) += obexftp -package-$(ADK_PACKAGE_OLSRD) += olsrd -package-$(ADK_COMPILE_OPENCDK) += opencdk -package-$(ADK_PACKAGE_OPENCT) += openct -package-$(ADK_PACKAGE_OPENOBEX) += openobex -package-$(ADK_COMPILE_OPENLDAP) += openldap -package-$(ADK_PACKAGE_OPENNTPD) += openntpd -package-$(ADK_PACKAGE_OPENSC) += opensc -package-$(ADK_PACKAGE_OPENSIPS) += opensips -package-$(ADK_COMPILE_OPENSSH) += openssh -package-$(ADK_COMPILE_OPENSSL) += openssl -package-$(ADK_PACKAGE_OPENSSL_PKCS11) += openssl-pkcs11 -package-$(ADK_PACKAGE_OPENSWAN) += openswan -package-$(ADK_PACKAGE_OPENVPN) += openvpn -package-$(ADK_PACKAGE_OPROFILE) += oprofile -package-$(ADK_COMPILE_OSIRIS) += osiris -package-$(ADK_PACKAGE_OWFS) += owfs -package-$(ADK_PACKAGE_P910ND) += p910nd -package-$(ADK_PACKAGE_PALANTIR) += palantir -package-$(ADK_PACKAGE_PANGO) += pango -package-$(ADK_PACKAGE_PARPROUTED) += parprouted -package-$(ADK_PACKAGE_PARTED) += parted -package-$(ADK_PACKAGE_PATCH) += patch -package-$(ADK_PACKAGE_PCIUTILS) += pciutils -package-$(ADK_COMPILE_PCRE) += pcre -package-$(ADK_PACKAGE_PERL) += perl -package-$(ADK_COMPILE_PHP) += php -package-$(ADK_PACKAGE_PICOCOM) += picocom -package-$(ADK_PACKAGE_PIPACS) += pipacs -package-$(ADK_PACKAGE_PIXMAN) += pixman -package-$(ADK_COMPILE_PMACCT) += pmacct -package-$(ADK_COMPILE_POPT) += popt -package-$(ADK_PACKAGE_PORTMAP) += portmap -package-$(ADK_PACKAGE_PORTSENTRY) += portsentry -package-$(ADK_COMPILE_POSTGRESQL) += postgresql -package-$(ADK_PACKAGE_PPP) += ppp -package-$(ADK_PACKAGE_PPTP) += pptp -package-$(ADK_PACKAGE_PPTPD) += pptpd -package-$(ADK_PACKAGE_PRIVOXY) += privoxy -package-$(ADK_PACKAGE_PROCMAIL) += procmail -package-$(ADK_PACKAGE_PROCPS) += procps -package-$(ADK_PACKAGE_PTUNNEL) += ptunnel -package-$(ADK_PACKAGE_PYTHON) += python -package-$(ADK_PACKAGE_QUAGGA) += quagga -package-$(ADK_PACKAGE_RADDUMP) += raddump -package-$(ADK_PACKAGE_RADVD) += radvd -package-$(ADK_PACKAGE_RANDRPROTO) += randrproto -package-$(ADK_PACKAGE_RARPD) += rarpd -package-$(ADK_PACKAGE_RDATE) += rdate -package-$(ADK_COMPILE_READLINE) += readline -package-$(ADK_PACKAGE_REAIM) += reaim -package-$(ADK_PACKAGE_RENDERPROTO) += renderproto -package-$(ADK_PACKAGE_RESOURCEPROTO) += resourceproto -package-$(ADK_COMPILE_RP_PPPOE) += rp-pppoe -package-$(ADK_PACKAGE_RPM) += rpm -package-$(ADK_PACKAGE_RRDCOLLECT) += rrdcollect -package-$(ADK_COMPILE_RRDTOOL) += rrdtool -package-$(ADK_PACKAGE_RUBY) += ruby -package-$(ADK_COMPILE_RRS) += rrs -package-$(ADK_PACKAGE_RSYNC) += rsync -package-$(ADK_PACKAGE_RTORRENT) += rtorrent -package-$(ADK_COMPILE_SAMBA) += samba -package-$(ADK_PACKAGE_SANE_BACKENDS) += sane-backends -package-$(ADK_PACKAGE_SCANLOGD) += scanlogd -package-$(ADK_PACKAGE_SCREEN) += screen -package-$(ADK_PACKAGE_SCRNSAVERPROTO) += scrnsaverproto -package-$(ADK_PACKAGE_SCSI_SPIN) += scsi-spin -package-$(ADK_PACKAGE_SER2NET) += ser2net -package-$(ADK_PACKAGE_SERDISPLIB) += serdisplib -package-$(ADK_PACKAGE_SETPWC) += setpwc -package-$(ADK_PACKAGE_SETSERIAL) += setserial -package-$(ADK_PACKAGE_SHAT) += shat -package-$(ADK_PACKAGE_SHOREWALL) += shorewall-common -package-${ADK_PACKAGE_SHOREWALL_SHELL} += shorewall-shell -package-$(ADK_PACKAGE_SIPROXD) += siproxd -package-$(ADK_PACKAGE_SIPSAK) += sipsak -package-$(ADK_PACKAGE_SISPMCTL) += sispmctl -package-$(ADK_COMPILE_SNORT) += snort -package-$(ADK_COMPILE_SNORT_WIRELESS) += snort-wireless -package-$(ADK_PACKAGE_SOCAT) += socat -package-$(ADK_COMPILE_SPEEX) += speex -package-$(ADK_COMPILE_SQLITE) += sqlite -package-$(ADK_PACKAGE_SQUID) += squid -package-$(ADK_PACKAGE_SRELAY) += srelay -package-$(ADK_PACKAGE_SSLTUNNEL) += ssltunnel -package-$(ADK_PACKAGE_SSMTP) += ssmtp -package-$(ADK_PACKAGE_STRACE) += strace -package-$(ADK_PACKAGE_STRESS) += stress -package-$(ADK_PACKAGE_SUBVERSION) += subversion -package-$(ADK_PACKAGE_SWCONFIG) += swconfig -package-$(ADK_PACKAGE_SYSLOG_NG) += syslog-ng -package-$(ADK_PACKAGE_SYSSTAT) += sysstat -package-${ADK_PACKAGE_TCL} += tcl -package-$(ADK_PACKAGE_LIBWRAP) += tcp_wrappers -package-$(ADK_PACKAGE_TAR) += tar -package-$(ADK_PACKAGE_TCPDUMP) += tcpdump -package-$(ADK_PACKAGE_TINC) += tinc -package-$(ADK_PACKAGE_TINYPROXY) += tinyproxy -package-$(ADK_PACKAGE_TMSNC) += tmsnc -package-$(ADK_PACKAGE_TNTNET) += tntnet -package-$(ADK_PACKAGE_TOR) += tor -package-$(ADK_PACKAGE_TRAFSHOW) += trafshow -package-$(ADK_PACKAGE_TTCP) += ttcp ifneq (${ADK_TARGET_LIB_GLIBC},y) ifneq (${ADK_NATIVE},y) package-$(ADK_PACKAGE_UCLIBC) += uclibc endif package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++ endif -package-$(ADK_PACKAGE_UDEV) += udev -package-$(ADK_PACKAGE_UDP_BROADCAST_RELAY) += udp-broadcast-relay -package-$(ADK_PACKAGE_ULOGD) += ulogd -package-$(ADK_PACKAGE_UPDATEDD) += updatedd -package-$(ADK_COMPILE_USBUTILS) += usbutils -package-$(ADK_PACKAGE_USSP_PUSH) += ussp-push -package-$(ADK_PACKAGE_USTL) += ustl -package-$(ADK_COMPILE_UTIL_LINUX_NG) += util-linux-ng -package-$(ADK_PACKAGE_VALGRIND) += valgrind -package-$(ADK_PACKAGE_VGP) += vgp -package-$(ADK_PACKAGE_VIDEOPROTO) += videoproto -package-$(ADK_PACKAGE_VILISTEXTUM) += vilistextum -package-$(ADK_PACKAGE_VIM) += vim -package-$(ADK_PACKAGE_VNC_REFLECTOR) += vnc-reflector -package-$(ADK_PACKAGE_VNSTAT) += vnstat -package-$(ADK_PACKAGE_VPNC) += vpnc -package-$(ADK_PACKAGE_VRRPD) += vrrpd -package-$(ADK_PACKAGE_VSFTPD) += vsftpd -package-$(ADK_PACKAGE_VTUN) += vtun -package-$(ADK_PACKAGE_WATCHDOG) += watchdog -package-$(ADK_PACKAGE_WCCPD) += wccpd -package-$(ADK_PACKAGE_WDFS) += wdfs -package-$(ADK_PACKAGE_WEECHAT) += weechat -package-$(ADK_PACKAGE_WGET) += wget -package-$(ADK_PACKAGE_WIFIDOG) += wifidog -package-$(ADK_DOWNLOAD_WIRELESS_FIRMWARE) += wireless-firmware -package-$(ADK_PACKAGE_WOL) += wol -package-$(ADK_PACKAGE_WONDERSHAPER) += wondershaper -package-$(ADK_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant -package-$(ADK_PACKAGE_WPUT) += wput -package-$(ADK_PACKAGE_XFSPROGS) += xfsprogs -package-$(ADK_PACKAGE_XINETD) += xinetd -package-$(ADK_PACKAGE_XCMISCPROTO) += xcmiscproto -package-$(ADK_PACKAGE_XEXTPROTO) += xextproto -package-$(ADK_PACKAGE_XKBCOMP) += xkbcomp -package-$(ADK_PACKAGE_XKEYBOARD_CONFIG) += xkeyboard-config -package-$(ADK_PACKAGE_XF86_VIDEO_CIRRUS) += xf86-video-cirrus -package-$(ADK_PACKAGE_XF86_VIDEO_GEODE) += xf86-video-geode -package-$(ADK_PACKAGE_XF86DGA) += xf86dga -package-$(ADK_PACKAGE_XF86DGAPROTO) += xf86dgaproto -package-$(ADK_PACKAGE_XPROTO) += xproto -package-$(ADK_PACKAGE_XORG_SERVER) += xorg-server -package-$(ADK_PACKAGE_XTRANS) += xtrans -package-$(ADK_PACKAGE_XZ) += xz -package-$(ADK_PACKAGE_ZLIB) += zlib -package-$(ADK_PACKAGE_ZLIB_DEV) += zlib -package-$(ADK_PACKAGE_ZSH) += zsh -# kernel addon packages -package-$(ADK_PACKAGE_KMOD_EM28XX) += em28xx -package-$(ADK_PACKAGE_NTFS_3G) += ntfs-3g -package-$(ADK_PACKAGE_KMOD_SANGAM_ATM) += sangam-atm DOWNLOAD:=$(patsubst %,%-download,$(package-y) $(package-m)) COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) diff --git a/package/depmaker b/package/depmaker index 06f5a9e28..0e683ff8c 100644 --- a/package/depmaker +++ b/package/depmaker @@ -8,6 +8,14 @@ fi for subdir in */Makefile; do subdir=${subdir%/*} + case $subdir { + (@(?(e)g|uc|)libc|libpthread|uclibc++) ;; + (*) + typeset -u dnu=${subdir//-/_} + dnu=${dnu//+/X} + print "package-\$(ADK_COMPILE_${dnu}) += $subdir" + ;; + } cd $subdir deps=$($GMAKE show=PKG_BUILDDEP) cd .. diff --git a/package/pkgmaker b/package/pkgmaker index 59228d753..b9f591a4b 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -11,12 +11,13 @@ for subdir in alsa-lib bash bc mksh; do pn=$($GMAKE show=PKG_NAME) # pn: package name pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options pfl=$($GMAKE show=PKG_FLAVOURS) # pfl: all package flavours - typeset -u pnu=${pn//-/_} # pnu: package name uppercase + typeset -u dnu=${subdir//-/_} # dnu: subdir name uppercase + dnu=${dnu//+/X} pd=$($GMAKE show=PKG_DESCR) # pd: package description ph=$($GMAKE show=PKG_URL) # ph: package homepage ( - print "config ADK_COMPILE_$pnu" + print "config ADK_COMPILE_$dnu" print \\ttristate print -n \\tdepends on sp=' ' # local sp: space (or ' || ') @@ -37,7 +38,7 @@ for subdir in alsa-lib bash bc mksh; do print "\tprompt \"$xf ${pd:-$pn}\"" print \\ttristate print \\tdefault n - print \\tselect ADK_COMPILE_$pnu + print \\tselect ADK_COMPILE_$dnu if [[ -n $pd$ph ]]; then print \\thelp [[ -n $pd ]] && print "\t $pd" @@ -49,12 +50,12 @@ for subdir in alsa-lib bash bc mksh; do for pf in $pfl; do # pf: package flavour pfd=$($GMAKE show=PKGFD_$pf) print - print config ADK_PACKAGE_${pnu}_$pf - print "\tbool \"${pfd:-flavour ADK_PACKAGE_${pnu}_$pf}\"" + print config ADK_PACKAGE_${dnu}_$pf + print "\tbool \"${pfd:-flavour ADK_PACKAGE_${dnu}_$pf}\"" print \\tdefault n - print \\tdepends on ADK_COMPILE_$pnu + print \\tdepends on ADK_COMPILE_$dnu print \\thelp - print "\t flavour ADK_PACKAGE_${pnu}_$pf" + print "\t flavour ADK_PACKAGE_${dnu}_$pf" done ) >Config.in cd .. -- cgit v1.2.3 From 67fc90c4cc712a8610f2091e6d0984d8174061e1 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 23:26:58 +0059 Subject: fix dependencies; note libfuse are broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • xx is the script used to validate them (will be folded into pkgmaker soon) • davfs2 (two of three flavours) and wdfs (once), as well as fuse (or fuse-utils?) depend on libfuse, but there is no libfuse (the working builddep on the fuse directory was kept intact, though) Signed-off-by: Thorsten Glaser --- package/apr-util/Makefile | 2 +- package/avahi/Makefile | 2 +- package/cairo/Makefile | 2 +- package/dansguardian/Makefile | 2 +- package/davfs2/Makefile | 4 ++-- package/dbus/Makefile | 2 +- package/fuse/Makefile | 2 +- package/gdb/Makefile | 2 +- package/git/Makefile | 2 +- package/heimdal/Makefile | 2 +- package/krb5/Makefile | 2 +- package/lighttpd/Makefile | 2 +- package/miax/Makefile | 2 +- package/nmap/Makefile | 2 +- package/pkgmaker | 2 +- package/snort-wireless/Makefile | 2 +- package/snort/Makefile | 2 +- package/subversion/Makefile | 2 +- package/wdfs/Makefile | 2 +- package/xx | 35 +++++++++++++++++++++++++++++++++++ 20 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 package/xx (limited to 'package/pkgmaker') diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 6b4142600..604a9c17c 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= expat apr PKG_MD5SUM:= dc772ae295f49ddb8ee8e69a9716c53b PKG_DESCR:= Apache Portable Runtime utility library PKG_SECTION:= libs -PKG_DEPENDS:= libexpat apr +PKG_DEPENDS:= expat apr PKG_URL:= http://apr.apache.org PKG_SITES:= http://apache.mirror.clusters.cc/apr/ diff --git a/package/avahi/Makefile b/package/avahi/Makefile index a85b4dcd1..ba7698027 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= libdaemon expat gdbm glib PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e PKG_DESCR:= mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon PKG_SECTION:= net -PKG_DEPENDS:= libavahi libdaemon libexpat +PKG_DEPENDS:= libavahi libdaemon expat PKG_URL:= http://avahi.org PKG_SITES:= http://avahi.org/download/ diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 39e1caf35..81bc95e4e 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= libpng pixman freetype fontconfig libX11 PKG_MD5SUM:= d3e1a1035ae563812d4dd44a74fb0dd0 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs -PKG_DEPENDS:= fontconfig freetype libpng libX11 pixman +PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 6397610e6..42fcf6cb3 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -13,7 +13,7 @@ endif PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a PKG_DESCR:= web content filter proxy PKG_SECTION:= net -PKG_DEPENDS:= libpcre zlib +PKG_DEPENDS:= pcre zlib PKG_URL:= http://dansguardian.org PKG_SITES:= http://dansguardian.org/downloads/2/Stable/ diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index d32f750c2..55bd4eddc 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -19,11 +19,11 @@ PKG_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} include ${TOPDIR}/mk/package.mk ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) -PKG_DEPENDS:= fuse-utils kmod-fuse libfuse libiconv neon +PKG_DEPENDS:= fuse-utils kmod-fuse 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 +PKG_DEPENDS:= kmod-fs-coda fuse-utils kmod-fuse libiconv neon endif $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 6bb63c302..32c90dbeb 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= expat PKG_MD5SUM:= c7a47b851ebe02f6726b65b78d1b730b PKG_DESCR:= DBUS library PKG_SECTION:= net -PKG_DEPENDS:= libexpat +PKG_DEPENDS:= expat PKG_URL:= http://dbus.freedesktop.org PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ ifeq ($(ADK_STATIC),y) diff --git a/package/fuse/Makefile b/package/fuse/Makefile index b3b3658d1..95e3580e6 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 4879f06570d2225667534c37fea04213 PKG_DESCR:= Filesystem in Userspace (utilities) PKG_SECTION:= admin -PKG_DEPENDS:= kmod-fuse libfuse +PKG_DEPENDS:= kmod-fuse PKG_URL:= http://fuse.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} diff --git a/package/gdb/Makefile b/package/gdb/Makefile index b8cbfd502..17d37ef55 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_DESCR:= GNU debugger PKG_SECTION:= comp -PKG_DEPENDS:= libthread_db libncurses +PKG_DEPENDS:= libthread-db libncurses PKG_BUILDDEP+= ncurses readline include ${TOPDIR}/mk/package.mk diff --git a/package/git/Makefile b/package/git/Makefile index 312e758ef..ea93f3a07 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= openssl curl expat PKG_MD5SUM:= 50fb736021ef89916af622cb4772bbea PKG_DESCR:= fast version control system PKG_SECTION:= misc -PKG_DEPENDS:= openssl curl +PKG_DEPENDS:= libopenssl curl PKG_URL:= http://git-scm.com PKG_SITES:= http://kernel.org/pub/software/scm/git/ diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index ae97de3a3..cd0c3fa9f 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -16,7 +16,7 @@ endif PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e PKG_DESCR:= Kerberos 5 server PKG_SECTION:= net -PKG_DEPENDS:= heimdal-libs heimdal-client-libs libncurses libcom_err +PKG_DEPENDS:= heimdal-libs heimdal-client-libs libncurses libcom-err PKG_URL:= http://www.h5l.org PKG_SITES:= http://www.h5l.org/dist/src/ diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 41742cb64..9de7e2127 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= ncurses e2fsprogs PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564 PKG_DESCR:= MIT kerberos server PKG_SECTION:= net -PKG_DEPENDS:= krb5-libs libncurses libss libcom_err +PKG_DEPENDS:= krb5-libs libncurses libss libcom-err PKG_URL:= http://web.mit.edu/kerberos PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/ diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index a08e4e597..3ed986070 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -13,7 +13,7 @@ endif PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704 PKG_DESCR:= a flexible and lightweight web server PKG_SECTION:= net -PKG_DEPENDS:= libxml2 libsqlite libpcre +PKG_DEPENDS:= libxml2 libsqlite pcre PKG_URL:= http://www.lighttpd.net PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ diff --git a/package/miax/Makefile b/package/miax/Makefile index 3f66f9cb7..9e815a0a1 100644 --- a/package/miax/Makefile +++ b/package/miax/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= bluez PKG_MD5SUM:= 44f0d2ef46ee2697d890b7b96846adc7 PKG_DESCR:= A console iax (asterisk) client PKG_SECTION:= bluetooth -PKG_DEPENDS:= kmod-bluetooth bluez-libs libpthread +PKG_DEPENDS:= kmod-bluetooth bluez libpthread PKG_URL:= http://sourceforge.net/projects/miax PKG_SITES:= http://mesh.dl.sourceforge.net/sourceforge/miax/ diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 4b0ea6d5c..58b8ee8a6 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -13,7 +13,7 @@ endif PKG_MD5SUM:= 32d27de32166c02d670bb4a086185886 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net -PKG_DEPENDS:= libdnet libpcap libpcre +PKG_DEPENDS:= libdnet libpcap pcre PKG_URL:= http://nmap.org PKG_SITES:= http://download.insecure.org/nmap/dist/ diff --git a/package/pkgmaker b/package/pkgmaker index b9f591a4b..c23d91673 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -6,7 +6,7 @@ else export GMAKE=make fi -for subdir in alsa-lib bash bc mksh; do +for subdir in alsa-lib bash bc expat mksh; do cd $subdir pn=$($GMAKE show=PKG_NAME) # pn: package name pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options diff --git a/package/snort-wireless/Makefile b/package/snort-wireless/Makefile index 4cb773d6f..1aed15e52 100644 --- a/package/snort-wireless/Makefile +++ b/package/snort-wireless/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= libnet libpcap pcre PKG_MD5SUM:= 1aa699ae279bf7a1140cf6cca02f9999 PKG_DESCR:= a flexible Wireless Network Intrusion Detection System (NIDS) PKG_SECTION:= net -PKG_DEPENDS:= libnet libpcap libpcre +PKG_DEPENDS:= libnet libpcap pcre PKG_URL:= http://www.snort-wireless.org PKG_SITES:= http://www.snort-wireless.org/files/ diff --git a/package/snort/Makefile b/package/snort/Makefile index 7ceadf1d6..1c9832c53 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= libnet libpcap pcre PKG_MD5SUM:= 22c448e25538cdf74c62abe586aeac0a PKG_DESCR:= a flexible Network Intrusion Detection System (NIDS) PKG_SECTION:= net -PKG_DEPENDS:= libnet libpcap libpcre +PKG_DEPENDS:= libnet libpcap pcre PKG_SITES:= http://www.snort.org/dl/current/ include ${TOPDIR}/mk/package.mk diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 9203f9510..2aac583a3 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -13,7 +13,7 @@ endif PKG_MD5SUM:= 0ab0f26f6eb056add1b9d3059a3f4247 PKG_DESCR:= revision control program PKG_SECTION:= net -PKG_DEPENDS:= zlib apr apr-util libiconv libexpat +PKG_DEPENDS:= zlib apr apr-util libiconv expat PKG_SITES:= http://subversion.tigris.org/downloads/ include ${TOPDIR}/mk/package.mk diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile index 280e610e2..71951046c 100644 --- a/package/wdfs/Makefile +++ b/package/wdfs/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= openssl fuse neon glib PKG_MD5SUM= 628bb44194d04c1cf8aacc446ed0a230 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= net -PKG_DEPENDS:= libopenssl fuse-utils kmod-fuse libfuse neon glib +PKG_DEPENDS:= libopenssl fuse-utils kmod-fuse neon glib PKG_SITES= http://noedler.de/projekte/wdfs/ include ${TOPDIR}/mk/package.mk diff --git a/package/xx b/package/xx new file mode 100644 index 000000000..529a46d6f --- /dev/null +++ b/package/xx @@ -0,0 +1,35 @@ +cd "$(dirname "$0")" +export TOPDIR=$(realpath ..) +if gmake --help >/dev/null 2>&1; then + export GMAKE=gmake +else + export GMAKE=make +fi + +rm -rf pkglist.d +mkdir pkglist.d +for a in */Makefile; do + sd=${a%/*} + cd $sd + pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options + for xu in $pa; do # xu: package option uppercase + x=$($GMAKE show=PKGNAME_$xu) # x: subpackage name + print -nr -- "$xu" >../pkglist.d/"$x" + done + cd .. +done + +rm -f kdeps kaputt +for a in */Makefile; do + sd=${a%/*} + cd $sd + deps=$($GMAKE show=PKG_DEPENDS) + cd .. + for dep in $deps; do + if [[ $dep = kmod-* ]]; then + print $sd $dep >>kdeps + continue + fi + [[ -e pkglist.d/$dep ]] || print $sd $dep >>kaputt + done +done -- cgit v1.2.3 From a32b96584ecff9b223a30efd17846daaed5e1e6b Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 00:06:19 +0059 Subject: Add dependency handling for Config.in creation Signed-off-by: Thorsten Glaser --- package/.gitignore | 3 +++ package/pkgmaker | 43 ++++++++++++++++++++++++++++++++++++------- package/xx | 39 --------------------------------------- 3 files changed, 39 insertions(+), 46 deletions(-) create mode 100644 package/.gitignore delete mode 100644 package/xx (limited to 'package/pkgmaker') diff --git a/package/.gitignore b/package/.gitignore new file mode 100644 index 000000000..fc86a3bf6 --- /dev/null +++ b/package/.gitignore @@ -0,0 +1,3 @@ +Depends.mk +pkglist.d +pkgopts.d diff --git a/package/pkgmaker b/package/pkgmaker index c23d91673..9e06a9def 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -6,12 +6,28 @@ else export GMAKE=make fi -for subdir in alsa-lib bash bc expat mksh; do - cd $subdir - pn=$($GMAKE show=PKG_NAME) # pn: package name +rm -rf pkglist.d pkgopts.d +mkdir pkglist.d pkgopts.d +for a in */Makefile; do + sd=${a%/*} + cd $sd pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options + print -r -- $pa >../pkgopts.d/pa-"$sd" + xa= + for xu in $pa; do # xu: package option uppercase + x=$($GMAKE show=PKGNAME_$xu) # x: subpackage name + print -r -- "$xu" >../pkglist.d/"$x" + xa="$xa $x" + done + print -r -- $xa >../pkgopts.d/xa-"$sd" + cd .. +done + +for sd in 6tunnel aiccu alsa-lib bash bc expat mksh; do + cd $sd + pn=$($GMAKE show=PKG_NAME) # pn: package name pfl=$($GMAKE show=PKG_FLAVOURS) # pfl: all package flavours - typeset -u dnu=${subdir//-/_} # dnu: subdir name uppercase + typeset -u dnu=${sd//-/_} # dnu: subdir name uppercase dnu=${dnu//+/X} pd=$($GMAKE show=PKG_DESCR) # pd: package description ph=$($GMAKE show=PKG_URL) # ph: package homepage @@ -21,15 +37,15 @@ for subdir in alsa-lib bash bc expat mksh; do print \\ttristate print -n \\tdepends on sp=' ' # local sp: space (or ' || ') - for xu in $pa; do # xu: package option uppercase + for xu in $(<../pkgopts.d/pa-"$sd"); do # xu: package option uppercase print -n "${sp}ADK_PACKAGE_$xu" sp=' || ' done print print \\tdefault n - for xu in $pa; do # xu: package option uppercase - x=$($GMAKE show=PKGNAME_$xu) # x: subpackage name + for x in $(<../pkgopts.d/xa-"$sd"); do # x: subpackage name + xu=$(<../pkglist.d/"$x") # xu: package option uppercase print \\nconfig ADK_PACKAGE_$xu xf=$x # xf: subpackage name ........ while (( ${#xf} < 34 )); do @@ -38,6 +54,19 @@ for subdir in alsa-lib bash bc expat mksh; do print "\tprompt \"$xf ${pd:-$pn}\"" print \\ttristate print \\tdefault n + deps=$($GMAKE show=PKGDEPS_$xu) + for dep in $deps; do + case $dep { + (kmod-*) + typeset -u udep=${dep//-/_} + print "\tselect ADK_KPACKAGE_$udep" + ;; + (*) + print '\tselect' \ + ADK_PACKAGE_$(<../pkglist.d/"$dep") + ;; + } + done print \\tselect ADK_COMPILE_$dnu if [[ -n $pd$ph ]]; then print \\thelp diff --git a/package/xx b/package/xx deleted file mode 100644 index b46ef0472..000000000 --- a/package/xx +++ /dev/null @@ -1,39 +0,0 @@ -cd "$(dirname "$0")" -export TOPDIR=$(realpath ..) -if gmake --help >/dev/null 2>&1; then - export GMAKE=gmake -else - export GMAKE=make -fi - -rm -rf pkglist.d -mkdir pkglist.d -for a in */Makefile; do - sd=${a%/*} - cd $sd - pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options - for xu in $pa; do # xu: package option uppercase - x=$($GMAKE show=PKGNAME_$xu) # x: subpackage name - print -nr -- "$xu" >../pkglist.d/"$x" - done - cd .. -done - -rm -f kdeps kaputt -for a in */Makefile; do - sd=${a%/*} - cd $sd - pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options - for xu in $pa; do # xu: package option uppercase - x=$($GMAKE show=PKGNAME_$xu) # x: subpackage name - deps=$($GMAKE show=PKGDEPS_$xu) - for dep in $deps; do - if [[ $dep = kmod-* ]]; then - print $x $dep >>../kdeps - continue - fi - [[ -e ../pkglist.d/$dep ]] || print $x $dep >>../kaputt - done - done - cd .. -done -- cgit v1.2.3 From a533b462aa15737edc04985150280b5775cb46df Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 00:17:22 +0059 Subject: Create Config.new files for now, but for all packages, so cleanup can be started Signed-off-by: Thorsten Glaser --- package/.gitignore | 2 ++ package/nano/Makefile | 1 + package/pkgmaker | 9 +++++---- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/.gitignore b/package/.gitignore index fc86a3bf6..b46bcd562 100644 --- a/package/.gitignore +++ b/package/.gitignore @@ -1,3 +1,5 @@ +*/Config.in +*/Config.new Depends.mk pkglist.d pkgopts.d diff --git a/package/nano/Makefile b/package/nano/Makefile index 8878b3e22..a4dcc2290 100644 --- a/package/nano/Makefile +++ b/package/nano/Makefile @@ -13,6 +13,7 @@ PKG_SECTION:= admin PKG_DEPENDS:= libncurses PKG_URL:= http://www.nano-editor.org PKG_SITES:= http://www.nano-editor.org/dist/v2.0/ +PKG_FLAVOURS:= TINY include ${TOPDIR}/mk/package.mk diff --git a/package/pkgmaker b/package/pkgmaker index 9e06a9def..d4a77b9e7 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -8,8 +8,8 @@ fi rm -rf pkglist.d pkgopts.d mkdir pkglist.d pkgopts.d -for a in */Makefile; do - sd=${a%/*} +for sd in */Makefile; do + sd=${sd%/*} cd $sd pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options print -r -- $pa >../pkgopts.d/pa-"$sd" @@ -23,7 +23,8 @@ for a in */Makefile; do cd .. done -for sd in 6tunnel aiccu alsa-lib bash bc expat mksh; do +for sd in */Makefile; do + sd=${sd%/*} cd $sd pn=$($GMAKE show=PKG_NAME) # pn: package name pfl=$($GMAKE show=PKG_FLAVOURS) # pfl: all package flavours @@ -86,6 +87,6 @@ for sd in 6tunnel aiccu alsa-lib bash bc expat mksh; do print \\thelp print "\t flavour ADK_PACKAGE_${dnu}_$pf" done - ) >Config.in + ) >Config.new cd .. done -- cgit v1.2.3 From 39d2849441575a8cc683c215ab32f93eccfd79ab Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 00:53:52 +0059 Subject: automatic handling of CFrustFrust packages Signed-off-by: Thorsten Glaser --- mk/package.mk | 9 +++++++++ package/ctorrent/Makefile | 10 +--------- package/cxxtools/Makefile | 10 +--------- package/dansguardian/Makefile | 10 +--------- package/gpsd/Makefile | 10 +--------- package/id3lib/Makefile | 10 +--------- package/iperf/Makefile | 10 +--------- package/kismet/Makefile | 4 +--- package/libsigc++/Makefile | 7 +------ package/libtorrent/Makefile | 7 +------ package/mrd6/Makefile | 10 +--------- package/nmap/Makefile | 10 +--------- package/pkgmaker | 22 ++++++++++++++++++++++ package/rrs/Makefile | 6 +----- package/rtorrent/Makefile | 1 + package/squid/Makefile | 7 +------ package/tntnet/Makefile | 13 +++---------- 17 files changed, 48 insertions(+), 108 deletions(-) (limited to 'package/pkgmaker') diff --git a/mk/package.mk b/mk/package.mk index 16213bf02..7562b9e4f 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -3,6 +3,15 @@ all: build-all-pkgs +ifneq (${PKG_CXX},) +ifeq (${ADK_COMPILE_${PKG_CXX}_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +PKG_DEPENDS+= uclibc++ +else +PKG_DEPENDS+= libstdcxx +endif +endif + TCFLAGS:= ${TARGET_CFLAGS} TCXXFLAGS:= ${TARGET_CFLAGS} TCPPFLAGS:= ${TARGET_CPPFLAGS} diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index db9c54378..fb51b1090 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -7,21 +7,13 @@ PKG_NAME:= ctorrent PKG_VERSION:= dnh3.3.2 PKG_RELEASE:= 1 PKG_BUILDDEP+= openssl -ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= CTORRENT PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= net PKG_URL:= http://www.rahul.net/dholmes/ctorrent PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dtorrent/} -ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) -PKG_DEPENDS:= uclibc++ -else -PKG_DEPENDS:= libstdcxx -endif - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index a8b926ba9..0de136708 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -7,9 +7,7 @@ PKG_NAME:= cxxtools PKG_VERSION:= 1.4.8 PKG_RELEASE:= 1 PKG_BUILDDEP+= libiconv -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= CXXTOOLS PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af PKG_DESCR:= a collection of general-purpose C++ classes PKG_SECTION:= net @@ -19,12 +17,6 @@ PKG_SITES:= http://www.tntnet.org/download/ include ${TOPDIR}/mk/package.mk -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) diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 42fcf6cb3..7a96bda40 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -7,9 +7,7 @@ PKG_NAME:= dansguardian PKG_VERSION:= 2.10.1.1 PKG_RELEASE:= 1 PKG_BUILDDEP+= pcre zlib -ifeq (${ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= DANSGUARDIAN PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a PKG_DESCR:= web content filter proxy PKG_SECTION:= net @@ -17,12 +15,6 @@ PKG_DEPENDS:= pcre zlib PKG_URL:= http://dansguardian.org PKG_SITES:= http://dansguardian.org/downloads/2/Stable/ -ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 30e30e5a6..845bf06b6 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -7,9 +7,7 @@ PKG_NAME:= gpsd PKG_VERSION:= 2.39 PKG_RELEASE:= 1 PKG_BUILDDEP+= ncurses -ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= GPSD PKG_MD5SUM:= 3db437196a6840c252fca99b6c19d4d0 PKG_DESCR:= An interface daemon for GPS receivers PKG_SECTION:= net @@ -20,12 +18,6 @@ PKG_DESCR_1:= GPS client utilities include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index d27b46369..5df274613 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -7,9 +7,7 @@ PKG_NAME:= id3lib PKG_VERSION:= 3.8.3 PKG_RELEASE:= 1 PKG_BUILDDEP+= zlib libiconv -ifeq (${ADK_COMPILE_ID3LIB_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= ID3LIB PKG_MD5SUM:= 19f27ddd2dda4b2d26a559a4f0f402a7 PKG_DESCR:= An ID3v1/ID3v2 tagging library PKG_SECTION:= libs @@ -17,12 +15,6 @@ PKG_DEPENDS:= zlib libiconv PKG_URL:= http://id3lib.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=id3lib/} -ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 139aa8608..23231a8d6 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -6,9 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iperf PKG_VERSION:= 2.0.4 PKG_RELEASE:= 1 -ifeq (${ADK_COMPILE_IPERF_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= IPERF PKG_MD5SUM:= 8c5bc14cc2ea55f18f22afe3c23e3dcb PKG_DESCR:= Internet Protocol bandwidth measuring tool PKG_SECTION:= net @@ -18,12 +16,6 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} include ${TOPDIR}/mk/package.mk -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 diff --git a/package/kismet/Makefile b/package/kismet/Makefile index 160cc75a4..e6ecf710c 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -7,9 +7,7 @@ PKG_NAME:= kismet PKG_VERSION:= 2008-05-R1 PKG_RELEASE:= 1 PKG_BUILDDEP+= libpcap ncurses -ifeq (${ADK_COMPILE_KISMET_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= KISMET PKG_MD5SUM:= 6ee365d36354b4dee4945e67f8149294 PKG_SITES:= http://www.kismetwireless.net/code/ diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile index eff341b7f..724196bfc 100644 --- a/package/libsigc++/Makefile +++ b/package/libsigc++/Makefile @@ -11,15 +11,10 @@ PKG_DESCR:= Callback framework for C++ PKG_SECTION:= libs PKG_URL:= http://libsigc.sourceforge.net PKG_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/} +PKG_CXX:= LIBSIGCXX include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y) -PKG_DEPENDS:= uclibc++ -else -PKG_DEPENDS:= libstdcxx -endif - $(eval $(call PKG_template,LIBSIGCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y) diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 5df9a7040..4d55aa87e 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -13,15 +13,10 @@ PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsigc++ PKG_URL:= http://libtorrent.rakshasa.no PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ +PKG_CXX:= LIBTORRENT include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - $(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y) diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 6ab7e889c..bec5f0903 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -6,9 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mrd6 PKG_VERSION:= 0.9.6 PKG_RELEASE:= 1 -ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= MRD6 PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b PKG_DESCR:= IPv6 multicast routing daemon PKG_SECTION:= net @@ -19,12 +17,6 @@ WRKBUILD= ${WRKSRC}/src include ${TOPDIR}/mk/package.mk -ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) -PKG_DEPENDS:= uclibc++ -else -PKG_DEPENDS:= libstdcxx -endif - $(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 58b8ee8a6..587ad980f 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -7,9 +7,7 @@ PKG_NAME:= nmap PKG_VERSION:= 5.00 PKG_RELEASE:= 1 PKG_BUILDDEP+= pcre libpcap -ifeq (${ADK_COMPILE_NMAP_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= NMAP PKG_MD5SUM:= 32d27de32166c02d670bb4a086185886 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net @@ -21,12 +19,6 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - $(eval $(call PKG_template,NMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TCPPFLAGS+= -DNOLUA diff --git a/package/pkgmaker b/package/pkgmaker index d4a77b9e7..8b2419634 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -32,6 +32,7 @@ for sd in */Makefile; do dnu=${dnu//+/X} pd=$($GMAKE show=PKG_DESCR) # pd: package description ph=$($GMAKE show=PKG_URL) # ph: package homepage + usecxx=$($GMAKE show=PKG_CXX) ( print "config ADK_COMPILE_$dnu" @@ -57,6 +58,8 @@ for sd in */Makefile; do print \\tdefault n deps=$($GMAKE show=PKGDEPS_$xu) for dep in $deps; do + [[ -n $usecxx && $dep = @(uclibc++|libstdcxx) ]] && \ + continue case $dep { (kmod-*) typeset -u udep=${dep//-/_} @@ -77,6 +80,25 @@ for sd in */Makefile; do fi done + [[ -n $usecxx ]] && cat < Date: Sun, 20 Dec 2009 01:00:26 +0059 Subject: infrastructure and demo for one(!) free-format config line per subpackage Signed-off-by: Thorsten Glaser --- package/linux-atm/Makefile | 3 +++ package/pkgmaker | 2 ++ 2 files changed, 5 insertions(+) (limited to 'package/pkgmaker') diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 1ebd2172b..a999be5d6 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -18,6 +18,9 @@ PKG_DESCR_1:= br2684ctl PKG_DEPENDS_1:= libatm PKG_SECTION_1:= net +CFLINE_LIBATM:= depends on !ADK_HOST_FREEBSD +CFLINE_BR2684CTL:= depends on !ADK_HOST_FREEBSD + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/pkgmaker b/package/pkgmaker index 8b2419634..23e2a25a5 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -72,6 +72,8 @@ for sd in */Makefile; do } done print \\tselect ADK_COMPILE_$dnu + dep=$($GMAKE show=CFLINE_$xu) # one free-format line + [[ -n $dep ]] && print "\t$dep" if [[ -n $pd$ph ]]; then print \\thelp [[ -n $pd ]] && print "\t $pd" -- cgit v1.2.3 From fed4931572ca5a46b4f316184f3f8d357636fbfb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Dec 2009 11:25:09 +0100 Subject: add subpackage descriptions and make menu pkgmaker should only be run by developers. takes to long otherwise. generated Config.in data can be committed. --- Makefile | 5 +++++ mk/build.mk | 4 ++++ mk/package.mk | 1 + package/pkgmaker | 5 +++-- 4 files changed, 13 insertions(+), 2 deletions(-) (limited to 'package/pkgmaker') diff --git a/Makefile b/Makefile index 093fb73e2..f1d49ed44 100644 --- a/Makefile +++ b/Makefile @@ -64,6 +64,8 @@ pkg-help: @echo 'This does not automatically resolve package dependencies!' dev-help: + @echo 'Regenerate menu information via "make menu"' + @echo @echo 'Fast way of updating package patches:' @echo ' run "make package= clean" to start with a good base' @echo ' run "make package= patch" to fetch, unpack and patch the source' @@ -135,6 +137,9 @@ package_index: .prereq_done bulk: .prereq_done @${GMAKE_INV} bulk +menu: .prereq_done + @${GMAKE_INV} menu + world: .prereq_done @${GMAKE_INV} world diff --git a/mk/build.mk b/mk/build.mk index c1828599f..f70d40cb1 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -352,3 +352,7 @@ distclean: ${TOPDIR}/package/*/info.mk endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) + +menu: + mksh $(TOPDIR)/package/pkgmaker + diff --git a/mk/package.mk b/mk/package.mk index 7562b9e4f..c9d9c7978 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -149,6 +149,7 @@ define PKG_template ALL_PKGOPTS+= $(1) PKGNAME_$(1)= $(2) PKGDEPS_$(1)= $(4) +PKGDESC_$(1)= $(5) IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX} IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) diff --git a/package/pkgmaker b/package/pkgmaker index 23e2a25a5..9d5b40761 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -53,7 +53,8 @@ for sd in */Makefile; do while (( ${#xf} < 34 )); do xf=$xf. done - print "\tprompt \"$xf ${pd:-$pn}\"" + desc=$($GMAKE show=PKGDESC_$xu) + print "\tprompt \"$xf ${desc:-${pd:-$pn}}\"" print \\ttristate print \\tdefault n deps=$($GMAKE show=PKGDEPS_$xu) @@ -111,6 +112,6 @@ EOF print \\thelp print "\t flavour ADK_PACKAGE_${dnu}_$pf" done - ) >Config.new + ) >Config.in cd .. done -- cgit v1.2.3 From b8342db24c4b4f1c45211352e120e21d2756b1dc Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 17:34:09 +0059 Subject: un-merge conflict by wbx@ Signed-off-by: Thorsten Glaser --- package/pkgmaker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pkgmaker') diff --git a/package/pkgmaker b/package/pkgmaker index 9d5b40761..28167a0a4 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -112,6 +112,6 @@ EOF print \\thelp print "\t flavour ADK_PACKAGE_${dnu}_$pf" done - ) >Config.in + ) >Config.new cd .. done -- cgit v1.2.3 From 82b3f66f50f608723a2d388bf933ec08a0fefda4 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 14:40:27 +0059 Subject: Use the optimisation of the “dump” option to speed up 10x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thorsten Glaser --- package/depmaker | 15 ++--- package/pkgmaker | 172 ++++++++++++++++++++++++++++++++++++------------------- 2 files changed, 121 insertions(+), 66 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/depmaker b/package/depmaker index 0e683ff8c..43d4327eb 100644 --- a/package/depmaker +++ b/package/depmaker @@ -6,21 +6,22 @@ else export GMAKE=make fi -for subdir in */Makefile; do - subdir=${subdir%/*} - case $subdir { +for dn in */Makefile; do + dn=${dn%/*} + case $dn { (@(?(e)g|uc|)libc|libpthread|uclibc++) ;; (*) - typeset -u dnu=${subdir//-/_} + # dnu: directory name, uppercase, y/-+/_X/ + typeset -u dnu=${dn//-/_} dnu=${dnu//+/X} - print "package-\$(ADK_COMPILE_${dnu}) += $subdir" + print "package-\$(ADK_COMPILE_${dnu}) += $dn" ;; } - cd $subdir + cd $dn deps=$($GMAKE show=PKG_BUILDDEP) cd .. [[ -n $deps ]] || continue - x="${subdir}-compile:" + x="${dn}-compile:" for dep in $deps; do x="$x ${dep}-compile" done diff --git a/package/pkgmaker b/package/pkgmaker index 28167a0a4..a8a54c631 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -6,112 +6,166 @@ else export GMAKE=make fi -rm -rf pkglist.d pkgopts.d -mkdir pkglist.d pkgopts.d -for sd in */Makefile; do - sd=${sd%/*} - cd $sd - pa=$($GMAKE show=ALL_PKGOPTS) # pa: all subpackage options - print -r -- $pa >../pkgopts.d/pa-"$sd" - xa= - for xu in $pa; do # xu: package option uppercase - x=$($GMAKE show=PKGNAME_$xu) # x: subpackage name - print -r -- "$xu" >../pkglist.d/"$x" - xa="$xa $x" - done - print -r -- $xa >../pkgopts.d/xa-"$sd" +# build a cache of “ipkg package name” → “package conf option” for +# use with dependency resolution +rm -rf pkglist.d +mkdir pkglist.d +for dn in */Makefile; do + dn=${dn%/*} + cd $dn + + # ALL_PKGOPTS: all subpackage conf options + # PKGNAME_*: subpackage (ipkg) package name, by subpackage option + eval $($GMAKE dump="ALL_PKGOPTS \ + \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x})") cd .. + + if [[ -z $ALL_PKGOPTS ]]; then + print -u2 "Warning: $dn/Makefile contains no packages, skipped" + continue + fi + + for spcu in $ALL_PKGOPTS; do # spcu: package option, ucase + eval sppn=\$PKGNAME_$spcu # sppn: subpackage (ipkg) name + # once mksh R40 is out, use its new associative arrays here! + print -r -- "$spcu" >pkglist.d/"$sppn" + done done -for sd in */Makefile; do - sd=${sd%/*} - cd $sd - pn=$($GMAKE show=PKG_NAME) # pn: package name - pfl=$($GMAKE show=PKG_FLAVOURS) # pfl: all package flavours - typeset -u dnu=${sd//-/_} # dnu: subdir name uppercase +# build Config.in files and resolve dependencies +for dn in */Makefile; do + dn=${dn%/*} + cd $dn + + # PKG_NAME: package name (directory, free-format) + # PKG_FLAVOURS: all package flavours (boolean options), uppercase + # PKG_DESCR: package description (directory) + # PKG_URL: package homepage + # PKG_CXX: uppercase varname part to use for CFrustFrust checks + # ALL_PKGOPTS: all subpackage conf options + # PKGNAME_*: subpackage (ipkg) package name, by subpackage option + # PKGDESC_*: subpackage description, by subpackage option + # PKGDEPS_*: subpackage depends on ipkg packages, by subpkg option + # CFLINE_*: one free-format Config.in line per subpackage option + # PKGFD_*: flavour description, per package flavour option + eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_URL PKG_CXX \ + ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \ + PKGDESC_\${x} PKGDEPS_\${x} CFLINE_\${x}) \ + \$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x})") + + # dnu: directory name, uppercase, y/-+/_X/ + typeset -u dnu=${dn//-/_} dnu=${dnu//+/X} - pd=$($GMAKE show=PKG_DESCR) # pd: package description - ph=$($GMAKE show=PKG_URL) # ph: package homepage - usecxx=$($GMAKE show=PKG_CXX) ( + + # Handle master package (directory) print "config ADK_COMPILE_$dnu" + if [[ -z $ALL_PKGOPTS ]]; then + # pseudo package, does not produce an ipkg package + ppnf=$PKG_NAME # ppnf: pseudopkg name, filled + if [[ -n $PKG_DESCR ]]; then + while (( ${#ppnf} < 34 )); do + ppnf=$ppnf. + done + ppnf="$ppnf $PKG_DESCR" + fi + print "\tprompt \"$ppnf\"" + fi print \\ttristate - print -n \\tdepends on - sp=' ' # local sp: space (or ' || ') - for xu in $(<../pkgopts.d/pa-"$sd"); do # xu: package option uppercase - print -n "${sp}ADK_PACKAGE_$xu" - sp=' || ' - done - print + if [[ -n $ALL_PKGOPTS ]]; then + # real (master) package, contains 1+ ipkg (sub)packages + print -n \\tdepends on + sp=' ' # local sp: space (or ' || ') + for spcu in $ALL_PKGOPTS; do # spcu: package option, ucase + print -n "${sp}ADK_PACKAGE_$spcu" + sp=' || ' + done + print + fi print \\tdefault n - for x in $(<../pkgopts.d/xa-"$sd"); do # x: subpackage name - xu=$(<../pkglist.d/"$x") # xu: package option uppercase - print \\nconfig ADK_PACKAGE_$xu - xf=$x # xf: subpackage name ........ - while (( ${#xf} < 34 )); do - xf=$xf. - done - desc=$($GMAKE show=PKGDESC_$xu) - print "\tprompt \"$xf ${desc:-${pd:-$pn}}\"" + # Handle subpackages / multipackages + for spcu in $ALL_PKGOPTS; do # spcu: package option, ucase + eval sppn=\$PKGNAME_$spcu # sppn: subpackage (ipkg) name + eval desc=\$PKGDESC_$spcu # desc: subpackage description + : ${desc:=$PKG_DESCR} # take from main pkg if empty + eval deps=\$PKGDEPS_$spcu # deps: subpackage dependencies + eval xline=\$PKGDESC_$spcu # xline: one free-format line + print \\nconfig ADK_PACKAGE_$spcu + spnf=$sppn # spnf: subpackage name, filled + if [[ -n ${desc:-$PKG_NAME} ]]; then + while (( ${#spnf} < 34 )); do + spnf=$spnf. + done + spnf="$spnf ${desc:-$PKG_NAME}" + fi + print "\tprompt \"$spnf\"" print \\ttristate print \\tdefault n - deps=$($GMAKE show=PKGDEPS_$xu) - for dep in $deps; do - [[ -n $usecxx && $dep = @(uclibc++|libstdcxx) ]] && \ + for dep in $deps; do # dep: ipkg name of one rundep. + # skip dependencies on uclibc++ and libstdcxx iff + # we produce these automatically + [[ -n $PKG_CXX && $dep = @(uclibc++|libstdcxx) ]] && \ continue case $dep { (kmod-*) + # produce dependency on kernel package + # which have special name→sym mangling typeset -u udep=${dep//-/_} print "\tselect ADK_KPACKAGE_$udep" ;; (*) + # produce dependency on regular package + # where the symbol is cached (see above) print '\tselect' \ ADK_PACKAGE_$(<../pkglist.d/"$dep") ;; } done print \\tselect ADK_COMPILE_$dnu - dep=$($GMAKE show=CFLINE_$xu) # one free-format line - [[ -n $dep ]] && print "\t$dep" - if [[ -n $pd$ph ]]; then + [[ -n $xline ]] && print "\t$xline" + if [[ -n $desc$PKG_URL ]]; then + # produce (optional) help text print \\thelp - [[ -n $pd ]] && print "\t $pd" - [[ -n $pd && -n $ph ]] && print '\t ' - [[ -n $ph ]] && print "\t $ph" + [[ -n $desc ]] && print "\t $desc" + [[ -n $desc && -n $PKG_URL ]] && print '\t ' + [[ -n $PKG_URL ]] && print "\t WWW: $PKG_URL" fi done - [[ -n $usecxx ]] && cat < flavour $pfcu}\"" print \\tdefault n print \\tdepends on ADK_COMPILE_$dnu print \\thelp - print "\t flavour ADK_PACKAGE_${dnu}_$pf" + print "\t flavour ADK_PACKAGE_${dnu}_$pfcu for $PKG_NAME" done - ) >Config.new + + ) >Config.in cd .. done -- cgit v1.2.3 From 77a222d5094d902128d355685501c7b30c8cccca Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 14:52:58 +0059 Subject: Pimp up the progress bar Signed-off-by: Thorsten Glaser --- mk/split-cfg.mk | 2 +- package/depmaker | 6 ++++++ package/pkgmaker | 8 ++++++++ scripts/split-cfg.sh | 31 ++++++++++++++++--------------- 4 files changed, 31 insertions(+), 16 deletions(-) (limited to 'package/pkgmaker') diff --git a/mk/split-cfg.mk b/mk/split-cfg.mk index 6b1091e89..9f4bff8e7 100644 --- a/mk/split-cfg.mk +++ b/mk/split-cfg.mk @@ -4,4 +4,4 @@ ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG: ${TOPDIR}/.config \ ${TOPDIR}/mk/split-cfg.mk ${TOPDIR}/scripts/split-cfg.sh - ${BASH} ${TOPDIR}/scripts/split-cfg.sh '${TOPDIR}' + mksh ${TOPDIR}/scripts/split-cfg.sh '${TOPDIR}' diff --git a/package/depmaker b/package/depmaker index 43d4327eb..edbacc6f1 100644 --- a/package/depmaker +++ b/package/depmaker @@ -5,9 +5,13 @@ if gmake --help >/dev/null 2>&1; then else export GMAKE=make fi +(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) +typeset -L$x_cols pbar for dn in */Makefile; do dn=${dn%/*} + pbar="$dn ..." + print -nu2 "$pbar\r" case $dn { (@(?(e)g|uc|)libc|libpthread|uclibc++) ;; (*) @@ -27,3 +31,5 @@ for dn in */Makefile; do done print -r -- $x done >Depends.mk +pbar=done +print -u2 "$pbar" diff --git a/package/pkgmaker b/package/pkgmaker index a8a54c631..879c5eff4 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -5,6 +5,8 @@ if gmake --help >/dev/null 2>&1; then else export GMAKE=make fi +(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) +typeset -L$x_cols pbar # build a cache of “ipkg package name” → “package conf option” for # use with dependency resolution @@ -12,6 +14,8 @@ rm -rf pkglist.d mkdir pkglist.d for dn in */Makefile; do dn=${dn%/*} + pbar="Pass 1: $dn ..." + print -nu2 "$pbar\r" cd $dn # ALL_PKGOPTS: all subpackage conf options @@ -35,6 +39,8 @@ done # build Config.in files and resolve dependencies for dn in */Makefile; do dn=${dn%/*} + pbar="Pass 2: $dn ..." + print -nu2 "$pbar\r" cd $dn # PKG_NAME: package name (directory, free-format) @@ -169,3 +175,5 @@ EOF ) >Config.in cd .. done +pbar=done +print -u2 "$pbar" diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh index 4331709a5..07cdd5838 100644 --- a/scripts/split-cfg.sh +++ b/scripts/split-cfg.sh @@ -4,21 +4,21 @@ # ses the slow-down. TOPDIR=$1 - -[[ -n $BASH_VERSION ]] && shopt -s extglob +(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) +typeset -L$x_cols pbar grep -v '^BUSYBOX\|^# BUSYBOX' $TOPDIR/.config > $TOPDIR/.config.split mkdir -p $TOPDIR/.cfg cd $TOPDIR/.cfg -oldfiles=$(echo *) +oldfiles=$(print -r -- *) newfiles=: -echo -n 'autosplitting main config...' +print -nu2 'autosplitting main config...' while read line; do oline=$line - [[ -n $line ]] && if [[ $line = @(# [A-Z])* ]]; then + [[ -n $line ]] && if [[ $line = @(\# [A-Z])* ]]; then line=${line#? } if [[ $line = *@( is not set) ]]; then line=${line% is not set} @@ -28,12 +28,12 @@ while read line; do fi elif [[ $line = @([A-Z])*@(=)* ]]; then line=${line%%=*} - elif [[ $line = @(#)* ]]; then + elif [[ $line = \#* ]]; then # valid comment line= else # invalid non-comment - echo "Warning: line '$oline' invalid!" >&2 + print -u2 "\nWarning: line '$oline' invalid!" line= fi # if the line is a valid yes/no/whatever, write it @@ -44,9 +44,9 @@ while read line; do else fline= fi - [[ $oline = $fline ]] || echo "$oline" >$line + [[ $oline = $fline ]] || print -r -- "$oline" >$line if [[ $newfiles = *:$line:* ]]; then - echo "Error: duplicate Config.in option '$line'!" >&2 + print -u2 "\nError: duplicate Config.in option '$line'!" exit 1 fi newfiles=$newfiles$line: @@ -54,11 +54,11 @@ while read line; do done <$TOPDIR/.config.split # now handle the case of removals -echo -n ' removals...' +print -nu2 ' removals...' for oldfile in $oldfiles; do [[ $newfiles = *:$oldfile:* ]] || rm -f $oldfile done -printf '\r%60s\r' '' +print -nu2 '\r' # now scan for dependencies of packages; the information # should probably be in build_mipsel because it's generated @@ -69,18 +69,19 @@ printf '\r%60s\r' '' cd $TOPDIR/.cfg rm -f $TOPDIR/package/*/info.mk for option in *; do - echo -n "$option ..." - x=$(( ${#option} + 4 )) + pbar="$option ..." + print -nu2 "$pbar\r" ao=: fgrep -l $option $TOPDIR/package/*/{Makefile,Config.*} 2>&- | \ while read line; do - echo ${line%/*}/info.mk + print -r -- ${line%/*}/info.mk done | while read fname; do [[ $ao = *:$fname:* ]] && continue ao=$ao$fname: echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg/$option" >>$fname done - printf '\r%'$x's\r' '' done +pbar=done +print -u2 "$pbar" exit 0 -- cgit v1.2.3 From ddd71a0e407ff4c79675fcee0de4f21ec0c6fcfe Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 15:03:29 +0059 Subject: skip directories containing Config.in.manual Signed-off-by: Thorsten Glaser --- package/pkgmaker | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/pkgmaker') diff --git a/package/pkgmaker b/package/pkgmaker index 879c5eff4..270866805 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -39,6 +39,8 @@ done # build Config.in files and resolve dependencies for dn in */Makefile; do dn=${dn%/*} + # skip if we take care of this one manually + [[ -s $dn/Config.in.manual ]] && continue pbar="Pass 2: $dn ..." print -nu2 "$pbar\r" cd $dn -- cgit v1.2.3 From 1d6ce6217064f0ce3945fb08a33cc491985a9d12 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 15:16:23 +0059 Subject: The Config.in{,.lib} split Signed-off-by: Thorsten Glaser --- package/.gitignore | 2 +- package/pkgmaker | 56 ++++++++++++++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 24 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/.gitignore b/package/.gitignore index b46bcd562..78ecf6bfd 100644 --- a/package/.gitignore +++ b/package/.gitignore @@ -1,5 +1,5 @@ */Config.in -*/Config.new +*/Config.in.lib Depends.mk pkglist.d pkgopts.d diff --git a/package/pkgmaker b/package/pkgmaker index 270866805..7637abc88 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -65,10 +65,11 @@ for dn in */Makefile; do typeset -u dnu=${dn//-/_} dnu=${dnu//+/X} - ( + ( # fd 4 = Config.in; fd 5 = Config.in.lib + g5=0 # Handle master package (directory) - print "config ADK_COMPILE_$dnu" + print -u4 "config ADK_COMPILE_$dnu" if [[ -z $ALL_PKGOPTS ]]; then # pseudo package, does not produce an ipkg package ppnf=$PKG_NAME # ppnf: pseudopkg name, filled @@ -78,20 +79,20 @@ for dn in */Makefile; do done ppnf="$ppnf $PKG_DESCR" fi - print "\tprompt \"$ppnf\"" + print -u4 "\tprompt \"$ppnf\"" fi - print \\ttristate + print -u4 \\ttristate if [[ -n $ALL_PKGOPTS ]]; then # real (master) package, contains 1+ ipkg (sub)packages - print -n \\tdepends on + print -nu4 \\tdepends on sp=' ' # local sp: space (or ' || ') for spcu in $ALL_PKGOPTS; do # spcu: package option, ucase - print -n "${sp}ADK_PACKAGE_$spcu" + print -nu4 "${sp}ADK_PACKAGE_$spcu" sp=' || ' done - print + print -u4 fi - print \\tdefault n + print -u4 \\tdefault n # Handle subpackages / multipackages for spcu in $ALL_PKGOPTS; do # spcu: package option, ucase @@ -100,7 +101,16 @@ for dn in */Makefile; do : ${desc:=$PKG_DESCR} # take from main pkg if empty eval deps=\$PKGDEPS_$spcu # deps: subpackage dependencies eval xline=\$PKGDESC_$spcu # xline: one free-format line - print \\nconfig ADK_PACKAGE_$spcu + + if [[ $spcu = LIB* ]]; then + h=5 # divert to Config.in.lib + (( g5++ )) && print -u5 # been here before + else + h=4 # divert to Config.in + print -u4 + fi + + print -u$h config ADK_PACKAGE_$spcu spnf=$sppn # spnf: subpackage name, filled if [[ -n ${desc:-$PKG_NAME} ]]; then while (( ${#spnf} < 34 )); do @@ -108,9 +118,9 @@ for dn in */Makefile; do done spnf="$spnf ${desc:-$PKG_NAME}" fi - print "\tprompt \"$spnf\"" - print \\ttristate - print \\tdefault n + print -u$h "\tprompt \"$spnf\"" + print -u$h \\ttristate + print -u$h \\tdefault n for dep in $deps; do # dep: ipkg name of one rundep. # skip dependencies on uclibc++ and libstdcxx iff # we produce these automatically @@ -121,29 +131,29 @@ for dn in */Makefile; do # produce dependency on kernel package # which have special name→sym mangling typeset -u udep=${dep//-/_} - print "\tselect ADK_KPACKAGE_$udep" + print -u$h "\tselect ADK_KPACKAGE_$udep" ;; (*) # produce dependency on regular package # where the symbol is cached (see above) - print '\tselect' \ + print -u$h '\tselect' \ ADK_PACKAGE_$(<../pkglist.d/"$dep") ;; } done - print \\tselect ADK_COMPILE_$dnu - [[ -n $xline ]] && print "\t$xline" + print -u$h \\tselect ADK_COMPILE_$dnu + [[ -n $xline ]] && print -u$h "\t$xline" if [[ -n $desc$PKG_URL ]]; then # produce (optional) help text - print \\thelp - [[ -n $desc ]] && print "\t $desc" - [[ -n $desc && -n $PKG_URL ]] && print '\t ' - [[ -n $PKG_URL ]] && print "\t WWW: $PKG_URL" + print -u$h \\thelp + [[ -n $desc ]] && print -u$h "\t $desc" + [[ -n $desc && -n $PKG_URL ]] && print -u$h '\t ' + [[ -n $PKG_URL ]] && print -u$h "\t WWW: $PKG_URL" fi done # Handle CFrustFrust library selection, if necessary - [[ -n $PKG_CXX ]] && cat <&4 <&4 - ) >Config.in + ) 4>Config.in 5>Config.in.lib cd .. done pbar=done -- cgit v1.2.3 From d47031878a2221b24e7c9c823ab663996082f890 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 15:24:00 +0059 Subject: fix pasto Signed-off-by: Thorsten Glaser --- package/pkgmaker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pkgmaker') diff --git a/package/pkgmaker b/package/pkgmaker index 7637abc88..643d26024 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -100,7 +100,7 @@ for dn in */Makefile; do eval desc=\$PKGDESC_$spcu # desc: subpackage description : ${desc:=$PKG_DESCR} # take from main pkg if empty eval deps=\$PKGDEPS_$spcu # deps: subpackage dependencies - eval xline=\$PKGDESC_$spcu # xline: one free-format line + eval xline=\$CFLINE_$spcu # xline: one free-format line if [[ $spcu = LIB* ]]; then h=5 # divert to Config.in.lib -- cgit v1.2.3 From 3aff112c5d1f0e359217f126af0bee60606fddb5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Dec 2009 18:16:38 +0100 Subject: be less verbose --- config/Makefile | 2 +- mk/build.mk | 6 +++--- package/pkgmaker | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'package/pkgmaker') diff --git a/config/Makefile b/config/Makefile index e42117824..97a8f3a3a 100644 --- a/config/Makefile +++ b/config/Makefile @@ -126,5 +126,5 @@ ncurses: fi clean: - rm -f *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) zconf.hash.c \ + @rm -f *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) zconf.hash.c \ conf mconf zconf.tab.c zconf.tab.h lex.zconf.c lkc_defs.h diff --git a/mk/build.mk b/mk/build.mk index 01cdcce3c..c01314407 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -206,10 +206,10 @@ cleantarget: distclean: @$(TRACE) distclean @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) - rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ + @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d - rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) - rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ + @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) + @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) diff --git a/package/pkgmaker b/package/pkgmaker index 643d26024..d27045a27 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -25,7 +25,7 @@ for dn in */Makefile; do cd .. if [[ -z $ALL_PKGOPTS ]]; then - print -u2 "Warning: $dn/Makefile contains no packages, skipped" + #print -u2 "Warning: $dn/Makefile contains no packages, skipped" continue fi -- cgit v1.2.3 From 75501a06c2e6b3df982ff3fa03dab9ecc16c9c2f Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 18:26:02 +0059 Subject: optional per-subpackage default other than ‘n’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thorsten Glaser --- package/cfgfs/Makefile | 2 ++ package/dropbear/Makefile | 2 ++ package/pkgmaker | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 17ab5e6a7..8a0454e07 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -16,6 +16,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +PKGDFLT_CFGFS= y + BUILD_STYLE:= auto do-configure: diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 22a5680ac..43a157700 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -20,6 +20,8 @@ include $(TOPDIR)/mk/package.mk $(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})) +PKGDFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY + CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-pam \ --enable-openpty \ diff --git a/package/pkgmaker b/package/pkgmaker index d27045a27..56c1565fc 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -54,11 +54,12 @@ for dn in */Makefile; do # PKGNAME_*: subpackage (ipkg) package name, by subpackage option # PKGDESC_*: subpackage description, by subpackage option # PKGDEPS_*: subpackage depends on ipkg packages, by subpkg option + # PKGDFLT_*: subpackage 'default {:-n}', by subpackage option # CFLINE_*: one free-format Config.in line per subpackage option # PKGFD_*: flavour description, per package flavour option eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_URL PKG_CXX \ ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \ - PKGDESC_\${x} PKGDEPS_\${x} CFLINE_\${x}) \ + PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} CFLINE_\${x}) \ \$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x})") # dnu: directory name, uppercase, y/-+/_X/ @@ -100,6 +101,7 @@ for dn in */Makefile; do eval desc=\$PKGDESC_$spcu # desc: subpackage description : ${desc:=$PKG_DESCR} # take from main pkg if empty eval deps=\$PKGDEPS_$spcu # deps: subpackage dependencies + eval dflt=\$PKGDFLT_$spcu # dflt: config 'default' opt. eval xline=\$CFLINE_$spcu # xline: one free-format line if [[ $spcu = LIB* ]]; then @@ -120,7 +122,7 @@ for dn in */Makefile; do fi print -u$h "\tprompt \"$spnf\"" print -u$h \\ttristate - print -u$h \\tdefault n + print -u$h "\tdefault ${dflt:-n}" for dep in $deps; do # dep: ipkg name of one rundep. # skip dependencies on uclibc++ and libstdcxx iff # we produce these automatically -- cgit v1.2.3 From 4bde99fa31d105d163e3d519f314af7d9537bfb3 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 19:40:26 +0059 Subject: PKG_{HOST,TARGET}_DEP* handling as wbx@ requested Signed-off-by: Thorsten Glaser --- package/pkgmaker | 46 +++++++++++++++++++++++++++++++++++++++++++++- target/target.lst | 29 +++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 target/target.lst (limited to 'package/pkgmaker') diff --git a/package/pkgmaker b/package/pkgmaker index 56c1565fc..f8061010d 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -57,10 +57,12 @@ for dn in */Makefile; do # PKGDFLT_*: subpackage 'default {:-n}', by subpackage option # CFLINE_*: one free-format Config.in line per subpackage option # PKGFD_*: flavour description, per package flavour option + # PKG_{HOST,TARGET}_DEPENDS: wbx@’s weird ideas eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_URL PKG_CXX \ ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \ PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} CFLINE_\${x}) \ - \$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x})") + \$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x}) \ + PKG_HOST_DEPENDS PKG_TARGET_DEPENDS") # dnu: directory name, uppercase, y/-+/_X/ typeset -u dnu=${dn//-/_} @@ -95,6 +97,46 @@ for dn in */Makefile; do fi print -u4 \\tdefault n + # Handle NOT/ONLY_FOR_PLATFORM alikes + phd= # phd: PKG_HOST_DEPENDS expand. + if [[ -n $PKG_HOST_DEPENDS ]]; then + phd='\tdepends on' + if [[ $PKG_HOST_DEPENDS = *\!* ]]; then + sp=' !' + else + sp=' ' + fi + for x in $PKG_HOST_DEPENDS; do + typeset -u x=${x#!} + phd="$phd${sp}ADK_HOST_$x" + if [[ $PKG_HOST_DEPENDS = *\!* ]]; then + sp=' && !' + else + sp=' || ' + fi + done + fi + ptd= # ptd: PKG_TARGET_DEPENDS exp. + if [[ -n $PKG_TARGET_DEPENDS ]]; then + ptd='\tdepends on' + sp=' ' # local sp: space (or ' || ') + for x in $PKG_TARGET_DEPENDS; do + #XXX cache this with mksh R40+ + found=0 + while read friendlyname sym; do + [[ $friendlyname = $x ]] || continue + found=1 + break + done <../../target/target.lst + if (( !found )); then + print -u2 "$dn: Target '$x' not found!" + exit 1 + fi + ptd="$ptd${sp}$sym" + sp=' || ' + done + fi + # Handle subpackages / multipackages for spcu in $ALL_PKGOPTS; do # spcu: package option, ucase eval sppn=\$PKGNAME_$spcu # sppn: subpackage (ipkg) name @@ -122,6 +164,8 @@ for dn in */Makefile; do fi print -u$h "\tprompt \"$spnf\"" print -u$h \\ttristate + [[ -n $phd ]] && print -u$h "$phd" + [[ -n $ptd ]] && print -u$h "$ptd" print -u$h "\tdefault ${dflt:-n}" for dep in $deps; do # dep: ipkg name of one rundep. # skip dependencies on uclibc++ and libstdcxx iff diff --git a/target/target.lst b/target/target.lst new file mode 100644 index 000000000..224ceaa01 --- /dev/null +++ b/target/target.lst @@ -0,0 +1,29 @@ +native ADK_LINUX_NATIVE +alix1c ADK_LINUX_X86_ALIX1C +alix2d ADK_LINUX_X86_ALIX2D +alix ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D +wrap ADK_LINUX_X86_WRAP +foxboard ADK_LINUX_CRIS_FOXBOARD +lemote ADK_LINUX_MIPS64_LEMOTE +ag241 ADK_LINUX_MIPS_AG241 +tomtom ADK_LINUX_ARM_TOMTOM +g1 ADK_LINUX_ARM_G1 +zaurus ADK_LINUX_XSCALE_ZAURUS +shuttle ADK_LINUX_X86_64_SHUTTLE +x86_64_rescue ADK_LINUX_X86_64_RESCUE +x86_rescue ADK_LINUX_X86_RESCUE +mipsel_rescue ADK_LINUX_MIPSEL_RESCUE +mips_rescue ADK_LINUX_MIPS_RESCUE +arm_qemu ADK_LINUX_ARM_QEMU +mips_qemu ADK_LINUX_MIPS_QEMU +mipsel_qemu ADK_LINUX_MIPSEL_QEMU +mips64_qemu ADK_LINUX_MIPS64_QEMU +mips64el_qemu ADK_LINUX_MIPS64EL_QEMU +cris_qemu ADK_LINUX_CRIS_QEMU +x86_qemu ADK_LINUX_X86_QEMU +x86_64_qemu ADK_LINUX_X86_64_QEMU +qemu ADK_LINUX_ARM_QEMU || ADK_LINUX_MIPS_QEMU || ADK_LINUX_MIPSEL_QEMU || ADK_LINUX_MIPS64_QEMU || ADK_LINUX_MIPS64EL_QEMU || ADK_LINUX_CRIS_QEMU || ADK_LINUX_X86_QEMU || ADK_LINUX_X86_64_QEMU +rb411 ADK_LINUX_MIPS_RB411 +rb433 ADK_LINUX_MIPS_RB433 +rb532 ADK_LINUX_MIPS_RB532 +routerboard ADK_LINUX_MIPS_RB411 || ADK_LINUX_MIPS_RB433 || ADK_LINUX_MIPS_RB532 -- cgit v1.2.3 From b11d3a635ac903eb013409aebaec4c9b91026056 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Dec 2009 20:15:51 +0100 Subject: fix all TARGET/HOST dependencies expand TARGET logic for ! values --- package/asterisk/Makefile | 2 ++ package/cfgfs/Makefile | 2 ++ package/gdb/Makefile | 1 + package/linux-atm/Makefile | 5 ++--- package/mplayer/Makefile | 2 ++ package/pkgmaker | 14 ++++++++++++-- package/swconfig/Makefile | 2 ++ package/valgrind/Makefile | 2 ++ package/xf86-video-cirrus/Makefile | 2 ++ package/xf86-video-geode/Makefile | 2 ++ target/target.lst | 2 ++ 11 files changed, 31 insertions(+), 5 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 87b47015e..7dd463cac 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -21,6 +21,8 @@ PKG_NOPARALLEL:= 1 PKG_URL:= http://www.asterisk.org PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ +PKG_TARGET_DEPENDS:= !foxboard + PKG_DEPENDS_MAIN:= asterisk PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 99ac7055a..a5f24a96f 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -13,6 +13,8 @@ PKG_TARGET_DEPENDS:= alix1c alix2d wrap foxboard ag241 rb532 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 +CFLINE_CFGFS:= select BUSYBOX_COMM\\n\\tselect BUSYBOX_MD5SUM + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 17d37ef55..139d6b54b 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -8,6 +8,7 @@ PKG_DESCR:= GNU debugger PKG_SECTION:= comp PKG_DEPENDS:= libthread-db libncurses PKG_BUILDDEP+= ncurses readline +PKG_TARGET_DEPENDS:= !foxboard include ${TOPDIR}/mk/package.mk diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index a999be5d6..b3a8fbd48 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -12,15 +12,14 @@ PKG_SECTION:= libs PKG_URL:= http://linux-atm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/} +PKG_HOST_DEPENDS:= !freebsd + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz PKG_DESCR_1:= br2684ctl PKG_DEPENDS_1:= libatm PKG_SECTION_1:= net -CFLINE_LIBATM:= depends on !ADK_HOST_FREEBSD -CFLINE_BR2684CTL:= depends on !ADK_HOST_FREEBSD - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index ac0c50c92..89127b715 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -14,6 +14,8 @@ PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthr PKG_URL:= http://www.mplayerhq.hu PKG_SITES:= http://openadk.org/distfiles/ +PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/pkgmaker b/package/pkgmaker index f8061010d..f00285192 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -57,7 +57,7 @@ for dn in */Makefile; do # PKGDFLT_*: subpackage 'default {:-n}', by subpackage option # CFLINE_*: one free-format Config.in line per subpackage option # PKGFD_*: flavour description, per package flavour option - # PKG_{HOST,TARGET}_DEPENDS: wbx@’s weird ideas + # PKG_{HOST,TARGET}_DEPENDS: add host or target dependencies eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_URL PKG_CXX \ ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \ PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} CFLINE_\${x}) \ @@ -120,7 +120,13 @@ for dn in */Makefile; do if [[ -n $PKG_TARGET_DEPENDS ]]; then ptd='\tdepends on' sp=' ' # local sp: space (or ' || ') + if [[ $PKG_TARGET_DEPENDS = *\!* ]]; then + sp=' !' + else + sp=' ' + fi for x in $PKG_TARGET_DEPENDS; do + x=${x#!} #XXX cache this with mksh R40+ found=0 while read friendlyname sym; do @@ -133,7 +139,11 @@ for dn in */Makefile; do exit 1 fi ptd="$ptd${sp}$sym" - sp=' || ' + if [[ $PKG_TARGET_DEPENDS = *\!* ]]; then + sp=' && !' + else + sp=' || ' + fi done fi diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile index 2c4586712..f9f183b10 100644 --- a/package/swconfig/Makefile +++ b/package/swconfig/Makefile @@ -10,6 +10,8 @@ PKG_BUILDDEP+= libnl PKG_DESCR:= switch configuration utility PKG_SECTION:= misc +PKG_TARGET_CONFIG:= rb433 + WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index bb8ae3b07..bf0c1710d 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= utils PKG_URL:= http://valgrind.org PKG_SITES:= http://valgrind.org/downloads/ +PKG_TARGET_DEPENDS:= x86 x86_64 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile index 370aac976..a86ba2730 100644 --- a/package/xf86-video-cirrus/Makefile +++ b/package/xf86-video-cirrus/Makefile @@ -13,6 +13,8 @@ PKG_SECTION:= x11 PKG_DEPENDS:= xorg-server PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ +PKG_TARGET_DEPENDS:= x86_qemu x86_64_qemu + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index f124fc201..b98613082 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -13,6 +13,8 @@ PKG_SECTION:= x11 PKG_DEPENDS:= xorg-server PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ +PKG_TARGET_DEPENDS:= alix1c + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/target/target.lst b/target/target.lst index 224ceaa01..2537feef7 100644 --- a/target/target.lst +++ b/target/target.lst @@ -27,3 +27,5 @@ rb411 ADK_LINUX_MIPS_RB411 rb433 ADK_LINUX_MIPS_RB433 rb532 ADK_LINUX_MIPS_RB532 routerboard ADK_LINUX_MIPS_RB411 || ADK_LINUX_MIPS_RB433 || ADK_LINUX_MIPS_RB532 +x86 ADK_LINUX_X86_QEMU || ADK_LINUX_X86_RESCUE || ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_WRAP +x86_64 ADK_LINUX_X86_64_QEMU || ADK_LINUX_X86_64_RESCUE || ADK_LINUX_X86_64_SHUTTLE -- cgit v1.2.3 From 9183b983ea3f2b20359eaa7cf3a8776af301c059 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 21 Dec 2009 12:50:59 +0100 Subject: make pkgmaker and depmaker less verbose, fix build --- package/depmaker | 3 +++ package/grub-bin/Makefile | 2 +- package/pkgmaker | 3 +++ rules.mk | 1 - 4 files changed, 7 insertions(+), 2 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/depmaker b/package/depmaker index edbacc6f1..da3923554 100644 --- a/package/depmaker +++ b/package/depmaker @@ -1,3 +1,5 @@ +unset MAKEFLAGS +export MAKEFLAGS=s cd "$(dirname "$0")" export TOPDIR=$(realpath ..) if gmake --help >/dev/null 2>&1; then @@ -5,6 +7,7 @@ if gmake --help >/dev/null 2>&1; then else export GMAKE=make fi +GMAKE="$GMAKE --no-print-directory" (( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) typeset -L$x_cols pbar diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index 260a29393..30a956818 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -13,7 +13,7 @@ PKG_DESCR:= GRUB bootloader PKG_SECTION:= sys PKG_SITES:= http://openadk.org/distfiles/ -PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix1d +PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d include ${TOPDIR}/mk/package.mk diff --git a/package/pkgmaker b/package/pkgmaker index f00285192..d9c928579 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -1,3 +1,5 @@ +unset MAKEFLAGS +export MAKEFLAGS=s cd "$(dirname "$0")" export TOPDIR=$(realpath ..) if gmake --help >/dev/null 2>&1; then @@ -5,6 +7,7 @@ if gmake --help >/dev/null 2>&1; then else export GMAKE=make fi +GMAKE="$GMAKE --no-print-directory" (( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) typeset -L$x_cols pbar diff --git a/rules.mk b/rules.mk index 9703704a9..684206815 100644 --- a/rules.mk +++ b/rules.mk @@ -43,7 +43,6 @@ TARGET_CFLAGS:= $(strip -fwrapv -fno-ident ${TARGET_CFLAGS}) TARGET_CC:= $(strip ${TARGET_CC}) TARGET_CXX:= $(strip ${TARGET_CXX}) -# I hate GNU make! --mirabilos ifneq (${show},) .DEFAULT_GOAL:= show show: -- cgit v1.2.3 From dd163e09b582177ce54fae44b63b10579ee0746d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Dec 2009 23:09:19 +0100 Subject: fix make allmodconfig update several packages, remove snort-wireless. --- mk/build.mk | 7 +- mk/modules.mk | 1 - package/Config.in | 7 +- package/Makefile | 7 +- package/asterisk/Makefile | 17 +- package/base-files/Makefile | 2 + package/busybox/Makefile | 2 + package/ctorrent/Makefile | 10 +- package/cxxtools/Makefile | 15 +- package/eglibc/Config.in.manual | 4 +- package/freeradius-server/Makefile | 1 + package/freetype/Makefile | 4 +- package/grub-bin/Makefile | 2 +- package/grub/Makefile | 3 + package/libXv/Makefile | 2 +- package/libsigc++/Makefile | 22 +- package/libtorrent/Makefile | 28 +- package/lighttpd/Makefile | 18 +- package/mpd/Makefile | 85 +-- package/mplayer/Makefile | 6 +- package/mysql/Makefile | 12 +- package/mysql/patches/patch-configure | 662 ++++++++------------- package/mysql/patches/patch-include_my_global_h | 59 -- package/ncurses/Makefile | 5 +- package/ncurses/patches/patch-misc_run_tic_in | 12 - package/nfs-utils/Config.in.kerberos | 31 - package/nfs-utils/Makefile | 43 +- .../nfs-utils/patches/patch-aclocal_kerberos5_m4 | 138 ----- .../patches/patch-support_nfs_nfs_mntent_c | 5 +- package/nfs-utils/patches/patch-tools_Makefile_am | 11 - package/nfs-utils/patches/patch-tools_Makefile_in | 15 +- .../nfs-utils/patches/patch-utils_mount_error_c | 5 +- .../nfs-utils/patches/patch-utils_mountd_cache_c | 75 --- .../nfs-utils/patches/patch-utils_mountd_fsloc_c | 5 +- package/nut/Makefile | 28 +- package/olsrd/Makefile | 1 + package/php/Makefile | 9 +- package/pkgmaker | 21 +- package/ppp/Makefile | 1 + package/rtorrent/Makefile | 12 +- package/sane-backends/Makefile | 3 +- package/sangam-atm/Makefile | 2 + package/sispmctl/Makefile | 4 +- package/snort-wireless/Makefile | 48 -- .../snort-wireless/files/snort-wireless.conffiles | 2 - package/snort-wireless/files/snort-wireless.init | 29 - .../snort-wireless/files/snort-wireless.postinst | 4 - .../patches/500-no-config-search.patch | 35 -- .../patches/750-lightweight-config.patch | 178 ------ package/snort/Makefile | 20 +- package/snort/patches/patch-configure | 83 +++ package/snort/patches/patch-configure.orig | 74 +++ .../patch-src_detection-plugins_sp_ip_tos_check_c | 26 + .../patch-src_detection-plugins_sp_pattern_match_c | 85 +++ ...h-src_detection-plugins_sp_pattern_match_c.orig | 47 ++ .../patch-src_detection-plugins_sp_replace_c | 38 ++ .../patch-src_detection-plugins_sp_replace_c.orig | 11 + .../patch-src_detection-plugins_sp_session_c | 13 + .../patch-src_detection-plugins_sp_tcp_win_check_c | 26 + .../patch-src_dynamic-preprocessors_dns_spp_dns_c | 47 ++ package/snort/patches/patch-src_inline_c | 11 + package/snort/patches/patch-src_log_c | 162 +++++ package/snort/patches/patch-src_log_c.orig | 38 ++ package/snort/patches/patch-src_log_text_c | 38 ++ package/snort/patches/patch-src_mempool_c | 11 + .../patch-src_output-plugins_spo_alert_unixsock_c | 50 ++ ...ch-src_output-plugins_spo_alert_unixsock_c.orig | 32 + .../patch-src_output-plugins_spo_database_c | 11 + .../patch-src_output-plugins_spo_log_ascii_c | 15 + .../patch-src_output-plugins_spo_log_tcpdump_c | 11 + .../patches/patch-src_output-plugins_spo_unified_c | 47 ++ package/snort/patches/patch-src_parser_IpAddrSet_c | 16 + package/snort/patches/patch-src_parser_c | 40 ++ ...h-src_preprocessors_Stream5_snort_stream5_tcp_c | 11 + package/snort/patches/patch-src_snort_c | 20 + package/snort/patches/patch-src_util_c | 20 + package/squid/Makefile | 26 +- package/tntnet/Makefile | 18 +- package/udev/Makefile | 4 +- package/ulogd/Makefile | 11 +- package/updatedd/Makefile | 1 + package/xorg-server/Makefile | 5 +- package/xz/Makefile | 4 +- target/linux/config/Config.in.block | 6 +- 84 files changed, 1489 insertions(+), 1287 deletions(-) delete mode 100644 package/mysql/patches/patch-include_my_global_h delete mode 100644 package/ncurses/patches/patch-misc_run_tic_in delete mode 100644 package/nfs-utils/Config.in.kerberos delete mode 100644 package/nfs-utils/patches/patch-aclocal_kerberos5_m4 delete mode 100644 package/nfs-utils/patches/patch-tools_Makefile_am delete mode 100644 package/nfs-utils/patches/patch-utils_mountd_cache_c delete mode 100644 package/snort-wireless/Makefile delete mode 100644 package/snort-wireless/files/snort-wireless.conffiles delete mode 100644 package/snort-wireless/files/snort-wireless.init delete mode 100644 package/snort-wireless/files/snort-wireless.postinst delete mode 100644 package/snort-wireless/patches/500-no-config-search.patch delete mode 100644 package/snort-wireless/patches/750-lightweight-config.patch create mode 100644 package/snort/patches/patch-configure create mode 100644 package/snort/patches/patch-configure.orig create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c.orig create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_replace_c create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_replace_c.orig create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_session_c create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c create mode 100644 package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c create mode 100644 package/snort/patches/patch-src_inline_c create mode 100644 package/snort/patches/patch-src_log_c create mode 100644 package/snort/patches/patch-src_log_c.orig create mode 100644 package/snort/patches/patch-src_log_text_c create mode 100644 package/snort/patches/patch-src_mempool_c create mode 100644 package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c create mode 100644 package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c.orig create mode 100644 package/snort/patches/patch-src_output-plugins_spo_database_c create mode 100644 package/snort/patches/patch-src_output-plugins_spo_log_ascii_c create mode 100644 package/snort/patches/patch-src_output-plugins_spo_log_tcpdump_c create mode 100644 package/snort/patches/patch-src_output-plugins_spo_unified_c create mode 100644 package/snort/patches/patch-src_parser_IpAddrSet_c create mode 100644 package/snort/patches/patch-src_parser_c create mode 100644 package/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c create mode 100644 package/snort/patches/patch-src_snort_c create mode 100644 package/snort/patches/patch-src_util_c (limited to 'package/pkgmaker') diff --git a/mk/build.mk b/mk/build.mk index 2fb5bb3bf..6397d78bb 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -15,6 +15,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_STATIC=n \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ + ADK_PACKAGE_BASE_FILES=y \ BUSYBOX_SELINUX=n \ BUSYBOX_MODPROBE_SMALL=n \ BUSYBOX_EJECT=n \ @@ -81,7 +82,7 @@ include ${TOPDIR}/mk/split-cfg.mk all: world allcopy: all - $(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${d}/ + $(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${targetdir}/ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config mksh ${TOPDIR}/package/depmaker @@ -375,9 +376,9 @@ bulk: defconfig; \ fi && \ $(MAKE) VERBOSE=1 -f mk/build.mk allcopy \ - d=$$target-$$libc-$$fs && \ + targetdir=$$target-$$libc-$$fs; \ $(MAKE) cleantarget; \ - rm .*config; \ + rm .config; \ ) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \ done <${TOPDIR}/target/bulk.lst diff --git a/mk/modules.mk b/mk/modules.mk index b923b8e34..c36bdb21e 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -934,7 +934,6 @@ $(eval $(call KMOD_template,SND,sound-alsa,\ $(MODULES_DIR)/kernel/sound/core/snd \ $(MODULES_DIR)/kernel/sound/core/snd-timer \ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ - $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ ,40)) $(eval $(call KMOD_template,SND_OSSEMUL,sound-alsa-oss-emul,\ diff --git a/package/Config.in b/package/Config.in index f982e342d..e4c5288c3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -162,7 +162,7 @@ source "package/procps/Config.in" source "package/sispmctl/Config.in" source "package/stress/Config.in" source "package/sysstat/Config.in" -source "package/udev/Config.in" +#source "package/udev/Config.in" source "package/watchdog/Config.in" endmenu @@ -289,7 +289,6 @@ menu "Network Filesystems" source "package/davfs2/Config.in" source "package/davfs2/Config.in.kernel" source "package/nfs-utils/Config.in" -source "package/nfs-utils/Config.in.kerberos" source "package/samba/Config.in" endmenu @@ -359,7 +358,6 @@ source "package/hostapd/Config.in" source "package/iw/Config.in" #source "package/kismet/Config.in" source "package/olsrd/Config.in" -source "package/snort-wireless/Config.in" source "package/wifidog/Config.in" source "package/wireless-firmware/Config.in" source "package/wpa_supplicant/Config.in" @@ -483,6 +481,7 @@ source "package/speex/Config.in" source "package/sqlite/Config.in.lib" source "package/librpcsecgss/Config.in" source "package/libshout/Config.in" +source "package/libshout/Config.in.lib" source "package/libsigc++/Config.in" source "package/libstdcxx/Config.in" source "package/libtasn1/Config.in" @@ -499,7 +498,7 @@ source "package/tcp_wrappers/Config.in" source "package/libxml2/Config.in" source "package/libxslt/Config.in" source "package/lua/Config.in.lib" -source "package/uclibc++/Config.in" +source "package/uclibc++/Config.in.manual" source "package/ustl/Config.in" source "package/zlib/Config.in" endmenu diff --git a/package/Makefile b/package/Makefile index 1b3943f36..2e83a0799 100644 --- a/package/Makefile +++ b/package/Makefile @@ -18,6 +18,7 @@ endif ifneq (${ADK_NATIVE},y) package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread endif + ifneq (${ADK_TARGET_LIB_GLIBC},y) ifneq (${ADK_NATIVE},y) package-$(ADK_PACKAGE_UCLIBC) += uclibc @@ -30,6 +31,7 @@ COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y)) all: compile +download: $(DOWNLOAD) clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m) base-files) ifeq ($(ADK_TOOLCHAIN_ONLY),y) compile: $(COMPILE_PACKAGES) @@ -38,10 +40,9 @@ else compile: base-files-compile $(COMPILE_PACKAGES) install: base-files-install $(INSTALL_PACKAGES) endif -download: $(DOWNLOAD) -$(COMPILE_PACKAGES): base-files-compile -$(INSTALL_PACKAGES): base-files-install +#$(COMPILE_PACKAGES): base-files-compile +#$(INSTALL_PACKAGES): base-files-install $(TARGET_DIR): mkdir -p $(TARGET_DIR) diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 7dd463cac..c66f4c7e5 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,8 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 1.4.27.1 +PKG_VERSION:= 1.4.28 PKG_RELEASE:= 1 +PKG_MD5SUM:= e8006ce319e18ce07ce1335ad583330a +PKG_DESCR:= Open Source PBX +PKG_SECTION:= net +PKG_MULTI:= 1 +PKG_NOPARALLEL:= 1 +PKG_DEPENDS:= libncurses libpthread libopenssl libcurl PKG_BUILDDEP+= ncurses openssl zlib curl popt ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),) PKG_BUILDDEP+= speex @@ -13,17 +19,12 @@ endif ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),) PKG_BUILDDEP+= postgresql endif -PKG_MD5SUM:= e09ca163a6e90018c92c65a50b9ec398 -PKG_DESCR:= Open Source PBX -PKG_SECTION:= net -PKG_DEPENDS:= libncurses libpthread libopenssl libcurl -PKG_NOPARALLEL:= 1 PKG_URL:= http://www.asterisk.org PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_TARGET_DEPENDS:= !foxboard -PKG_DEPENDS_MAIN:= asterisk +#PKG_DEPENDS_MAIN:= asterisk PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation PKG_DESCR_CHAN_IAX2:= Support for the Inter Asterisk Protocol @@ -38,7 +39,7 @@ $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_ $(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_SPEEX},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CODEC_SPEEX},${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})) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index bff93bd38..82541e6f4 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -18,6 +18,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) PKGDFLT_BASE_FILES= y if !ADK_TOOLCHAIN_ONLY +BUILD_STYLE:= manual +INSTALL_STYLE:= manual do-install: $(CP) ./extra/* $(IDIR_BASE_FILES) diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 78b741ca3..2a9ef5e14 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c PKG_DESCR:= Core utilities for embedded Linux systems PKG_SECTION:= base +PKG_DEPENDS:= base-files +PKG_BUILDDEP+= base-files PKG_URL:= http://www.busybox.net PKG_SITES:= http://www.busybox.net/downloads/ diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index fb51b1090..6cc8878fa 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= ctorrent PKG_VERSION:= dnh3.3.2 PKG_RELEASE:= 1 PKG_BUILDDEP+= openssl -PKG_CXX:= CTORRENT +#PKG_CXX:= CTORRENT PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= net @@ -18,10 +18,10 @@ include ${TOPDIR}/mk/package.mk $(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-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++ -TLDFLAGS+= -lgcc_s -luClibc++ -lc -lm -nodefaultlibs -endif +#ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) +#TCXXFLAGS+= -fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++ +#TLDFLAGS+= -lgcc_s -luClibc++ -lc -lm -nodefaultlibs +#endif CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 0de136708..326bed156 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -6,14 +6,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cxxtools PKG_VERSION:= 1.4.8 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libiconv -PKG_CXX:= CXXTOOLS PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af PKG_DESCR:= a collection of general-purpose C++ classes PKG_SECTION:= net PKG_DEPENDS:= libiconv +PKG_BUILDDEP+= libiconv PKG_URL:= http://www.tntnet.org PKG_SITES:= http://www.tntnet.org/download/ +#PKG_CXX:= CXXTOOLS + include ${TOPDIR}/mk/package.mk @@ -34,12 +35,12 @@ CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_DIR}/usr' BUILD_STYLE:= auto INSTALL_STYLE:= auto confprog -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) +#ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ - ${WRKBUILD}/libtool -endif +#post-configure: +# ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ +# ${WRKBUILD}/libtool +#endif post-install: ${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual index 6e1daf463..e7acac9dc 100644 --- a/package/eglibc/Config.in.manual +++ b/package/eglibc/Config.in.manual @@ -1,5 +1,5 @@ config ADK_PACKAGE_EGLIBC - prompt "eglibc............................... embedded GNU C library" + prompt "eglibc............................ embedded GNU C library" bool default y if ADK_TARGET_LIB_EGLIBC && !ADK_TOOLCHAIN_ONLY default n @@ -8,7 +8,7 @@ config ADK_PACKAGE_EGLIBC embedded GNU C library. config ADK_PACKAGE_EGLIBC_DEV - prompt "eglibc-dev........................... development files" + prompt "eglibc-dev........................ development files" tristate default n depends on ADK_TARGET_LIB_EGLIBC diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index f8f769da5..6d58d3f85 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= b1f77c5e3116bcb0ac0aa9080a06ebf1 PKG_DESCR:= a flexible RADIUS server PKG_SECTION:= net +PKG_MULTI:= 1 PKG_DEPENDS:= libltdl libopenssl libpthread PKG_BUILDDEP+= libtool openssl ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),) diff --git a/package/freetype/Makefile b/package/freetype/Makefile index e902954c7..6acb8c2da 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= freetype PKG_VERSION:= 2.3.11 PKG_RELEASE:= 2 -PKG_BUILDDEP+= zlib -PKG_MD5SUM:= 519c7cbf5cbd72ffa822c66844d3114c +PKG_MD5SUM:= a693c9a4b0121890ca71e39364ffea4a PKG_DESCR:= A free, high-quality and portable font engine PKG_SECTION:= libs PKG_DEPENDS:= zlib +PKG_BUILDDEP+= zlib PKG_URL:= http://www.freetype.org PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/} diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index 30a956818..1c48a0b06 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -13,7 +13,7 @@ PKG_DESCR:= GRUB bootloader PKG_SECTION:= sys PKG_SITES:= http://openadk.org/distfiles/ -PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d +PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d x86_qemu x86_64_qemu include ${TOPDIR}/mk/package.mk diff --git a/package/grub/Makefile b/package/grub/Makefile index c808d0bed..d4ef5f10d 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -12,6 +12,9 @@ PKG_SECTION:= base PKG_URL:= http://www.gnu.org/software/grub PKG_SITES:= ftp://alpha.gnu.org/gnu/grub/ +PKG_HOST_DEPENDS:= linux +PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d x86_qemu x86_64_qemu + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GRUB,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/libXv/Makefile b/package/libXv/Makefile index 9d51fbf1c..4165f8547 100644 --- a/package/libXv/Makefile +++ b/package/libXv/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXv PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libX11 videoproto +PKG_BUILDDEP+= libX11 videoproto libXext PKG_MD5SUM:= 6ee98790de6b3cd470074e60057d5c5c PKG_DESCR:= X11 Xvideo extensions PKG_SECTION:= x11 diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile index 724196bfc..a4a5fc825 100644 --- a/package/libsigc++/Makefile +++ b/package/libsigc++/Makefile @@ -11,28 +11,28 @@ PKG_DESCR:= Callback framework for C++ PKG_SECTION:= libs PKG_URL:= http://libsigc.sourceforge.net PKG_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/} -PKG_CXX:= LIBSIGCXX +#PKG_CXX:= LIBSIGCXX include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSIGCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y) -CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \ - -I${STAGING_DIR}/usr/include/uClibc++" \ - LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" -endif +#ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y) +#CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \ +# -I${STAGING_DIR}/usr/include/uClibc++" \ +# LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" +#endif CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto -ifeq (${ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX},y) +#ifeq (${ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ - ${WRKBUILD}/libtool -endif +#post-configure: +# ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ +# ${WRKBUILD}/libtool +#endif post-install: ${INSTALL_DIR} ${IDIR_LIBSIGCXX}/usr/lib diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 4d55aa87e..5f33fa97b 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -13,29 +13,29 @@ PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsigc++ PKG_URL:= http://libtorrent.rakshasa.no PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ -PKG_CXX:= LIBTORRENT +#PKG_CXX:= LIBTORRENT include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y) -CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ -fno-strict-aliasing -fno-inline \ - -I${STAGING_DIR}/usr/include/uClibc++" \ - LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" -endif +#ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y) +#CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ -fno-strict-aliasing -fno-inline \ +# -I${STAGING_DIR}/usr/include/uClibc++" \ +# LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" +#endif -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-aligned -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto -ifeq (${ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX},y) +#ifeq (${ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ - ${WRKBUILD}/libtool -endif +#post-configure: +# ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ +# ${WRKBUILD}/libtool +#endif post-install: ${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 3ed986070..648d6cfd8 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -6,23 +6,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:= lighttpd PKG_VERSION:= 1.4.25 PKG_RELEASE:= 1 -PKG_BUILDDEP+= pcre libxml2 sqlite -ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) -PKG_BUILDDEP+= openssl -endif PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704 PKG_DESCR:= a flexible and lightweight web server PKG_SECTION:= net PKG_DEPENDS:= libxml2 libsqlite pcre +PKG_BUILDDEP+= pcre libxml2 sqlite +ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) +PKG_DEPENDS+= libopenssl +PKG_BUILDDEP+= openssl +endif PKG_URL:= http://www.lighttpd.net PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ +PKG_MULTI:= 1 include $(TOPDIR)/mk/package.mk -ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) -PKG_DEPENDS+= libopenssl -endif - define PKG_mod_template INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install @@ -71,7 +69,7 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav)) TCPPFLAGS+= -I$(STAGING_DIR)/usr/include/libxml2 CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= PCRE_LIB="-lpcre" -CONFIGURE_ARGS+= --without-openssl \ +CONFIGURE_ARGS+= \ --libdir=/usr/lib/lighttpd \ --sysconfdir=/etc/lighttpd \ --without-attr \ @@ -89,6 +87,8 @@ BUILD_STYLE:= auto INSTALL_STYLE:= auto ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-openssl='${STAGING_DIR}/usr' +else +CONFIGURE_ARGS+= --without-openssl endif post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 150391af3..f4ccc4be5 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -7,86 +7,99 @@ PKG_NAME:= mpd PKG_VERSION:= 0.15.6 PKG_RELEASE:= 1 PKG_BUILDDEP+= alsa-lib glib -ifneq ($(ADK_COMPILE_MPD_WITH_MP3),) +PKG_MD5SUM:= c78b8933e4902c5dc407d59925f8b10e +PKG_DESCR:= A music player daemon +PKG_SECTION:= net +PKG_DEPENDS:= glib +ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),) PKG_BUILDDEP+= libid3tag libmad endif -ifneq ($(ADK_COMPILE_MPD_WITH_MP4),) +ifneq ($(ADK_PACKAGE_MPD_WITH_MP4),) PKG_BUILDDEP+= faad2 endif -ifneq ($(ADK_COMPILE_MPD_WITH_OGG),) +ifneq ($(ADK_PACKAGE_MPD_WITH_OGG),) PKG_BUILDDEP+= libvorbis endif -ifneq ($(ADK_COMPILE_MPD_WITH_TREMOR),) +ifneq ($(ADK_PACKAGE_MPD_WITH_TREMOR),) PKG_BUILDDEP+= libvorbisidec endif -ifneq ($(ADK_COMPILE_MPD_WITH_FLAC),) +ifneq ($(ADK_PACKAGE_MPD_WITH_FLAC),) PKG_BUILDDEP+= flac endif -ifneq ($(ADK_COMPILE_MPD_WITH_WAV),) +ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),) PKG_BUILDDEP+= libaudiofile endif -ifneq ($(ADK_COMPILE_MPD_WITH_SHOUT),) +ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),) PKG_BUILDDEP+= lame endif -ifneq ($(ADK_COMPILE_MPD_WITH_CURL),) +ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),) PKG_BUILDDEP+= curl endif -ifneq ($(ADK_COMPILE_MPD_WITH_MMS),) +ifneq ($(ADK_PACKAGE_MPD_WITH_MMS),) PKG_BUILDDEP+= libmms endif -ifneq ($(ADK_COMPILE_MPD_WITH_FFMPEG),) +ifneq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),) PKG_BUILDDEP+= ffmpeg endif -PKG_MD5SUM:= c78b8933e4902c5dc407d59925f8b10e -PKG_DESCR:= A music player daemon -PKG_SECTION:= net -PKG_DEPENDS:= glib PKG_URL:= http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/} +PKG_FLAVOURS:= WITH_ALSA WITH_MP3 WITH_MP4 WITH_TREMOR WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG WITH_SHOUT WITH_CURL +PKGFD_WITH_ALSA:= enable ALSA output +PKGFD_WITH_MP3:= enable MP3 support +PKGFD_WITH_MP4:= enable MP4 support +PKGFD_WITH_OGG:= enable OGG support +PKGFD_WITH_TREMOR:= enable fixpoint Vorbis/OGG support +PKGFD_WITH_FLAC:= enable FLAC support +PKGFD_WITH_WAV:= enable WAVE support +PKGFD_WITH_MMS:= enable MMS support +PKGFD_WITH_FFMPEG:= enable FFMPEG support +PKGFD_WITH_SHOUT:= enable Shoutcast output support +PKGFD_WITH_CURL:= enable CURL support + include ${TOPDIR}/mk/package.mk -ifneq (${ADK_COMPILE_MPD_WITH_ALSA},) +ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},) PKG_DEPENDS+= alsa-lib endif -ifneq (${ADK_COMPILE_MPD_WITH_MP3},) +ifneq (${ADK_PACKAGE_MPD_WITH_MP3},) PKG_DEPENDS+= libid3tag libmad endif -ifneq (${ADK_COMPILE_MPD_WITH_MP4},) +ifneq (${ADK_PACKAGE_MPD_WITH_MP4},) PKG_DEPENDS+= libfaad2 endif -ifneq (${ADK_COMPILE_MPD_WITH_OGG},) +ifneq (${ADK_PACKAGE_MPD_WITH_OGG},) PKG_DEPENDS+= libvorbis libogg endif -ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},) +ifneq (${ADK_PACKAGE_MPD_WITH_TREMOR},) PKG_DEPENDS+= libvorbisidec endif -ifneq (${ADK_COMPILE_MPD_WITH_FLAC},) +ifneq (${ADK_PACKAGE_MPD_WITH_FLAC},) PKG_DEPENDS+= libflac endif -ifneq (${ADK_COMPILE_MPD_WITH_WAV},) +ifneq (${ADK_PACKAGE_MPD_WITH_WAV},) PKG_DEPENDS+= libaudiofile endif -ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},) +ifneq (${ADK_PACKAGE_MPD_WITH_SHOUT},) PKG_DEPENDS+= libshout liblame endif -ifneq (${ADK_COMPILE_MPD_WITH_CURL},) +ifneq (${ADK_PACKAGE_MPD_WITH_CURL},) PKG_DEPENDS+= libcurl endif -ifneq (${ADK_COMPILE_MPD_WITH_MMS},) +ifneq (${ADK_PACKAGE_MPD_WITH_MMS},) PKG_DEPENDS+= libmms endif -ifneq (${ADK_COMPILE_MPD_WITH_FFMPEG},) +ifneq (${ADK_PACKAGE_MPD_WITH_FFMPEG},) PKG_DEPENDS+= ffmpeg endif @@ -110,31 +123,31 @@ CONFIGURE_ARGS+= \ --disable-sqlite \ --with-zeroconf=no -ifneq (${ADK_COMPILE_MPD_WITH_ALSA},) +ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},) CONFIGURE_ARGS+= --enable-alsa else CONFIGURE_ARGS+= --disable-alsa endif -ifneq (${ADK_COMPILE_MPD_WITH_MP3},) +ifneq (${ADK_PACKAGE_MPD_WITH_MP3},) CONFIGURE_ARGS+= --enable-id3 --enable-mad else CONFIGURE_ARGS+= --disable-id3 --disable-mad endif -ifneq (${ADK_COMPILE_MPD_WITH_MP4},) +ifneq (${ADK_PACKAGE_MPD_WITH_MP4},) CONFIGURE_ARGS+= --enable-aac else CONFIGURE_ARGS+= --disable-aac endif -ifneq (${ADK_COMPILE_MPD_WITH_OGG},) +ifneq (${ADK_PACKAGE_MPD_WITH_OGG},) CONFIGURE_ARGS+= --enable-vorbis else CONFIGURE_ARGS+= --disable-vorbis endif -ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},) +ifneq (${ADK_PACKAGE_MPD_WITH_TREMOR},) CONFIGURE_ARGS+= \ --disable-vorbis \ --with-tremor \ @@ -142,19 +155,19 @@ CONFIGURE_ARGS+= \ --with-tremor-libraries=${STAGING_DIR}/usr/lib endif -ifneq (${ADK_COMPILE_MPD_WITH_FLAC},) +ifneq (${ADK_PACKAGE_MPD_WITH_FLAC},) CONFIGURE_ARGS+= --enable-flac else CONFIGURE_ARGS+= --disable-flac endif -ifneq (${ADK_COMPILE_MPD_WITH_WAV},) +ifneq (${ADK_PACKAGE_MPD_WITH_WAV},) CONFIGURE_ARGS+= --enable-audiofile else CONFIGURE_ARGS+= --disable-audiofile endif -ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},) +ifneq (${ADK_PACKAGE_MPD_WITH_SHOUT},) CONFIGURE_ARGS+= --enable-shout \ --enable-lame-encoder \ --enable-vorbis-encoder \ @@ -166,19 +179,19 @@ CONFIGURE_ARGS+= --disable-shout \ --disable-vorbis-encoder endif -ifneq (${ADK_COMPILE_MPD_WITH_CURL},) +ifneq (${ADK_PACKAGE_MPD_WITH_CURL},) CONFIGURE_ARGS+= --enable-curl else CONFIGURE_ARGS+= --disable-curl endif -ifneq (${ADK_COMPILE_MPD_WITH_MMS},) +ifneq (${ADK_PACKAGE_MPD_WITH_MMS},) CONFIGURE_ARGS+= --enable-mms else CONFIGURE_ARGS+= --disable-mms endif -ifneq (${ADK_COMPILE_MPD_WITH_FFMPEG},) +ifneq (${ADK_PACKAGE_MPD_WITH_FFMPEG},) CONFIGURE_ARGS+= --enable-ffmpeg else CONFIGURE_ARGS+= --disable-ffmpeg diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 89127b715..a938466e9 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer PKG_VERSION:= 1.0-29987 PKG_RELEASE:= 1 -PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib PKG_MD5SUM:= 416fa6a247987305d74572d03dc6dde7 PKG_DESCR:= popular video player PKG_SECTION:= video -PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg +PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg libx11 libxv +PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib libX11 libXv libpng PKG_URL:= http://www.mplayerhq.hu PKG_SITES:= http://openadk.org/distfiles/ @@ -93,6 +93,8 @@ pre-configure: --disable-pnm \ --disable-md5sum \ --disable-liblzo \ + --disable-xinerama \ + --disable-vidix \ ${CONFIGURE_CPU_OPTS} \ ${CONFIGURE_DEBUG} \ ); diff --git a/package/mysql/Makefile b/package/mysql/Makefile index db20a04af..e8334bd1f 100644 --- a/package/mysql/Makefile +++ b/package/mysql/Makefile @@ -4,15 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mysql -PKG_VERSION:= 5.0.85 +PKG_VERSION:= 5.1.41 PKG_RELEASE:= 1 -PKG_BUILDDEP+= ncurses zlib readline -PKG_MD5SUM:= f672ec5154f8ea3db87fec5e0b227f4c +PKG_MD5SUM:= b5d39e8789174753f3c782959729e68c PKG_DESCR:= MySQL client library PKG_SECTION:= libs PKG_DEPENDS:= libncurses zlib +PKG_BUILDDEP+= ncurses zlib readline PKG_URL:= http://www.mysql.com -PKG_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.0/} +PKG_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.1/} include ${TOPDIR}/mk/package.mk @@ -28,10 +28,12 @@ CONFIGURE_ENV+= OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \ mysql_cv_compress=yes \ ac_cv_sys_restartable_syscalls=no \ ac_cv_conv_longlong_to_float=yes \ + mysql_cv_gcc_atomic_builtins=yes \ mysql_cv_gethostname_style=glibc2 CONFIGURE_ARGS+= --disable-assembler \ --with-pthread \ --without-raid \ + --with-atomic-ops=rwlocks \ --with-unix-socket-path=/tmp/.mysql.sock \ --with-named-thread-libs=-lpthread \ --without-libwrap \ @@ -42,7 +44,7 @@ CONFIGURE_ARGS+= --disable-assembler \ --without-query-cache \ --without-mysqlfs \ --without-vio \ - --without-openssl \ + --without-ssl \ --without-docs \ --without-bench \ --without-innodb \ diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure index 4fe4d413c..cf3239b22 100644 --- a/package/mysql/patches/patch-configure +++ b/package/mysql/patches/patch-configure @@ -1,496 +1,302 @@ ---- mysql-5.0.85.orig/configure 2009-08-11 12:56:42.000000000 +0200 -+++ mysql-5.0.85/configure 2009-08-27 22:35:38.879725240 +0200 -@@ -835,8 +835,6 @@ MYSQLD_EXTRA_LIBS - CLIENT_EXTRA_LDFLAGS - MYSQLD_EXTRA_LDFLAGS - LIBDL --COMPILE_PSTACK_FALSE --COMPILE_PSTACK_TRUE - pstack_libs - pstack_dirs - WRAPLIBS -@@ -16480,89 +16478,10 @@ else - $as_echo "no" >&6; } - fi +--- mysql-5.1.41.orig/configure 2009-11-04 19:37:28.000000000 +0100 ++++ mysql-5.1.41/configure 2009-12-25 12:18:01.000000000 +0100 +@@ -46976,197 +46976,14 @@ $as_echo "$as_me: error: unknown endiann + esac -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"return type of sprintf\"" >&5 --$as_echo_n "checking \"return type of sprintf\"... " >&6; } -- --#check the return type of sprintf --case $SYSTEM_TYPE in -- *netware*) -- $as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5 --$as_echo "\"int\"" >&6; } -- ;; -- *) --if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + +- { $as_echo "$as_me:$LINENO: checking whether GCC atomic builtins are available" >&5 +-$as_echo_n "checking whether GCC atomic builtins are available... " >&6; } +- # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not +- if test "$cross_compiling" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run test program while cross compiling --See \`config.log' for more details." "$LINENO" 5; } +-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } -else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -- int main() -- { -- char* s = "hello"; -- char buf[6]; -- if((int)sprintf(buf, s) == strlen(s)) -- return 0; -- -- return -1; -- } +- int main() +- { +- long x; +- long y; +- long res; +- char c; +- +- x = 10; +- y = 123; +- res = __sync_bool_compare_and_swap(&x, x, y); +- if (!res || x != y) { +- return(1); +- } +- +- x = 10; +- y = 123; +- res = __sync_bool_compare_and_swap(&x, x + 1, y); +- if (res || x != 10) { +- return(1); +- } +- +- x = 10; +- y = 123; +- res = __sync_add_and_fetch(&x, y); +- if (res != 123 + 10 || x != 123 + 10) { +- return(1); +- } +- +- c = 10; +- res = __sync_lock_test_and_set(&c, 123); +- if (res != 10 || c != 123) { +- return(1); +- } +- +- return(0); +- } - -_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- --$as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h +-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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5 --$as_echo "\"int\"" >&6; } --else -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run test program while cross compiling --See \`config.log' for more details." "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ - -- int main() -- { -- char* s = "hello"; -- char buf[6]; -- if((char*)sprintf(buf,s) == buf + strlen(s)) -- return 0; -- return -1; -- } -+# return type of sprintf is int for Linux glibc/uClibc -+cat >>confdefs.h <<\_ACEOF -+#define SPRINTF_RETURNS_INT 1 + cat >>confdefs.h <<\_ACEOF + #define HAVE_IB_GCC_ATOMIC_BUILTINS 1 _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- --$as_echo "#define SPRINTF_RETURNS_PTR 1" >>confdefs.h + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"ptr\"" >&5 --$as_echo "\"ptr\"" >&6; } -else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 - --$as_echo "#define SPRINTF_RETURNS_GARBAGE 1" >>confdefs.h +-( exit $ac_status ) - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"garbage\"" >&5 --$as_echo "\"garbage\"" >&6; } --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } - - -fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - -- ;; --esac - - # Extract the first word of "uname", so it can be a program name with args. - set dummy uname; ac_word=$2 -@@ -17587,97 +17506,7 @@ $as_echo "no" >&6; } - rm -f conftest.ic conftest.h - fi - - --# Look for PS usage. We use double dollar-signs in FIND_PROC because this --# value is written to a makefile, which interprets away one level of --# dollar-signs. So, interpretation stages are m4 and then shell in autoconf, --# then Make, then shell. The autoconf substitution uses single quotes, so --# no unprotected single quotes should appear in the expression. --# Extract the first word of "ps", so it can be a program name with args. --set dummy ps; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PS+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- case $PS in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PS="$PS" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_PS="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_PS" && ac_cv_path_PS="ps" -- ;; --esac --fi --PS=$ac_cv_path_PS --if test -n "$PS"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS" >&5 --$as_echo "$PS" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi - -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"how to check if pid exists\"" >&5 --$as_echo_n "checking \"how to check if pid exists\"... " >&6; } --PS=$ac_cv_path_PS --# Linux style --if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null --then -- FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" --# Solaris --elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null --then -- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" +- { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by GCC atomic builtins" >&5 +-$as_echo_n "checking whether pthread_t can be used by GCC atomic builtins... " >&6; } +- # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not +- if test "$cross_compiling" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } -else -- case $SYSTEM_TYPE in -- *freebsd*|*dragonfly*) -- FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" -- ;; -- *darwin*) -- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" -- ;; -- *netware*) -- FIND_PROC= -- ;; -- *) -- as_fn_error "Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." "$LINENO" 5 -- esac --fi -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$FIND_PROC\"" >&5 --$as_echo "\"$FIND_PROC\"" >&6; } -+FIND_PROC="/bin/ps wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" - - # Check if a pid is valid - # Extract the first word of "kill", so it can be a program name with args. -@@ -19842,218 +19671,9 @@ fi - fi - - -- --if test "$TARGET_LINUX" = "true"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atomic operations" >&5 --$as_echo_n "checking for atomic operations... " >&6; } -- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ - -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- #include +- #include - +- int main(int argc, char** argv) { +- pthread_t x1; +- pthread_t x2; +- pthread_t x3; - -- atom_ops= -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run test program while cross compiling --See \`config.log' for more details." "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ +- memset(&x1, 0x0, sizeof(x1)); +- memset(&x2, 0x0, sizeof(x2)); +- memset(&x3, 0x0, sizeof(x3)); - --#include --int main() --{ -- atomic_t v; +- __sync_bool_compare_and_swap(&x1, x2, x3); - -- atomic_set(&v, 23); -- atomic_add(5, &v); -- return atomic_read(&v) == 28 ? 0 : -1; --} +- return(0); +- } - -_ACEOF --if ac_fn_cxx_try_run "$LINENO"; then : +-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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then - --$as_echo "#define HAVE_ATOMIC_ADD 1" >>confdefs.h - -- atom_ops="${atom_ops}atomic_add " --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi + cat >>confdefs.h <<\_ACEOF + #define HAVE_IB_ATOMIC_PTHREAD_T_GCC 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } - -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run test program while cross compiling --See \`config.log' for more details." "$LINENO" 5; } -else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include --int main() --{ -- atomic_t v; +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 - -- atomic_set(&v, 23); -- atomic_sub(5, &v); -- return atomic_read(&v) == 18 ? 0 : -1; --} +-( exit $ac_status ) - --_ACEOF --if ac_fn_cxx_try_run "$LINENO"; then : +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } - --$as_echo "#define HAVE_ATOMIC_SUB 1" >>confdefs.h - -- atom_ops="${atom_ops}atomic_sub " -fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -- if test -z "$atom_ops"; then atom_ops="no"; fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $atom_ops" >&5 --$as_echo "$atom_ops" >&6; } -- -- ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- -- --# Check whether --with-pstack was given. --if test "${with_pstack+set}" = set; then : -- withval=$with_pstack; USE_PSTACK=$withval --else -- USE_PSTACK=no --fi -- -- pstack_libs= -- pstack_dirs= -- if test "$USE_PSTACK" = yes -a "$TARGET_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386" -- then -- have_libiberty= have_libbfd= -- my_save_LIBS="$LIBS" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdmatch in -liberty" >&5 --$as_echo_n "checking for fdmatch in -liberty... " >&6; } --if test "${ac_cv_lib_iberty_fdmatch+set}" = set; then : -- $as_echo_n "(cached) " >&6 + + { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5 + $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; } +@@ -47284,101 +47101,6 @@ fi + done + + +- { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5 +-$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; } +- # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not +- if test "$cross_compiling" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } -else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-liberty $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char fdmatch (); --int --main () --{ --return fdmatch (); -- ; -- return 0; --} +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ -_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_iberty_fdmatch=yes --else -- ac_cv_lib_iberty_fdmatch=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_fdmatch" >&5 --$as_echo "$ac_cv_lib_iberty_fdmatch" >&6; } --if test "x$ac_cv_lib_iberty_fdmatch" = x""yes; then : -- have_libiberty=yes -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5 --$as_echo_n "checking for bfd_openr in -lbfd... " >&6; } --if test "${ac_cv_lib_bfd_bfd_openr+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lbfd -liberty $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char bfd_openr (); --int --main () --{ --return bfd_openr (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_bfd_bfd_openr=yes --else -- ac_cv_lib_bfd_bfd_openr=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5 --$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; } --if test "x$ac_cv_lib_bfd_bfd_openr" = x""yes; then : -- have_libbfd=yes --fi -- --fi +- #include +- #include - -- LIBS="$my_save_LIBS" +- int main(int argc, char** argv) { +- pthread_t x1; +- pthread_t x2; +- pthread_t x3; - -- if test x"$have_libiberty" = xyes -a x"$have_libbfd" = xyes -- then -- pstack_dirs='$(top_srcdir)'/pstack -- pstack_libs="../pstack/libpstack.a -lbfd -liberty" -- # We must link staticly when using pstack -- with_mysqld_ldflags="-all-static" +- memset(&x1, 0x0, sizeof(x1)); +- memset(&x2, 0x0, sizeof(x2)); +- memset(&x3, 0x0, sizeof(x3)); - +- if (sizeof(pthread_t) == 4) { - +- atomic_cas_32(&x1, x2, x3); - --$as_echo "#define USE_PSTACK 1" >>confdefs.h +- } else if (sizeof(pthread_t) == 8) { - -- else -- USE_PSTACK="no" -- fi -- else -- USE_PSTACK="no" -- fi --fi -- if test "$USE_PSTACK" = "yes"; then -- COMPILE_PSTACK_TRUE= -- COMPILE_PSTACK_FALSE='#' --else -- COMPILE_PSTACK_TRUE='#' -- COMPILE_PSTACK_FALSE= --fi +- atomic_cas_64(&x1, x2, x3); - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should use pstack" >&5 --$as_echo_n "checking if we should use pstack... " >&6; } --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_PSTACK" >&5 --$as_echo "$USE_PSTACK" >&6; } -+$as_echo "#define HAVE_ATOMIC_ADD 0" >>confdefs.h -+$as_echo "#define HAVE_ATOMIC_SUB 0" >>confdefs.h -+$as_echo "#define USE_PSTACK 0" >>confdefs.h - - # Check for gtty if termio.h doesn't exists - if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no" -@@ -20116,59 +19736,6 @@ fi - # Later in this script LIBS will be augmented with a threads library. - NON_THREADED_LIBS="$LIBS" - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int8" >&5 --$as_echo_n "checking for int8... " >&6; } --case $SYSTEM_TYPE in -- *netware) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- ;; -- *) --if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run test program while cross compiling --See \`config.log' for more details." "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ +- } else { - --#ifdef HAVE_STDLIB_H --#include --#endif +- return(1); +- } - --#ifdef HAVE_STDDEF_H --#include --#endif +- return(0); +- } - --#ifdef HAVE_SYS_TYPES_H --#include --#endif +-_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then - --int main() --{ -- int8 i; -- return 0; --} - +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS 1 -_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- --$as_echo "#define HAVE_INT_8_16_32 1" >>confdefs.h - --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +- { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } +- -else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +- +- { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - +- -fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - -- ;; --esac - # - # Some system specific hacks -@@ -27705,10 +27272,6 @@ if test -z "${ASSEMBLER_TRUE}" && test - - as_fn_error "conditional \"ASSEMBLER\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${COMPILE_PSTACK_TRUE}" && test -z "${COMPILE_PSTACK_FALSE}"; then -- as_fn_error "conditional \"COMPILE_PSTACK\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 --fi - if test -z "${HAVE_YASSL_TRUE}" && test -z "${HAVE_YASSL_FALSE}"; then - as_fn_error "conditional \"HAVE_YASSL\" was never defined. + # this is needed to know which one of atomic_cas_32() or atomic_cas_64() diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h deleted file mode 100644 index 0513e1ca4..000000000 --- a/package/mysql/patches/patch-include_my_global_h +++ /dev/null @@ -1,59 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- mysql-5.0.85.orig/include/my_global.h 2009-08-11 12:50:17.000000000 +0200 -+++ mysql-5.0.85/include/my_global.h 2009-08-27 22:21:39.363259500 +0200 -@@ -350,29 +350,32 @@ C_MODE_END - #ifdef HAVE_UNISTD_H - #include - #endif -+ - #if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA) - #undef HAVE_ALLOCA - #undef HAVE_ALLOCA_H - #endif --#ifdef HAVE_ALLOCA_H --#include -+ -+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) -+#ifndef BSD -+#define BSD - #endif --#ifdef HAVE_ATOMIC_ADD --#define new my_arg_new --#define need_to_restore_new 1 --C_MODE_START --#include --C_MODE_END --#ifdef need_to_restore_new /* probably safer than #ifdef new */ --#undef new --#undef need_to_restore_new - #endif -+ -+#if defined(HAVE_ALLOCA_H) && !defined(BSD) -+#include - #endif -+ - #include /* Recommended by debian */ - /* We need the following to go around a problem with openssl on solaris */ -+#ifdef BSD -+#include -+#include -+#else - #if defined(HAVE_CRYPT_H) - #include - #endif -+#endif - - /* - A lot of our programs uses asserts, so better to always include it -@@ -791,9 +794,11 @@ typedef SOCKET_SIZE_TYPE size_socket; - #define finite(x) (1.0 / fabs(x) > 0.0) - #endif - -+/* - #ifndef HAVE_ISNAN - #define isnan(x) ((x) != (x)) - #endif -+*/ - - #ifdef HAVE_ISINF - /* Check if C compiler is affected by GCC bug #39228 */ diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index c3997b060..9e9ddf9b5 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -43,12 +43,15 @@ INSTALL_STYLE= auto ALL_TARGET:= libs INSTALL_TARGET:= install.libs install.data +ifeq (${ADK_HOST_CYGWIN},y) +CONFOPT:= --with-shared +endif pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ ./configure \ + ${CONFOPT} \ --with-build-cc=${HOSTCC} \ - --with-shared \ --with-progs \ ); ${MAKE} -C ${WRKBUILD}/include diff --git a/package/ncurses/patches/patch-misc_run_tic_in b/package/ncurses/patches/patch-misc_run_tic_in deleted file mode 100644 index c2d76c4f7..000000000 --- a/package/ncurses/patches/patch-misc_run_tic_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ncurses-5.7.orig/misc/run_tic.in 2006-10-28 21:43:30.000000000 +0200 -+++ ncurses-5.7/misc/run_tic.in 2009-05-07 18:43:38.156250000 +0200 -@@ -61,7 +61,7 @@ test -z "${DESTDIR}" && DESTDIR= - # Allow tic to run either from the install-path, or from the build-directory. - # Do not do this if we appear to be cross-compiling. In that case, we rely - # on the host's copy of tic to compile the terminfo database. --if test "$THAT_CC" = "$THIS_CC" ; then -+if test "$THAT_CC" != "$THIS_CC" ; then - case "$PATH" in - :*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;; - *) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;; diff --git a/package/nfs-utils/Config.in.kerberos b/package/nfs-utils/Config.in.kerberos deleted file mode 100644 index 7c82d55ca..000000000 --- a/package/nfs-utils/Config.in.kerberos +++ /dev/null @@ -1,31 +0,0 @@ -config ADK_COMPILE_NFS_UTILS_WITH_KERBEROS - prompt "Enable Kerberos and NFSv4" - bool - select ADK_PACKAGE_LIBEVENT - select ADK_PACKAGE_LIBNFSIDMAP - select ADK_PACKAGE_LIBRPCSECGSS - select ADK_PACKAGE_LIBCOM_ERR - select ADK_KERNEL_NFSD_V4 - default n - depends on ADK_PACKAGE_NFS_UTILS - -choice -prompt "Kerberos implementation" -depends on ADK_COMPILE_NFS_UTILS_WITH_KERBEROS -config ADK_COMPILE_NFS_UTILS_WITH_KRB5 - prompt "MIT" - bool - select ADK_COMPILE_KRB5 - select ADK_PACKAGE_KRB5_LIBS - select ADK_PACKAGE_LIBGSSGLUE - help - use MIT kerberos libraries - -config ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL - prompt "Heimdal" - bool - select ADK_PACKAGE_HEIMDAL_LIBS - help - Use heimdal kerberos libraries (experimental) - -endchoice diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index c2cb0d806..b2c2c216f 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -4,53 +4,40 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils -PKG_VERSION:= 1.2.0 +PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libtirpc -ifeq (${ADK_COMPILE_NFS_UTILS_WITH_KRB5},y) -PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss -endif -ifeq (${ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL},y) -PKG_BUILDDEP+= libnfsidmap heimdal libevent librpcsecgss -endif -PKG_MD5SUM:= 779cf81044e92cb51ad590960e7b3671 +PKG_MD5SUM:= c3ccd16c147befd49fe4541a506dd177 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net PKG_DEPENDS:= portmap libtirpc +PKG_BUILDDEP+= libtirpc +ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y) +PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss +endif PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -include ${TOPDIR}/mk/package.mk +PKG_FLAVOURS:= WITH_KERBEROS +PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) -ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y) -PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom_err libgssglue -endif +include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y) -PKG_DEPENDS+= heimdal-libs libevent libnfsidmap librpcsecgss libcom_err +ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) +PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom-err libgssglue endif $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TCPPFLAGS+= -I${LINUX_DIR}/include -ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y) +ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) CONFIGURE_ARGS+= --enable-nfsv4 \ --with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \ --enable-gss CONFIGURE_ENV+= LIBS="-lrpcsecgss" -endif - -ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y) -CONFIGURE_ARGS+= --enable-nfsv4 \ - --with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \ - --enable-gss -CONFIGURE_ENV+= LIBS="-lrpcsecgss" -endif - -ifneq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y) +else CONFIGURE_ARGS+= --disable-nfsv4 \ --disable-gss endif @@ -62,7 +49,7 @@ CONFIGURE_ARGS+= --without-tcp-wrappers \ --with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc \ --disable-uuid -CONFIGURE_STYLE:= autotool gnu +CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto @@ -76,7 +63,7 @@ post-install: ${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_UTILS}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_UTILS}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_UTILS}/usr/sbin/ -ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y) +ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) ${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd ${IDIR_NFS_UTILS}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd ${IDIR_NFS_UTILS}/usr/sbin/ diff --git a/package/nfs-utils/patches/patch-aclocal_kerberos5_m4 b/package/nfs-utils/patches/patch-aclocal_kerberos5_m4 deleted file mode 100644 index 1a5ca00ba..000000000 --- a/package/nfs-utils/patches/patch-aclocal_kerberos5_m4 +++ /dev/null @@ -1,138 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nfs-utils-1.1.4.orig/aclocal/kerberos5.m4 2008-10-17 16:20:09.000000000 +0200 -+++ nfs-utils-1.1.4/aclocal/kerberos5.m4 2009-01-30 16:24:45.000000000 +0100 -@@ -1,112 +1,48 @@ --dnl Checks for Kerberos --dnl NOTE: while we intend to do generic gss-api, currently we --dnl have a requirement to get an initial Kerberos machine --dnl credential. Thus, the requirement for Kerberos. --dnl The Kerberos gssapi library will be dynamically loaded? - AC_DEFUN([AC_KERBEROS_V5],[ -+ K5CONFIG="krb5-config" - AC_MSG_CHECKING(for Kerberos v5) -- AC_ARG_WITH(krb5, -- [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])], -+ AC_ARG_WITH(krb5-config, -+ [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])], - [ case "$withval" in - yes|no) -- krb5_with="" -+ K5CONFIG="krb5-config" - ;; - *) -- krb5_with="$withval" -+ K5CONFIG="$withval" - ;; - esac ] - ) - -- for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \ -- /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do -- dnl This ugly hack brought on by the split installation of -- dnl MIT Kerberos on Fedora Core 1 -- K5CONFIG="" -- if test -f $dir/bin/krb5-config; then -- K5CONFIG=$dir/bin/krb5-config -- elif test -f "/usr/kerberos/bin/krb5-config"; then -- K5CONFIG="/usr/kerberos/bin/krb5-config" -- elif test -f "/usr/lib/mit/bin/krb5-config"; then -- K5CONFIG="/usr/lib/mit/bin/krb5-config" -- fi - if test "$K5CONFIG" != ""; then - KRBCFLAGS=`$K5CONFIG --cflags` - KRBLIBS=`$K5CONFIG --libs gssapi` -- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'` -- AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) -- if test -f $dir/include/gssapi/gssapi_krb5.h -a \ -- \( -f $dir/lib/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.so -o \ -- -f $dir/lib/libgssapi_krb5.so \) ; then -+ if $K5CONFIG --version | grep -q -e heimdal; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'` -+ AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -+ gssapi_lib=gssapi -+ KRBIMPL="heimdal" -+ elif $K5CONFIG --version | grep -q -e Kerberos; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'` - AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) -- KRBDIR="$dir" -- dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the -- dnl private function (gss_krb5_ccache_name) to get correct -- dnl behavior of changing the ccache used by gssapi. -- dnl Starting in 1.3.2, we *DO NOT* want to use -- dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME -- dnl to get gssapi to use a different ccache - if test $K5VERS -le 131; then - AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable]) - fi - gssapi_lib=gssapi_krb5 -- break -- dnl The following ugly hack brought on by the split installation -- dnl of Heimdal Kerberos on SuSe -- elif test \( -f $dir/include/heim_err.h -o\ -- -f $dir/include/heimdal/heim_err.h \) -a \ -- -f $dir/lib/libroken.a; then -- AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -- KRBDIR="$dir" -- gssapi_lib=gssapi -- break -- fi -- fi -- done -- dnl We didn't find a usable Kerberos environment -- if test "x$KRBDIR" = "x"; then -- if test "x$krb5_with" = "x"; then -- AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=) -+ KRBIMPL="mit-krb5" - else -- AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with) -- fi -+ AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.) -+ KRBIMPL="unknown" - fi -- AC_MSG_RESULT($KRBDIR) -- -- dnl Check if -rpath=$(KRBDIR)/lib is needed -- echo "The current KRBDIR is $KRBDIR" -- if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \ -- -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then -- KRBLDFLAGS=""; -- elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then -- KRBLDFLAGS=""; -- else -- KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib" -+ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) - fi -+ AC_MSG_RESULT($KRBIMPL) - -- dnl Now check for functions within gssapi library -- AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, -- AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, -- AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, -- AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -- -- dnl Check for newer error message facility -- AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, -- AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -- -- dnl Check for function to specify addressless tickets -- AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, -- AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) -- -- dnl If they specified a directory and it didn't work, give them a warning -- if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then -- AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!) -- fi -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) - -- AC_SUBST([KRBDIR]) - AC_SUBST([KRBLIBS]) - AC_SUBST([KRBCFLAGS]) - AC_SUBST([KRBLDFLAGS]) diff --git a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c b/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c index 5097e0cf0..65c51fcc9 100644 --- a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c +++ b/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c @@ -1,6 +1,5 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nfs-utils-1.1.3.orig/support/nfs/nfs_mntent.c 2008-07-27 23:01:45.000000000 +0200 -+++ nfs-utils-1.1.3/support/nfs/nfs_mntent.c 2008-10-06 16:53:17.000000000 +0200 +--- nfs-utils-1.2.1.orig/support/nfs/nfs_mntent.c 2009-11-04 12:13:56.000000000 +0100 ++++ nfs-utils-1.2.1/support/nfs/nfs_mntent.c 2009-12-25 19:33:24.000000000 +0100 @@ -9,7 +9,7 @@ */ diff --git a/package/nfs-utils/patches/patch-tools_Makefile_am b/package/nfs-utils/patches/patch-tools_Makefile_am deleted file mode 100644 index 073486f8d..000000000 --- a/package/nfs-utils/patches/patch-tools_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nfs-utils-1.1.4.orig/tools/Makefile.am 2008-10-17 16:20:09.000000000 +0200 -+++ nfs-utils-1.1.4/tools/Makefile.am 2009-01-03 14:12:09.000000000 +0100 -@@ -6,6 +6,6 @@ if CONFIG_RPCGEN - OPTDIRS += rpcgen - endif - --SUBDIRS = locktest rpcdebug nlmtest $(OPTDIRS) -+SUBDIRS = $(OPTDIRS) - - MAINTAINERCLEANFILES = Makefile.in diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in index ef12d1e52..a97226111 100644 --- a/package/nfs-utils/patches/patch-tools_Makefile_in +++ b/package/nfs-utils/patches/patch-tools_Makefile_in @@ -1,16 +1,15 @@ -$Id$ ---- nfs-utils-1.1.4.orig/tools/Makefile.in 2008-10-17 16:23:52.000000000 +0200 -+++ nfs-utils-1.1.4/tools/Makefile.in 2009-01-03 13:46:50.000000000 +0100 -@@ -59,7 +59,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re - distclean-recursive maintainer-clean-recursive +--- nfs-utils-1.2.1.orig/tools/Makefile.in 2009-11-04 12:15:52.000000000 +0100 ++++ nfs-utils-1.2.1/tools/Makefile.in 2009-12-25 19:25:33.000000000 +0100 +@@ -71,7 +71,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE + distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = locktest rpcdebug nlmtest rpcgen +DIST_SUBDIRS = rpcgen DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -@@ -210,7 +210,7 @@ target_alias = @target_alias@ + am__relativize = \ + dir0=`pwd`; \ +@@ -257,7 +257,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ OPTDIRS = $(am__append_1) diff --git a/package/nfs-utils/patches/patch-utils_mount_error_c b/package/nfs-utils/patches/patch-utils_mount_error_c index ab4590270..641a482f2 100644 --- a/package/nfs-utils/patches/patch-utils_mount_error_c +++ b/package/nfs-utils/patches/patch-utils_mount_error_c @@ -1,6 +1,5 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nfs-utils-1.1.3.orig/utils/mount/error.c 2008-07-27 23:01:45.000000000 +0200 -+++ nfs-utils-1.1.3/utils/mount/error.c 2008-10-06 16:58:40.000000000 +0200 +--- nfs-utils-1.2.1.orig/utils/mount/error.c 2009-11-04 12:13:56.000000000 +0100 ++++ nfs-utils-1.2.1/utils/mount/error.c 2009-12-25 19:32:49.000000000 +0100 @@ -62,7 +62,7 @@ static int rpc_strerror(int spos) char *tmp; diff --git a/package/nfs-utils/patches/patch-utils_mountd_cache_c b/package/nfs-utils/patches/patch-utils_mountd_cache_c deleted file mode 100644 index 5f46d3116..000000000 --- a/package/nfs-utils/patches/patch-utils_mountd_cache_c +++ /dev/null @@ -1,75 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nfs-utils-1.1.4.orig/utils/mountd/cache.c 2008-10-17 16:20:09.000000000 +0200 -+++ nfs-utils-1.1.4/utils/mountd/cache.c 2009-01-03 13:48:33.000000000 +0100 -@@ -118,54 +118,6 @@ void auth_unix_ip(FILE *f) - free(he); - } - --void auth_unix_gid(FILE *f) --{ -- /* Request are -- * uid -- * reply is -- * uid expiry count list of group ids -- */ -- int uid; -- struct passwd *pw; -- gid_t glist[100], *groups = glist; -- int ngroups = 100; -- int rv, i; -- char *cp; -- -- if (readline(fileno(f), &lbuf, &lbuflen) != 1) -- return; -- -- cp = lbuf; -- if (qword_get_int(&cp, &uid) != 0) -- return; -- -- pw = getpwuid(uid); -- if (!pw) -- rv = -1; -- else { -- rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups); -- if (rv == -1 && ngroups >= 100) { -- groups = malloc(sizeof(gid_t)*ngroups); -- if (!groups) -- rv = -1; -- else -- rv = getgrouplist(pw->pw_name, pw->pw_gid, -- groups, &ngroups); -- } -- } -- qword_printint(f, uid); -- qword_printint(f, time(0)+30*60); -- if (rv >= 0) { -- qword_printint(f, ngroups); -- for (i=0; i&5 +-echo $ECHO_N "checking for INADDR_NONE... $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. */ +- +-#include +-#include +-#include +- +-int +-main () +-{ +- +- if (inet_addr("10,5,2") == INADDR_NONE); +- return 0; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- have_inaddr_none="yes" +-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 ) +-have_inaddr_none="no" +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $have_inaddr_none" >&5 +-echo "${ECHO_T}$have_inaddr_none" >&6 +-if test "x$have_inaddr_none" = "xno"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define INADDR_NONE -1 +-_ACEOF +- +-fi ++have_inaddr_none="yes" + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24959,7 +24896,7 @@ fi + # that versions < 0.9 do not accumulate packet statistics whereas >= 0.9 do accumulate. + # This is Linux only. The check is done after pcre because the code below uses pcre. + # It seems Phil Wood's pcap does not accumulate - 0.9x +-pcap_version_check="yes" ++pcap_version_check="no" + if test "x$linux" = "xyes"; then + if test "x$pcap_version_check" = "xyes"; then + echo "$as_me:$LINENO: checking for libpcap version >= 0.9" >&5 diff --git a/package/snort/patches/patch-configure.orig b/package/snort/patches/patch-configure.orig new file mode 100644 index 000000000..c2a99e2ae --- /dev/null +++ b/package/snort/patches/patch-configure.orig @@ -0,0 +1,74 @@ +--- snort-2.8.5.1.orig/configure 2009-10-19 23:08:11.000000000 +0200 ++++ snort-2.8.5.1/configure 2009-12-27 15:47:57.000000000 +0100 +@@ -24242,70 +24242,7 @@ _ACEOF + fi + + +-# In case INADDR_NONE is not defined (like on Solaris) +-have_inaddr_none="no" +-echo "$as_me:$LINENO: checking for INADDR_NONE" >&5 +-echo $ECHO_N "checking for INADDR_NONE... $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. */ +- +-#include +-#include +-#include +- +-int +-main () +-{ +- +- if (inet_addr("10,5,2") == INADDR_NONE); +- return 0; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- have_inaddr_none="yes" +-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 ) +-have_inaddr_none="no" +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $have_inaddr_none" >&5 +-echo "${ECHO_T}$have_inaddr_none" >&6 +-if test "x$have_inaddr_none" = "xno"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define INADDR_NONE -1 +-_ACEOF +- +-fi ++have_inaddr_none="yes" + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ diff --git a/package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c b/package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c new file mode 100644 index 000000000..3f755d349 --- /dev/null +++ b/package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c @@ -0,0 +1,26 @@ +--- snort-2.8.5.1.orig/src/detection-plugins/sp_ip_tos_check.c 2009-05-07 00:28:33.000000000 +0200 ++++ snort-2.8.5.1/src/detection-plugins/sp_ip_tos_check.c 2009-12-27 16:51:48.000000000 +0100 +@@ -191,19 +191,19 @@ void ParseIpTos(char *data, OptTreeNode + ds_ptr->not_flag = 1; + } + +- if(index(data, (int) 'x') == NULL && index(data, (int)'X') == NULL) ++ if(strchr(data, (int) 'x') == NULL && strchr(data, (int)'X') == NULL) + { + ds_ptr->ip_tos = atoi(data); + } + else + { +- if(index(data,(int)'x')) ++ if(strchr(data,(int)'x')) + { +- ds_ptr->ip_tos = (u_char) strtol((index(data, (int)'x')+1), NULL, 16); ++ ds_ptr->ip_tos = (u_char) strtol((strchr(data, (int)'x')+1), NULL, 16); + } + else + { +- ds_ptr->ip_tos = (u_char) strtol((index(data, (int)'X')+1), NULL, 16); ++ ds_ptr->ip_tos = (u_char) strtol((strchr(data, (int)'X')+1), NULL, 16); + } + } + diff --git a/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c new file mode 100644 index 000000000..6c03a3417 --- /dev/null +++ b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c @@ -0,0 +1,85 @@ +--- snort-2.8.5.1.orig/src/detection-plugins/sp_pattern_match.c 2009-08-10 22:41:44.000000000 +0200 ++++ snort-2.8.5.1/src/detection-plugins/sp_pattern_match.c 2009-12-27 17:24:45.000000000 +0100 +@@ -831,7 +831,7 @@ void PayloadSearchListInit(char *data, O + data++; + + /* grab everything between the starting " and the end one */ +- sptr = index(data, '"'); ++ sptr = strchr(data, '"'); + eptr = strrchr(data, '"'); + + if(sptr != NULL && eptr != NULL) +@@ -862,21 +862,21 @@ static char *PayloadExtractParameter(cha + char *quote_one = NULL, *quote_two = NULL; + char *comma = NULL; + +- quote_one = index(data, '"'); ++ quote_one = strchr(data, '"'); + if (quote_one) + { +- quote_two = index(quote_one+1, '"'); ++ quote_two = strchr(quote_one+1, '"'); + while ( quote_two && quote_two[-1] == '\\' ) +- quote_two = index(quote_two+1, '"'); ++ quote_two = strchr(quote_two+1, '"'); + } + + if (quote_one && quote_two) + { +- comma = index(quote_two, ','); ++ comma = strchr(quote_two, ','); + } + else if (!quote_one) + { +- comma = index(data, ','); ++ comma = strchr(data, ','); + } + + if (comma) +@@ -2016,7 +2016,7 @@ void ParsePattern(char *rule, OptTreeNod + PatternMatchData *ds_idx; + + /* clear out the temp buffer */ +- bzero(tmp_buf, MAX_PATTERN_SIZE); ++ memset(tmp_buf, 0, MAX_PATTERN_SIZE); + + if(rule == NULL) + { +@@ -2035,7 +2035,7 @@ void ParsePattern(char *rule, OptTreeNod + } + + /* find the start of the data */ +- start_ptr = index(rule, '"'); ++ start_ptr = strchr(rule, '"'); + + if(start_ptr != rule) + { +@@ -2089,7 +2089,7 @@ void ParsePattern(char *rule, OptTreeNod + dummy_end = (dummy_idx + size); + + /* why is this buffer so small? */ +- bzero(hex_buf, 3); ++ memset(hex_buf, 0, 3); + memset(hex_buf, '0', 2); + + /* BEGIN BAD JUJU..... */ +@@ -2204,7 +2204,7 @@ void ParsePattern(char *rule, OptTreeNod + strtol(hex_buf, (char **) NULL, 16)&0xFF; + + dummy_size++; +- bzero(hex_buf, 3); ++ memset(hex_buf, 0, 3); + memset(hex_buf, '0', 2); + } + else +@@ -2759,8 +2759,8 @@ static void ParseContentListFile(char *f + } + + /* clear the line and rule buffers */ +- bzero((char *) buf, STD_BUF); +- bzero((char *) rule_buf, STD_BUF); ++ memset((char *) buf, 0, STD_BUF); ++ memset((char *) rule_buf, 0, STD_BUF); + frazes_count = 0; + + /* loop thru each list_file line and content to the rule */ diff --git a/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c.orig b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c.orig new file mode 100644 index 000000000..a0a9802ad --- /dev/null +++ b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c.orig @@ -0,0 +1,47 @@ +--- snort-2.8.5.1.orig/src/detection-plugins/sp_pattern_match.c 2009-08-10 22:41:44.000000000 +0200 ++++ snort-2.8.5.1/src/detection-plugins/sp_pattern_match.c 2009-12-27 16:06:41.000000000 +0100 +@@ -831,7 +831,7 @@ void PayloadSearchListInit(char *data, O + data++; + + /* grab everything between the starting " and the end one */ +- sptr = index(data, '"'); ++ sptr = strchr(data, '"'); + eptr = strrchr(data, '"'); + + if(sptr != NULL && eptr != NULL) +@@ -862,21 +862,21 @@ static char *PayloadExtractParameter(cha + char *quote_one = NULL, *quote_two = NULL; + char *comma = NULL; + +- quote_one = index(data, '"'); ++ quote_one = strchr(data, '"'); + if (quote_one) + { +- quote_two = index(quote_one+1, '"'); ++ quote_two = strchr(quote_one+1, '"'); + while ( quote_two && quote_two[-1] == '\\' ) +- quote_two = index(quote_two+1, '"'); ++ quote_two = strchr(quote_two+1, '"'); + } + + if (quote_one && quote_two) + { +- comma = index(quote_two, ','); ++ comma = strchr(quote_two, ','); + } + else if (!quote_one) + { +- comma = index(data, ','); ++ comma = strchr(data, ','); + } + + if (comma) +@@ -2035,7 +2035,7 @@ void ParsePattern(char *rule, OptTreeNod + } + + /* find the start of the data */ +- start_ptr = index(rule, '"'); ++ start_ptr = strchr(rule, '"'); + + if(start_ptr != rule) + { diff --git a/package/snort/patches/patch-src_detection-plugins_sp_replace_c b/package/snort/patches/patch-src_detection-plugins_sp_replace_c new file mode 100644 index 000000000..ebf2f0375 --- /dev/null +++ b/package/snort/patches/patch-src_detection-plugins_sp_replace_c @@ -0,0 +1,38 @@ +--- snort-2.8.5.1.orig/src/detection-plugins/sp_replace.c 2009-07-07 17:37:04.000000000 +0200 ++++ snort-2.8.5.1/src/detection-plugins/sp_replace.c 2009-12-27 17:23:47.000000000 +0100 +@@ -111,7 +111,7 @@ static PatternMatchData * Replace_Parse( + file_name, file_line); + } + /* clear out the temp buffer */ +- bzero(tmp_buf, MAX_PATTERN_SIZE); ++ memset(tmp_buf, 0, MAX_PATTERN_SIZE); + + while(isspace((int)*rule)) + rule++; +@@ -122,7 +122,7 @@ static PatternMatchData * Replace_Parse( + } + + /* find the start of the data */ +- start_ptr = index(rule, '"'); ++ start_ptr = strchr(rule, '"'); + + if(start_ptr == NULL) + { +@@ -163,7 +163,7 @@ static PatternMatchData * Replace_Parse( + dummy_end = (dummy_idx + size); + + /* why is this buffer so small? */ +- bzero(hex_buf, 3); ++ memset(hex_buf, 0, 3); + memset(hex_buf, '0', 2); + + /* BEGIN BAD JUJU..... */ +@@ -269,7 +269,7 @@ static PatternMatchData * Replace_Parse( + strtol(hex_buf, (char **) NULL, 16)&0xFF; + + dummy_size++; +- bzero(hex_buf, 3); ++ memset(hex_buf, 0, 3); + memset(hex_buf, '0', 2); + } + else diff --git a/package/snort/patches/patch-src_detection-plugins_sp_replace_c.orig b/package/snort/patches/patch-src_detection-plugins_sp_replace_c.orig new file mode 100644 index 000000000..3e78de505 --- /dev/null +++ b/package/snort/patches/patch-src_detection-plugins_sp_replace_c.orig @@ -0,0 +1,11 @@ +--- snort-2.8.5.1.orig/src/detection-plugins/sp_replace.c 2009-07-07 17:37:04.000000000 +0200 ++++ snort-2.8.5.1/src/detection-plugins/sp_replace.c 2009-12-27 17:14:46.000000000 +0100 +@@ -122,7 +122,7 @@ static PatternMatchData * Replace_Parse( + } + + /* find the start of the data */ +- start_ptr = index(rule, '"'); ++ start_ptr = strchr(rule, '"'); + + if(start_ptr == NULL) + { diff --git a/package/snort/patches/patch-src_detection-plugins_sp_session_c b/package/snort/patches/patch-src_detection-plugins_sp_session_c new file mode 100644 index 000000000..8f874f5ac --- /dev/null +++ b/package/snort/patches/patch-src_detection-plugins_sp_session_c @@ -0,0 +1,13 @@ +--- snort-2.8.5.1.orig/src/detection-plugins/sp_session.c 2009-08-10 22:41:45.000000000 +0200 ++++ snort-2.8.5.1/src/detection-plugins/sp_session.c 2009-12-27 17:24:07.000000000 +0100 +@@ -378,8 +378,8 @@ FILE *OpenSessionFile(Packet *p) + return NULL; + } + +- bzero((char *)session_file, STD_BUF); +- bzero((char *)log_path, STD_BUF); ++ memset((char *)session_file, 0, STD_BUF); ++ memset((char *)log_path, 0, STD_BUF); + + /* figure out which way this packet is headed in relation to the homenet */ + #ifdef SUP_IP6 diff --git a/package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c b/package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c new file mode 100644 index 000000000..6433539c7 --- /dev/null +++ b/package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c @@ -0,0 +1,26 @@ +--- snort-2.8.5.1.orig/src/detection-plugins/sp_tcp_win_check.c 2009-05-07 00:28:39.000000000 +0200 ++++ snort-2.8.5.1/src/detection-plugins/sp_tcp_win_check.c 2009-12-27 16:11:37.000000000 +0100 +@@ -196,19 +196,19 @@ void ParseTcpWin(char *data, OptTreeNode + ds_ptr->not_flag = 1; + } + +- if(index(data, (int) 'x') == NULL && index(data, (int)'X') == NULL) ++ if(strchr(data, (int) 'x') == NULL && strchr(data, (int)'X') == NULL) + { + win_size = atoi(data); + } + else + { +- if(index(data,(int)'x')) ++ if(strchr(data,(int)'x')) + { +- win_size = (uint16_t) strtol((index(data, (int)'x')+1), NULL, 16); ++ win_size = (uint16_t) strtol((strchr(data, (int)'x')+1), NULL, 16); + } + else + { +- win_size = (uint16_t) strtol((index(data, (int)'X')+1), NULL, 16); ++ win_size = (uint16_t) strtol((strchr(data, (int)'X')+1), NULL, 16); + } + } + diff --git a/package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c b/package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c new file mode 100644 index 000000000..c8584410b --- /dev/null +++ b/package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c @@ -0,0 +1,47 @@ +--- snort-2.8.5.1.orig/src/dynamic-preprocessors/dns/spp_dns.c 2009-10-02 22:29:57.000000000 +0200 ++++ snort-2.8.5.1/src/dynamic-preprocessors/dns/spp_dns.c 2009-12-27 17:17:22.000000000 +0100 +@@ -749,7 +749,7 @@ static uint16_t ParseDNSQuestion(const u + if (dnsSessionData->curr_txt.name_state == DNS_RESP_STATE_NAME_COMPLETE) + { + dnsSessionData->curr_rec_state = DNS_RESP_STATE_Q_TYPE; +- bzero(&dnsSessionData->curr_txt, sizeof(DNSNameState)); ++ memset(&dnsSessionData->curr_txt, 0, sizeof(DNSNameState)); + data = data + bytes_used; + bytes_unused = new_bytes_unused; + +@@ -837,7 +837,7 @@ uint16_t ParseDNSAnswer(const unsigned c + if (dnsSessionData->curr_txt.name_state == DNS_RESP_STATE_NAME_COMPLETE) + { + dnsSessionData->curr_rec_state = DNS_RESP_STATE_RR_TYPE; +- bzero(&dnsSessionData->curr_txt, sizeof(DNSNameState)); ++ memset(&dnsSessionData->curr_txt, 0, sizeof(DNSNameState)); + data = data + bytes_used; + } + bytes_unused = new_bytes_unused; +@@ -1272,7 +1272,7 @@ void ParseDNSResponseMessage(SFSnortPack + if (dnsSessionData->curr_rr.type == DNS_RR_TYPE_TXT) + { + /* Reset the state tracking for this record */ +- bzero(&dnsSessionData->curr_txt, sizeof(DNSNameState)); ++ memset(&dnsSessionData->curr_txt, 0, sizeof(DNSNameState)); + } + data = p->payload + (p->payload_size - bytes_unused); + } +@@ -1328,7 +1328,7 @@ void ParseDNSResponseMessage(SFSnortPack + if (dnsSessionData->curr_rr.type == DNS_RR_TYPE_TXT) + { + /* Reset the state tracking for this record */ +- bzero(&dnsSessionData->curr_txt, sizeof(DNSNameState)); ++ memset(&dnsSessionData->curr_txt, 0, sizeof(DNSNameState)); + } + data = p->payload + (p->payload_size - bytes_unused); + } +@@ -1384,7 +1384,7 @@ void ParseDNSResponseMessage(SFSnortPack + if (dnsSessionData->curr_rr.type == DNS_RR_TYPE_TXT) + { + /* Reset the state tracking for this record */ +- bzero(&dnsSessionData->curr_txt, sizeof(DNSNameState)); ++ memset(&dnsSessionData->curr_txt, 0, sizeof(DNSNameState)); + } + data = p->payload + (p->payload_size - bytes_unused); + } diff --git a/package/snort/patches/patch-src_inline_c b/package/snort/patches/patch-src_inline_c new file mode 100644 index 000000000..64c7a226f --- /dev/null +++ b/package/snort/patches/patch-src_inline_c @@ -0,0 +1,11 @@ +--- snort-2.8.5.1.orig/src/inline.c 2009-07-07 17:37:01.000000000 +0200 ++++ snort-2.8.5.1/src/inline.c 2009-12-27 17:20:43.000000000 +0100 +@@ -335,7 +335,7 @@ void IpfwLoop(void) + } + + /* Fill in necessary fields */ +- bzero(&sin, sizeof(sin)); ++ memset(&sin, 0, sizeof(sin)); + sin.sin_family = PF_INET; + sin.sin_addr.s_addr = INADDR_ANY; + sin.sin_port = htons(ScDivertPort()); diff --git a/package/snort/patches/patch-src_log_c b/package/snort/patches/patch-src_log_c new file mode 100644 index 000000000..456b6a033 --- /dev/null +++ b/package/snort/patches/patch-src_log_c @@ -0,0 +1,162 @@ +--- snort-2.8.5.1.orig/src/log.c 2009-10-19 17:48:42.000000000 +0200 ++++ snort-2.8.5.1/src/log.c 2009-12-27 17:19:26.000000000 +0100 +@@ -362,7 +362,7 @@ void PrintIPPkt(FILE * fp, int type, Pac + + DEBUG_WRAP(DebugMessage(DEBUG_LOG, "PrintIPPkt type = %d\n", type);); + +- bzero((char *) timestamp, TIMEBUF_SIZE); ++ memset((char *) timestamp, 0, TIMEBUF_SIZE); + ts_print((struct timeval *) & p->pkth->ts, timestamp); + + /* dump the timestamp */ +@@ -863,8 +863,8 @@ void PrintArpHeader(FILE * fp, Packet * + const uint8_t *mac_src = NULL; + const uint8_t *mac_dst = NULL; + +- bzero((struct in_addr *) &ip_addr, sizeof(struct in_addr)); +- bzero((char *) timestamp, TIMEBUF_SIZE); ++ memset((struct in_addr *) &ip_addr, 0, sizeof(struct in_addr)); ++ memset((char *) timestamp, 0, TIMEBUF_SIZE); + ts_print((struct timeval *) & p->pkth->ts, timestamp); + + /* determine what to use as MAC src and dst */ +@@ -916,7 +916,7 @@ void PrintArpHeader(FILE * fp, Packet * + switch(ntohs(p->ah->ea_hdr.ar_op)) + { + case ARPOP_REQUEST: +- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); + fprintf(fp, "ARP who-has %s", inet_ntoa(ip_addr)); + + if(memcmp((char *) ezero, (char *) p->ah->arp_tha, 6) != 0) +@@ -925,7 +925,7 @@ void PrintArpHeader(FILE * fp, Packet * + p->ah->arp_tha[1], p->ah->arp_tha[2], p->ah->arp_tha[3], + p->ah->arp_tha[4], p->ah->arp_tha[5]); + } +- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); + + fprintf(fp, " tell %s", inet_ntoa(ip_addr)); + +@@ -938,7 +938,7 @@ void PrintArpHeader(FILE * fp, Packet * + break; + + case ARPOP_REPLY: +- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); + fprintf(fp, "ARP reply %s", inet_ntoa(ip_addr)); + + /* print out the originating request if we're on a weirder +@@ -971,7 +971,7 @@ void PrintArpHeader(FILE * fp, Packet * + break; + + case ARPOP_RREPLY: +- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); + fprintf(fp, "RARP reply %X:%X:%X:%X:%X:%X at %s", + p->ah->arp_tha[0], p->ah->arp_tha[1], p->ah->arp_tha[2], + p->ah->arp_tha[3], p->ah->arp_tha[4], p->ah->arp_tha[5], +@@ -1467,7 +1467,7 @@ void PrintICMPEmbeddedIP(FILE *fp, Packe + if (fp == NULL || p == NULL) + return; + +- bzero((char *) &op, sizeof(Packet)); ++ memset((char *) &op, 0, sizeof(Packet)); + orig_p = &op; + + orig_p->iph = p->orig_iph; +@@ -1717,7 +1717,7 @@ void PrintTcpOptions(FILE * fp, Packet * + switch(p->tcp_options[i].code) + { + case TCPOPT_MAXSEG: +- bzero((char *) tmp, 5); ++ memset((char *) tmp, 0, 5); + fwrite("MSS: ", 5, 1, fp); + if (p->tcp_options[i].data) + memcpy(tmp, p->tcp_options[i].data, 2); +@@ -1740,11 +1740,11 @@ void PrintTcpOptions(FILE * fp, Packet * + break; + + case TCPOPT_SACK: +- bzero((char *) tmp, 5); ++ memset((char *) tmp, 0, 5); + if (p->tcp_options[i].data && (p->tcp_options[i].len >= 2)) + memcpy(tmp, p->tcp_options[i].data, 2); + fprintf(fp, "Sack: %u@", EXTRACT_16BITS(tmp)); +- bzero((char *) tmp, 5); ++ memset((char *) tmp, 0, 5); + if (p->tcp_options[i].data && (p->tcp_options[i].len >= 4)) + memcpy(tmp, (p->tcp_options[i].data) + 2, 2); + fprintf(fp, "%u ", EXTRACT_16BITS(tmp)); +@@ -1755,46 +1755,46 @@ void PrintTcpOptions(FILE * fp, Packet * + break; + + case TCPOPT_ECHO: +- bzero((char *) tmp, 5); ++ memset((char *) tmp, 0, 5); + if (p->tcp_options[i].data) + memcpy(tmp, p->tcp_options[i].data, 4); + fprintf(fp, "Echo: %u ", EXTRACT_32BITS(tmp)); + break; + + case TCPOPT_ECHOREPLY: +- bzero((char *) tmp, 5); ++ memset((char *) tmp, 0, 5); + if (p->tcp_options[i].data) + memcpy(tmp, p->tcp_options[i].data, 4); + fprintf(fp, "Echo Rep: %u ", EXTRACT_32BITS(tmp)); + break; + + case TCPOPT_TIMESTAMP: +- bzero((char *) tmp, 5); ++ memset((char *) tmp, 0, 5); + if (p->tcp_options[i].data) + memcpy(tmp, p->tcp_options[i].data, 4); + fprintf(fp, "TS: %u ", EXTRACT_32BITS(tmp)); +- bzero((char *) tmp, 5); ++ memset((char *) tmp, 0, 5); + if (p->tcp_options[i].data) + memcpy(tmp, (p->tcp_options[i].data) + 4, 4); + fprintf(fp, "%u ", EXTRACT_32BITS(tmp)); + break; + + case TCPOPT_CC: +- bzero((char *) tmp, 5); ++ memset((char *) tmp, 0, 5); + if (p->tcp_options[i].data) + memcpy(tmp, p->tcp_options[i].data, 4); + fprintf(fp, "CC %u ", EXTRACT_32BITS(tmp)); + break; + + case TCPOPT_CCNEW: +- bzero((char *) tmp, 5); ++ memset((char *) tmp, 0, 5); + if (p->tcp_options[i].data) + memcpy(tmp, p->tcp_options[i].data, 4); + fprintf(fp, "CCNEW: %u ", EXTRACT_32BITS(tmp)); + break; + + case TCPOPT_CCECHO: +- bzero((char *) tmp, 5); ++ memset((char *) tmp, 0, 5); + if (p->tcp_options[i].data) + memcpy(tmp, p->tcp_options[i].data, 4); + fprintf(fp, "CCECHO: %u ", EXTRACT_32BITS(tmp)); +@@ -1944,7 +1944,7 @@ void PrintEapolPkt(FILE * fp, Packet * p + char timestamp[TIMEBUF_SIZE]; + + +- bzero((char *) timestamp, TIMEBUF_SIZE); ++ memset((char *) timestamp, 0, TIMEBUF_SIZE); + ts_print((struct timeval *) & p->pkth->ts, timestamp); + + /* dump the timestamp */ +@@ -2118,7 +2118,7 @@ void PrintWifiPkt(FILE * fp, Packet * p) + char timestamp[TIMEBUF_SIZE]; + + +- bzero((char *) timestamp, TIMEBUF_SIZE); ++ memset((char *) timestamp, 0, TIMEBUF_SIZE); + ts_print((struct timeval *) & p->pkth->ts, timestamp); + + /* dump the timestamp */ diff --git a/package/snort/patches/patch-src_log_c.orig b/package/snort/patches/patch-src_log_c.orig new file mode 100644 index 000000000..3848941c3 --- /dev/null +++ b/package/snort/patches/patch-src_log_c.orig @@ -0,0 +1,38 @@ +--- snort-2.8.5.1.orig/src/log.c 2009-10-19 17:48:42.000000000 +0200 ++++ snort-2.8.5.1/src/log.c 2009-12-27 16:21:59.000000000 +0100 +@@ -916,7 +916,7 @@ void PrintArpHeader(FILE * fp, Packet * + switch(ntohs(p->ah->ea_hdr.ar_op)) + { + case ARPOP_REQUEST: +- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); + fprintf(fp, "ARP who-has %s", inet_ntoa(ip_addr)); + + if(memcmp((char *) ezero, (char *) p->ah->arp_tha, 6) != 0) +@@ -925,7 +925,7 @@ void PrintArpHeader(FILE * fp, Packet * + p->ah->arp_tha[1], p->ah->arp_tha[2], p->ah->arp_tha[3], + p->ah->arp_tha[4], p->ah->arp_tha[5]); + } +- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); + + fprintf(fp, " tell %s", inet_ntoa(ip_addr)); + +@@ -938,7 +938,7 @@ void PrintArpHeader(FILE * fp, Packet * + break; + + case ARPOP_REPLY: +- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); + fprintf(fp, "ARP reply %s", inet_ntoa(ip_addr)); + + /* print out the originating request if we're on a weirder +@@ -971,7 +971,7 @@ void PrintArpHeader(FILE * fp, Packet * + break; + + case ARPOP_RREPLY: +- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); + fprintf(fp, "RARP reply %X:%X:%X:%X:%X:%X at %s", + p->ah->arp_tha[0], p->ah->arp_tha[1], p->ah->arp_tha[2], + p->ah->arp_tha[3], p->ah->arp_tha[4], p->ah->arp_tha[5], diff --git a/package/snort/patches/patch-src_log_text_c b/package/snort/patches/patch-src_log_text_c new file mode 100644 index 000000000..6451bbd1e --- /dev/null +++ b/package/snort/patches/patch-src_log_text_c @@ -0,0 +1,38 @@ +--- snort-2.8.5.1.orig/src/log_text.c 2009-05-07 00:28:15.000000000 +0200 ++++ snort-2.8.5.1/src/log_text.c 2009-12-27 16:08:42.000000000 +0100 +@@ -1604,7 +1604,7 @@ void LogArpHeader(TextLog* log, Packet * + switch(ntohs(p->ah->ea_hdr.ar_op)) + { + case ARPOP_REQUEST: +- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); + TextLog_Print(log, "ARP who-has %s", inet_ntoa(ip_addr)); + + if(memcmp((char *) ezero, (char *) p->ah->arp_tha, 6) != 0) +@@ -1613,7 +1613,7 @@ void LogArpHeader(TextLog* log, Packet * + p->ah->arp_tha[1], p->ah->arp_tha[2], p->ah->arp_tha[3], + p->ah->arp_tha[4], p->ah->arp_tha[5]); + } +- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); + + TextLog_Print(log, " tell %s", inet_ntoa(ip_addr)); + +@@ -1626,7 +1626,7 @@ void LogArpHeader(TextLog* log, Packet * + break; + + case ARPOP_REPLY: +- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); + TextLog_Print(log, "ARP reply %s", inet_ntoa(ip_addr)); + + /* print out the originating request if we're on a weirder +@@ -1659,7 +1659,7 @@ void LogArpHeader(TextLog* log, Packet * + break; + + case ARPOP_RREPLY: +- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); ++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); + TextLog_Print(log, "RARP reply %X:%X:%X:%X:%X:%X at %s", + p->ah->arp_tha[0], p->ah->arp_tha[1], p->ah->arp_tha[2], + p->ah->arp_tha[3], p->ah->arp_tha[4], p->ah->arp_tha[5], diff --git a/package/snort/patches/patch-src_mempool_c b/package/snort/patches/patch-src_mempool_c new file mode 100644 index 000000000..50455ac2a --- /dev/null +++ b/package/snort/patches/patch-src_mempool_c @@ -0,0 +1,11 @@ +--- snort-2.8.5.1.orig/src/mempool.c 2009-08-10 22:41:39.000000000 +0200 ++++ snort-2.8.5.1/src/mempool.c 2009-12-27 17:21:21.000000000 +0100 +@@ -288,7 +288,7 @@ MemBucket *mempool_alloc(MemPool *mempoo + + /* TBD -- make configurable */ + b = li->data; +- bzero(b->data, mempool->obj_size); ++ memset(b->data, 0, mempool->obj_size); + + return b; + } diff --git a/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c b/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c new file mode 100644 index 000000000..a940ec03a --- /dev/null +++ b/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c @@ -0,0 +1,50 @@ +--- snort-2.8.5.1.orig/src/output-plugins/spo_alert_unixsock.c 2009-05-07 00:29:12.000000000 +0200 ++++ snort-2.8.5.1/src/output-plugins/spo_alert_unixsock.c 2009-12-27 17:23:19.000000000 +0100 +@@ -176,16 +176,16 @@ void AlertUnixSock(Packet *p, char *msg, + + DEBUG_WRAP(DebugMessage(DEBUG_LOG, "Logging Alert data!\n");); + +- bzero((char *)&alertpkt,sizeof(alertpkt)); ++ memset((char *)&alertpkt, 0, sizeof(alertpkt)); + if (event) + { +- bcopy((const void *)event,(void *)&alertpkt.event,sizeof(Event)); ++ memcpy((void *)&alertpkt.event,(const void *)event,sizeof(Event)); + } + + if(p && p->pkt) + { +- bcopy((const void *)p->pkth,(void *)&alertpkt.pkth,sizeof(struct pcap_pkthdr)); +- bcopy((const void *)p->pkt,alertpkt.pkt, ++ memcpy((void *)&alertpkt.pkth,(const void *)p->pkth,sizeof(struct pcap_pkthdr)); ++ memcpy(alertpkt.pkt,(const void *)p->pkt, + alertpkt.pkth.caplen > SNAPLEN? SNAPLEN : alertpkt.pkth.caplen); + } + else +@@ -193,7 +193,7 @@ void AlertUnixSock(Packet *p, char *msg, + + if (msg) + { +- bcopy((const void *)msg,(void *)alertpkt.alertmsg, ++ memcpy((void *)alertpkt.alertmsg,(const void *)msg, + strlen(msg)>ALERTMSG_LENGTH-1 ? ALERTMSG_LENGTH - 1 : strlen(msg)); + } + +@@ -236,7 +236,7 @@ void AlertUnixSock(Packet *p, char *msg, + break; + + default: +- /* alertpkt.transhdr is null due to initial bzero */ ++ /* alertpkt.transhdr is null due to initial memset */ + alertpkt.val|=NO_TRANSHDR; + break; + } +@@ -282,7 +282,7 @@ void OpenAlertSock(void) + srv); + } + +- bzero((char *) &alertaddr, sizeof(alertaddr)); ++ memset((char *) &alertaddr, 0, sizeof(alertaddr)); + + /* 108 is the size of sun_path */ + strncpy(alertaddr.sun_path, srv, 108); diff --git a/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c.orig b/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c.orig new file mode 100644 index 000000000..fd98d8771 --- /dev/null +++ b/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c.orig @@ -0,0 +1,32 @@ +--- snort-2.8.5.1.orig/src/output-plugins/spo_alert_unixsock.c 2009-05-07 00:29:12.000000000 +0200 ++++ snort-2.8.5.1/src/output-plugins/spo_alert_unixsock.c 2009-12-27 17:12:45.000000000 +0100 +@@ -176,16 +176,16 @@ void AlertUnixSock(Packet *p, char *msg, + + DEBUG_WRAP(DebugMessage(DEBUG_LOG, "Logging Alert data!\n");); + +- bzero((char *)&alertpkt,sizeof(alertpkt)); ++ memset((char *)&alertpkt, 0, sizeof(alertpkt)); + if (event) + { +- bcopy((const void *)event,(void *)&alertpkt.event,sizeof(Event)); ++ memcpy((void *)&alertpkt.event,(const void *)event,sizeof(Event)); + } + + if(p && p->pkt) + { +- bcopy((const void *)p->pkth,(void *)&alertpkt.pkth,sizeof(struct pcap_pkthdr)); +- bcopy((const void *)p->pkt,alertpkt.pkt, ++ memcpy((void *)&alertpkt.pkth,(const void *)p->pkth,sizeof(struct pcap_pkthdr)); ++ memcpy(alertpkt.pkt,(const void *)p->pkt, + alertpkt.pkth.caplen > SNAPLEN? SNAPLEN : alertpkt.pkth.caplen); + } + else +@@ -193,7 +193,7 @@ void AlertUnixSock(Packet *p, char *msg, + + if (msg) + { +- bcopy((const void *)msg,(void *)alertpkt.alertmsg, ++ memcpy((void *)alertpkt.alertmsg,(const void *)msg, + strlen(msg)>ALERTMSG_LENGTH-1 ? ALERTMSG_LENGTH - 1 : strlen(msg)); + } + diff --git a/package/snort/patches/patch-src_output-plugins_spo_database_c b/package/snort/patches/patch-src_output-plugins_spo_database_c new file mode 100644 index 000000000..3703cd03d --- /dev/null +++ b/package/snort/patches/patch-src_output-plugins_spo_database_c @@ -0,0 +1,11 @@ +--- snort-2.8.5.1.orig/src/output-plugins/spo_database.c 2009-10-02 22:29:59.000000000 +0200 ++++ snort-2.8.5.1/src/output-plugins/spo_database.c 2009-12-27 17:21:41.000000000 +0100 +@@ -333,7 +333,7 @@ static int instances = 0; + /* this is for debugging purposes only */ + static char g_CurrentStatement[2048]; + #define SAVESTATEMENT(str) strncpy(g_CurrentStatement, str, sizeof(g_CurrentStatement) - 1); +- #define CLEARSTATEMENT() bzero((char *) g_CurrentStatement, sizeof(g_CurrentStatement)); ++ #define CLEARSTATEMENT() memset((char *) g_CurrentStatement, 0, sizeof(g_CurrentStatement)); + #else + #define SAVESTATEMENT(str) NULL; + #define CLEARSTATEMENT() NULL; diff --git a/package/snort/patches/patch-src_output-plugins_spo_log_ascii_c b/package/snort/patches/patch-src_output-plugins_spo_log_ascii_c new file mode 100644 index 000000000..3c1e220d0 --- /dev/null +++ b/package/snort/patches/patch-src_output-plugins_spo_log_ascii_c @@ -0,0 +1,15 @@ +--- snort-2.8.5.1.orig/src/output-plugins/spo_log_ascii.c 2009-05-07 00:29:14.000000000 +0200 ++++ snort-2.8.5.1/src/output-plugins/spo_log_ascii.c 2009-12-27 17:22:59.000000000 +0100 +@@ -198,9 +198,9 @@ FILE *OpenLogFile(int mode, Packet * p) + #endif + + /* zero out our buffers */ +- bzero((char *) log_path, STD_BUF); +- bzero((char *) log_file, STD_BUF); +- bzero((char *) proto, 5); ++ memset((char *) log_path, 0, STD_BUF); ++ memset((char *) log_file, 0, STD_BUF); ++ memset((char *) proto, 0, 5); + + if (mode == GENERIC_LOG || mode == DUMP || mode == BOGUS || + mode == NON_IP || mode == ARP) diff --git a/package/snort/patches/patch-src_output-plugins_spo_log_tcpdump_c b/package/snort/patches/patch-src_output-plugins_spo_log_tcpdump_c new file mode 100644 index 000000000..50bdd855b --- /dev/null +++ b/package/snort/patches/patch-src_output-plugins_spo_log_tcpdump_c @@ -0,0 +1,11 @@ +--- snort-2.8.5.1.orig/src/output-plugins/spo_log_tcpdump.c 2009-05-07 00:29:15.000000000 +0200 ++++ snort-2.8.5.1/src/output-plugins/spo_log_tcpdump.c 2009-12-27 17:22:31.000000000 +0100 +@@ -469,7 +469,7 @@ static void SpoLogTcpdumpCleanup(int sig + free (data->filename); + } + +- bzero(data, sizeof(LogTcpdumpData)); ++ memset(data, 0, sizeof(LogTcpdumpData)); + free(data); + } + diff --git a/package/snort/patches/patch-src_output-plugins_spo_unified_c b/package/snort/patches/patch-src_output-plugins_spo_unified_c new file mode 100644 index 000000000..9613b7fd0 --- /dev/null +++ b/package/snort/patches/patch-src_output-plugins_spo_unified_c @@ -0,0 +1,47 @@ +--- snort-2.8.5.1.orig/src/output-plugins/spo_unified.c 2009-08-10 22:41:52.000000000 +0200 ++++ snort-2.8.5.1/src/output-plugins/spo_unified.c 2009-12-27 17:22:15.000000000 +0100 +@@ -302,7 +302,7 @@ static void UnifiedInitFile(UnifiedConfi + FileHeader hdr; + int value; + +- bzero(logdir, STD_BUF); ++ memset(logdir, 0, STD_BUF); + curr_time = time(NULL); + + if(data == NULL) +@@ -398,7 +398,7 @@ void RealUnifiedLogAlert(Packet *p, char + UnifiedConfig *data = (UnifiedConfig *)arg; + UnifiedAlert alertdata; + +- bzero(&alertdata, sizeof(alertdata)); ++ memset(&alertdata, 0, sizeof(alertdata)); + + if(event != NULL) + { +@@ -483,7 +483,7 @@ void RealUnifiedLogAlert6(Packet *p, cha + UnifiedConfig *data = (UnifiedConfig *)arg; + UnifiedIPv6Alert alertdata; + +- bzero(&alertdata, sizeof(alertdata)); ++ memset(&alertdata, 0, sizeof(alertdata)); + + if(event != NULL) + { +@@ -1039,7 +1039,7 @@ void UnifiedInitAlertFile(UnifiedConfig + int value; + UnifiedAlertFileHeader hdr; + +- bzero(logdir, STD_BUF); ++ memset(logdir, 0, STD_BUF); + curr_time = time(NULL); + + if(data->nostamp) +@@ -1167,7 +1167,7 @@ void UnifiedInitLogFile(UnifiedConfig *d + int value; + //UnifiedLogFileHeader hdr; + +- bzero(logdir, STD_BUF); ++ memset(logdir, 0, STD_BUF); + curr_time = time(NULL); + + if(data == NULL) diff --git a/package/snort/patches/patch-src_parser_IpAddrSet_c b/package/snort/patches/patch-src_parser_IpAddrSet_c new file mode 100644 index 000000000..fd365a696 --- /dev/null +++ b/package/snort/patches/patch-src_parser_IpAddrSet_c @@ -0,0 +1,16 @@ +--- snort-2.8.5.1.orig/src/parser/IpAddrSet.c 2009-07-07 17:37:07.000000000 +0200 ++++ snort-2.8.5.1/src/parser/IpAddrSet.c 2009-12-27 16:38:24.000000000 +0100 +@@ -388,11 +388,11 @@ int ParseIP(char *paddr, IpAddrSet *ias, + /* protecting against malicious DNS servers */ + if(host_info->h_length <= (int)sizeof(sin.sin_addr)) + { +- bcopy(host_info->h_addr, (char *) &sin.sin_addr, host_info->h_length); ++ memcpy((char *) &sin.sin_addr, host_info->h_addr, host_info->h_length); + } + else + { +- bcopy(host_info->h_addr, (char *) &sin.sin_addr, sizeof(sin.sin_addr)); ++ memcpy((char *) &sin.sin_addr, host_info->h_addr, sizeof(sin.sin_addr)); + } + } + /* Using h_errno */ diff --git a/package/snort/patches/patch-src_parser_c b/package/snort/patches/patch-src_parser_c new file mode 100644 index 000000000..23ee43347 --- /dev/null +++ b/package/snort/patches/patch-src_parser_c @@ -0,0 +1,40 @@ +--- snort-2.8.5.1.orig/src/parser.c 2009-10-02 22:29:56.000000000 +0200 ++++ snort-2.8.5.1/src/parser.c 2009-12-27 17:20:27.000000000 +0100 +@@ -4362,7 +4362,7 @@ static char * ExpandVars(SnortConfig *sc + if(!string || !*string || !strchr(string, '$')) + return(string); + +- bzero((char *) estring, PARSERULE_SIZE); ++ memset((char *) estring, 0, PARSERULE_SIZE); + + i = j = 0; + l_string = strlen(string); +@@ -4381,7 +4381,7 @@ static char * ExpandVars(SnortConfig *sc + + if(c == '$' && !quote_toggle) + { +- bzero((char *) rawvarname, sizeof(rawvarname)); ++ memset((char *) rawvarname, 0, sizeof(rawvarname)); + varname_completed = 0; + name_only = 1; + iv = i; +@@ -4421,8 +4421,8 @@ static char * ExpandVars(SnortConfig *sc + + varcontents = NULL; + +- bzero((char *) varname, sizeof(varname)); +- bzero((char *) varaux, sizeof(varaux)); ++ memset((char *) varname, 0, sizeof(varname)); ++ memset((char *) varaux, 0, sizeof(varaux)); + varmodifier = ' '; + + p = strchr(rawvarname, ':'); +@@ -4439,7 +4439,7 @@ static char * ExpandVars(SnortConfig *sc + else + SnortStrncpy(varname, rawvarname, sizeof(varname)); + +- bzero((char *) varbuffer, sizeof(varbuffer)); ++ memset((char *) varbuffer, 0, sizeof(varbuffer)); + + varcontents = VarSearch(sc, varname); + diff --git a/package/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c b/package/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c new file mode 100644 index 000000000..4948465a3 --- /dev/null +++ b/package/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c @@ -0,0 +1,11 @@ +--- snort-2.8.5.1.orig/src/preprocessors/Stream5/snort_stream5_tcp.c 2009-10-02 22:30:01.000000000 +0200 ++++ snort-2.8.5.1/src/preprocessors/Stream5/snort_stream5_tcp.c 2009-12-27 17:16:36.000000000 +0100 +@@ -6913,7 +6913,7 @@ static int ProcessTcp(Stream5LWSession * + char timestamp[TIMEBUF_SIZE]; + char src_addr[17]; + char dst_addr[17]; +- bzero((char *)timestamp, TIMEBUF_SIZE); ++ memset((char *)timestamp, 0, TIMEBUF_SIZE); + ts_print((struct timeval *) &p->pkth->ts, timestamp); + SnortSnprintf(src_addr, 17, "%s", + inet_ntoa(GET_SRC_ADDR(p))); diff --git a/package/snort/patches/patch-src_snort_c b/package/snort/patches/patch-src_snort_c new file mode 100644 index 000000000..a3ec23375 --- /dev/null +++ b/package/snort/patches/patch-src_snort_c @@ -0,0 +1,20 @@ +--- snort-2.8.5.1.orig/src/snort.c 2009-10-19 19:44:03.000000000 +0200 ++++ snort-2.8.5.1/src/snort.c 2009-12-27 17:17:42.000000000 +0100 +@@ -3581,7 +3581,7 @@ static void SnortCleanup(int exit_val) + struct timeval difftime; + struct timezone tz; + +- bzero((char *) &tz, sizeof(tz)); ++ memset((char *) &tz, 0, sizeof(tz)); + gettimeofday(&endtime, &tz); + + TIMERSUB(&endtime, &starttime, &difftime); +@@ -3628,7 +3628,7 @@ static void SnortCleanup(int exit_val) + sfActionQueueDestroy (decoderActionQ); + mempool_destroy (&decoderAlertMemPool); + decoderActionQ = NULL; +- bzero(&decoderAlertMemPool, sizeof(decoderAlertMemPool)); ++ memset(&decoderAlertMemPool, 0, sizeof(decoderAlertMemPool)); + } + + /* Print Statistics */ diff --git a/package/snort/patches/patch-src_util_c b/package/snort/patches/patch-src_util_c new file mode 100644 index 000000000..79de72511 --- /dev/null +++ b/package/snort/patches/patch-src_util_c @@ -0,0 +1,20 @@ +--- snort-2.8.5.1.orig/src/util.c 2009-08-10 22:41:42.000000000 +0200 ++++ snort-2.8.5.1/src/util.c 2009-12-27 17:21:05.000000000 +0100 +@@ -227,7 +227,7 @@ void ts_print(register const struct time + if(!tvp) + { + /* manual page (for linux) says tz is never used, so.. */ +- bzero((char *) &tz, sizeof(tz)); ++ memset((char *) &tz, 0, sizeof(tz)); + gettimeofday(&tv, &tz); + tvp = &tv; + } +@@ -2714,7 +2714,7 @@ char *GetCurrentTimestamp() + + buf = (char *)SnortAlloc(SMALLBUFFER * sizeof(char)); + +- bzero((char *)&tz,sizeof(tz)); ++ memset((char *)&tz, 0, sizeof(tz)); + gettimeofday(&tv,&tz); + tvp = &tv; + diff --git a/package/squid/Makefile b/package/squid/Makefile index 807e4dc08..3fb78d66d 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -13,7 +13,8 @@ PKG_SECTION:= net PKG_DEPENDS:= libopenssl libpthread PKG_URL:= http://www.squid-cache.org PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.0/ -PKG_CXX:= SQUID +PKG_MULTI:= 1 +#PKG_CXX:= SQUID AUTH_MODULES:= basic digest ntlm ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},) @@ -74,11 +75,11 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_grou $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth)) $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth)) -ifeq ($(ADK_COMPILE_SQUID_WITH_UCLIBCXX),y) -CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ - -I${STAGING_DIR}/usr/include/uClibc++" \ - LIBS="-nodefaultlibs -luClibc++ -ldl -lm" -endif +#ifeq ($(ADK_COMPILE_SQUID_WITH_UCLIBCXX),y) +#CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ +# -I${STAGING_DIR}/usr/include/uClibc++" \ +# LIBS="-nodefaultlibs -luClibc++ -ldl -lm" +#endif CONFIGURE_STYLE:= autotool gnu CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ @@ -136,15 +137,12 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \ BUILD_STYLE:= auto INSTALL_STYLE:= auto -ifeq (${ADK_COMPILE_SQUID_WITH_UCLIBCXX},y) +#ifeq (${ADK_COMPILE_SQUID_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ - ${WRKBUILD}/libtool -endif -post-configure: - ${SED} 's#\(hardcode_into_libs=\).*$$#\1no#' \ - ${WRKBUILD}/libtool +#post-configure: +# ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ +# ${WRKBUILD}/libtool +#endif post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_SQUID}/etc/squid diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index a768954c4..0d23f4095 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -6,19 +6,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tntnet PKG_VERSION:= 1.6.4 PKG_RELEASE:= 1 +PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996 +PKG_DESCR:= small C++ application server +PKG_SECTION:= net PKG_BUILDDEP+= cxxtools zlib ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},) PKG_BUILDDEP+= openssl else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},) PKG_BUILDDEP+= gnutls endif -PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996 -PKG_DESCR:= small C++ application server -PKG_SECTION:= net PKG_DEPENDS:= cxxtools zlib libpthread libiconv PKG_URL:= http://www.tntnet.org PKG_SITES:= http://www.tntnet.org/download/ -PKG_CXX:= TNTNET +#PKG_CXX:= TNTNET include ${TOPDIR}/mk/package.mk @@ -54,12 +54,12 @@ CONFIGURE_ENV+= CXXFLAGS='${TCXXFLAGS}' \ BUILD_STYLE:= auto INSTALL_STYLE:= auto -ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y) +#ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ - ${WRKBUILD}/libtool -endif +#post-configure: +# ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ +# ${WRKBUILD}/libtool +#endif post-install: ${INSTALL_DIR} ${IDIR_TNTNET}/www diff --git a/package/udev/Makefile b/package/udev/Makefile index 90ffefe66..4f329db6b 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= udev -PKG_VERSION:= 142 +PKG_VERSION:= 149 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3edc4cf383dccb06d866c5156d59ddd5 +PKG_MD5SUM:= b218bd15939e8afc6368e1907a48bb26 PKG_DESCR:= Dynamic device management subsystem PKG_SECTION:= base PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index a7dcfa015..30c170749 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -6,6 +6,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ulogd PKG_VERSION:= 1.24 PKG_RELEASE:= 7 +PKG_MD5SUM:= 05b4ed2926b9a22aaeaf642917bbf8ff +PKG_DESCR:= Netfilter userspace logging daemon +PKG_SECTION:= net +PKG_MULTI:= 1 +PKG_NOPARALLEL:= 1 +PKG_DEPENDS:= iptables PKG_BUILDDEP+= iptables ifneq ($(ADK_PACKAGE_ULOGD_MOD_MYSQL),) PKG_BUILDDEP+= mysql @@ -19,11 +25,6 @@ endif ifneq ($(ADK_PACKAGE_ULOGD_MOD_SQLITE),) PKG_BUILDDEP+= sqlite endif -PKG_MD5SUM:= 05b4ed2926b9a22aaeaf642917bbf8ff -PKG_DESCR:= Netfilter userspace logging daemon -PKG_SECTION:= net -PKG_DEPENDS:= iptables -PKG_NOPARALLEL:= 1 PKG_URL:= http://www.netfilter.org/projects/ulogd PKG_SITES:= ftp://ftp.netfilter.org/pub/ulogd/ \ ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \ diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile index 40acba4a4..f13bee501 100644 --- a/package/updatedd/Makefile +++ b/package/updatedd/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 95655596eb6e0e381d60a458f6a45fee PKG_DESCR:= A tool to update dynamic dns services. PKG_SECTION:= net +PKG_MULTI:= 1 PKG_SITES:= http://savannah.nongnu.org/download/updatedd/ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index f20811848..3927ca2c6 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xorg-server PKG_VERSION:= 1.7.1 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9 PKG_DESCR:= Xorg server PKG_SECTION:= x11 -PKG_DEPENDS:= libopenssl +PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile +PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} @@ -19,6 +19,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu +CONFIGURE_ENV+= V=1 CONFIGURE_ARGS+= \ --enable-dga \ --enable-xorg \ diff --git a/package/xz/Makefile b/package/xz/Makefile index 5bffd5822..0caa69fca 100644 --- a/package/xz/Makefile +++ b/package/xz/Makefile @@ -7,9 +7,9 @@ PKG_NAME:= xz PKG_VERSION:= 4.999.9beta PKG_RELEASE:= 1 PKG_MD5SUM:= f2073579b6da2fe35d453adee1aaf1b2 -PKG_DESCR:= retrieving files using HTTP, HTTPS and FTP +PKG_DESCR:= lzma compression utility PKG_SECTION:= net -PKG_URL:= http://tukaani.org/xz +PKG_URL:= http://tukaani.org/xz/ PKG_SITES:= http://tukaani.org/xz/ include ${TOPDIR}/mk/package.mk diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index cedaa941b..bdad0241f 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -265,7 +265,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM config ADK_KPACKAGE_KMOD_DM_CRYPT prompt "kmod-dm-crypt................... Crypt target support" - depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM + select ADK_KPACKAGE_KMOD_BLK_DEV_DM depends on !ADK_KERNEL_DM_CRYPT select ADK_KERNEL_MD select ADK_KERNEL_CRYPTO @@ -283,14 +283,14 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT config ADK_KPACKAGE_KMOD_DM_SNAPSHOT prompt "kmod-dm-snapshot................ Snapshot target" - depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM + select ADK_KPACKAGE_KMOD_BLK_DEV_DM tristate help Allow volume managers to take writable snapshots of a device. config ADK_KPACKAGE_KMOD_DM_MIRROR prompt "kmod-dm-mirror.................. Mirror target" - depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM + select ADK_KPACKAGE_KMOD_BLK_DEV_DM tristate help Allow volume managers to mirror logical volumes, also -- cgit v1.2.3 From b13c2e3fbfb396890f93a34ba4904a275993080d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 Dec 2009 16:09:33 +0100 Subject: fix some dependencies and target dependency handling --- package/Config.in | 49 ++++++++++++++++++++++++++++++++++++++++++++--- package/grub-bin/Makefile | 3 ++- package/grub/Makefile | 2 +- package/mpd/Makefile | 9 ++++++--- package/mplayer/Makefile | 6 +++--- package/ncurses/Makefile | 8 ++++---- package/pkgmaker | 2 +- 7 files changed, 63 insertions(+), 16 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/Config.in b/package/Config.in index e4c5288c3..9693e27b0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -410,7 +410,9 @@ source "package/gtk+/Config.in" source "package/id3lib/Config.in" source "package/libao/Config.in" source "package/libaudiofile/Config.in" +source "package/libaudiofile/Config.in.lib" source "package/libart/Config.in" +source "package/libart/Config.in.lib" source "package/linux-atm/Config.in.lib" source "package/libcli/Config.in" source "package/libdaemon/Config.in" @@ -427,8 +429,11 @@ source "package/faad2/Config.in.lib" source "package/flac/Config.in" source "package/flac/Config.in.lib" source "package/freetype/Config.in" +source "package/freetype/Config.in.lib" source "package/libgcrypt/Config.in" +source "package/libgcrypt/Config.in.lib" source "package/libgd/Config.in" +source "package/libgd/Config.in.lib" source "package/gdbm/Config.in" source "package/gdbm/Config.in.lib" source "package/libgssglue/Config.in" @@ -440,27 +445,36 @@ source "package/libgpg-error/Config.in" source "package/gsm/Config.in" source "package/gsm/Config.in.lib" source "package/libiconv/Config.in" +source "package/libiconv/Config.in.lib" source "package/libid3tag/Config.in" +source "package/libid3tag/Config.in.lib" source "package/jpeg/Config.in" source "package/jpeg/Config.in.lib" source "package/lame/Config.in.lib" source "package/mpfr/Config.in" source "package/nspr/Config.in" source "package/nss/Config.in" -source "package/libtool/Config.in" # libltdl +source "package/libtool/Config.in" source "package/openldap/Config.in.lib" source "package/liblzo/Config.in" +source "package/liblzo/Config.in.lib" source "package/libmad/Config.in" +source "package/libmad/Config.in.lib" source "package/libmms/Config.in" -source "package/ncurses/Config.in" # libncurses +source "package/libmms/Config.in.lib" +source "package/ncurses/Config.in" +source "package/ncurses/Config.in.lib" source "package/neon/Config.in" source "package/libnet/Config.in" +source "package/libnet/Config.in.lib" source "package/libnfsidmap/Config.in" source "package/libnids/Config.in" source "package/libnl/Config.in" source "package/libogg/Config.in" +source "package/libogg/Config.in.lib" source "package/libol/Config.in" -source "package/opencdk/Config.in" # libopencdk +source "package/libol/Config.in.lib" +source "package/opencdk/Config.in" source "package/obexftp/Config.in.lib" source "package/openobex/Config.in" source "package/libosip2/Config.in" @@ -471,13 +485,18 @@ source "package/libpri/Config.in" source "package/pango/Config.in" source "package/pcre/Config.in" source "package/libpng/Config.in" +source "package/libpng/Config.in.lib" source "package/popt/Config.in" +source "package/popt/Config.in.lib" source "package/postgresql/Config.in" +source "package/postgresql/Config.in.lib" source "package/libpthread/Config.in" +source "package/libpthread/Config.in.lib" source "package/libthread_db/Config.in" source "package/readline/Config.in" source "package/cyrus-sasl/Config.in.lib" source "package/speex/Config.in" +source "package/openssl/Config.in.lib" source "package/sqlite/Config.in.lib" source "package/librpcsecgss/Config.in" source "package/libshout/Config.in" @@ -490,13 +509,20 @@ source "package/libtirpc/Config.in" source "package/libtorrent/Config.in" source "package/libupnp/Config.in" source "package/libusb/Config.in" +source "package/libusb/Config.in.lib" source "package/libusb-compat/Config.in" +source "package/libusb-compat/Config.in.lib" source "package/libvirt/Config.in" +source "package/libvirt/Config.in.lib" source "package/libvorbis/Config.in" +source "package/libvorbis/Config.in.lib" source "package/libvorbisidec/Config.in" +source "package/libvorbisidec/Config.in.lib" source "package/tcp_wrappers/Config.in" source "package/libxml2/Config.in" +source "package/libxml2/Config.in.lib" source "package/libxslt/Config.in" +source "package/libxslt/Config.in.lib" source "package/lua/Config.in.lib" source "package/uclibc++/Config.in.manual" source "package/ustl/Config.in" @@ -510,22 +536,39 @@ source "package/xf86-video-geode/Config.in" menu "X Libraries" source "package/libICE/Config.in" +source "package/libICE/Config.in.lib" source "package/libSM/Config.in" +source "package/libSM/Config.in.lib" source "package/libX11/Config.in" +source "package/libX11/Config.in.lib" source "package/libXv/Config.in" +source "package/libXv/Config.in.lib" source "package/libXdmcp/Config.in" +source "package/libXdmcp/Config.in.lib" source "package/libXext/Config.in" +source "package/libXext/Config.in.lib" source "package/libXfont/Config.in" +source "package/libXfont/Config.in.lib" source "package/libfontenc/Config.in" +source "package/libfontenc/Config.in.lib" source "package/libpciaccess/Config.in" +source "package/libpciaccess/Config.in.lib" source "package/libxkbfile/Config.in" +source "package/libxkbfile/Config.in.lib" source "package/libXau/Config.in" +source "package/libXau/Config.in.lib" source "package/libXaw/Config.in" +source "package/libXaw/Config.in.lib" source "package/libXmu/Config.in" +source "package/libXmu/Config.in.lib" source "package/libXpm/Config.in" +source "package/libXpm/Config.in.lib" source "package/libXrender/Config.in" +source "package/libXrender/Config.in.lib" source "package/libXt/Config.in" +source "package/libXt/Config.in.lib" source "package/libXxf86dga/Config.in" +source "package/libXxf86dga/Config.in.lib" source "package/pixman/Config.in" #source "package/xf86dga/Config.in" source "package/xkbcomp/Config.in" diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index 1c48a0b06..0ae841ec6 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -13,7 +13,8 @@ PKG_DESCR:= GRUB bootloader PKG_SECTION:= sys PKG_SITES:= http://openadk.org/distfiles/ -PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d x86_qemu x86_64_qemu +PKG_TARGET_DEPENDS:= x86 x86_64 +CFLINE_GRUB_BIN:= select BUSYBOX_FEATURE_STAT_FORMAT include ${TOPDIR}/mk/package.mk diff --git a/package/grub/Makefile b/package/grub/Makefile index d4ef5f10d..894910f16 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -13,7 +13,7 @@ PKG_URL:= http://www.gnu.org/software/grub PKG_SITES:= ftp://alpha.gnu.org/gnu/grub/ PKG_HOST_DEPENDS:= linux -PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d x86_qemu x86_64_qemu +PKG_TARGET_DEPENDS:= x86 x86_64 include $(TOPDIR)/mk/package.mk diff --git a/package/mpd/Makefile b/package/mpd/Makefile index f4ccc4be5..0468e7b62 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -6,11 +6,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.15.6 PKG_RELEASE:= 1 -PKG_BUILDDEP+= alsa-lib glib PKG_MD5SUM:= c78b8933e4902c5dc407d59925f8b10e PKG_DESCR:= A music player daemon PKG_SECTION:= net PKG_DEPENDS:= glib +PKG_BUILDDEP+= glib +ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),) +PKG_BUILDDEP+= alsa-lib +endif ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),) PKG_BUILDDEP+= libid3tag libmad endif @@ -30,7 +33,7 @@ ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),) PKG_BUILDDEP+= libaudiofile endif ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),) -PKG_BUILDDEP+= lame +PKG_BUILDDEP+= lame libvorbis endif ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),) PKG_BUILDDEP+= curl @@ -88,7 +91,7 @@ PKG_DEPENDS+= libaudiofile endif ifneq (${ADK_PACKAGE_MPD_WITH_SHOUT},) -PKG_DEPENDS+= libshout liblame +PKG_DEPENDS+= libshout liblame libvorbisenc endif ifneq (${ADK_PACKAGE_MPD_WITH_CURL},) diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index a938466e9..c0a7bff9c 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -9,8 +9,9 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 416fa6a247987305d74572d03dc6dde7 PKG_DESCR:= popular video player PKG_SECTION:= video -PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg libx11 libxv -PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib libX11 libXv libpng +PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses libogg libpng libpthread libvorbis +PKG_DEPENDS+= libx11 libxext libxv zlib +PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib libX11 libXv libpng libXext PKG_URL:= http://www.mplayerhq.hu PKG_SITES:= http://openadk.org/distfiles/ @@ -99,7 +100,6 @@ pre-configure: ${CONFIGURE_DEBUG} \ ); - post-install: ${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin ${CP} ${WRKINST}/usr/bin/mplayer ${IDIR_MPLAYER}/usr/bin diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 9e9ddf9b5..dcdef3763 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= cce05daf61a64501ef6cd8da1f727ec6 PKG_DESCR:= a terminal handling library and common terminal definitions PKG_SECTION:= libs -PKG_URL:= http://www.gnu.org/software/ncurses +PKG_URL:= http://www.gnu.org/software/ncurses/ PKG_SITES:= ${MASTER_SITE_GNU:=ncurses/} include ${TOPDIR}/mk/package.mk @@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_linux_vers=2 CONFIGURE_ARGS+= --without-cxx \ --without-cxx-binding \ @@ -38,8 +38,8 @@ CONFIGURE_ARGS+= --without-cxx \ --without-rcs-ids \ --enable-const \ --enable-echo -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto ALL_TARGET:= libs INSTALL_TARGET:= install.libs install.data diff --git a/package/pkgmaker b/package/pkgmaker index 9ed51b741..4a6ed12a0 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -139,7 +139,7 @@ for dn in */Makefile; do sp=' ' fi for x in $PKG_TARGET_DEPENDS; do - x=${x#!} + typeset -l x=${x#!} #XXX cache this with mksh R40+ found=0 while read friendlyname sym; do -- cgit v1.2.3 From 757fa3963c69a28b8d4e8ce083f79a007f386e00 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 Jan 2010 11:19:54 +0100 Subject: make them more quiet --- package/depmaker | 4 ++-- package/pkgmaker | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'package/pkgmaker') diff --git a/package/depmaker b/package/depmaker index da3923554..67dcb498d 100644 --- a/package/depmaker +++ b/package/depmaker @@ -34,5 +34,5 @@ for dn in */Makefile; do done print -r -- $x done >Depends.mk -pbar=done -print -u2 "$pbar" +#pbar=done +#print -u2 "$pbar" diff --git a/package/pkgmaker b/package/pkgmaker index 4a6ed12a0..7b50517f2 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -261,5 +261,5 @@ EOF ) 4>Config.in 5>Config.in.lib cd .. done -pbar=done -print -u2 "$pbar" +#pbar=done +#print -u2 "$pbar" -- cgit v1.2.3 From f6d24fdf0f1c294628b979aa199e06ef6462df4e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 15 Feb 2010 08:57:17 +0100 Subject: add special handling for kernel modules in pkgmaker - use Config.in.kmod for packages with kernel modules - cleanup dots in uclibc Config.in - avoid autotool in cryptsetup, breaks build on debian lenny --- .gitignore | 1 + package/cryptsetup/Makefile | 1 - package/cryptsetup/patches/patch-INSTALL | 345 +++++++++++++++++++++ package/cryptsetup/patches/patch-Makefile_in | 58 ++++ package/cryptsetup/patches/patch-aclocal_m4 | 26 ++ package/cryptsetup/patches/patch-compile | 23 ++ package/cryptsetup/patches/patch-config_guess | 339 ++++++++++++++++++++ package/cryptsetup/patches/patch-config_sub | 169 ++++++++++ package/cryptsetup/patches/patch-configure | 38 +++ package/cryptsetup/patches/patch-configure_in | 2 +- package/cryptsetup/patches/patch-lib_Makefile_in | 8 + package/cryptsetup/patches/patch-ltmain_sh | 20 ++ package/cryptsetup/patches/patch-luks_Makefile_in | 8 + package/cryptsetup/patches/patch-man_Makefile_in | 8 + package/cryptsetup/patches/patch-src_Makefile_in | 8 + package/cryptsetup/patches/patch-tests_Makefile_in | 8 + package/pkgmaker | 7 +- package/uclibc/Config.in.manual | 6 +- target/linux/config/Config.in.misc | 3 + target/linux/config/Config.in.netdevice | 1 + target/linux/config/Config.in.netfilter | 2 + 21 files changed, 1073 insertions(+), 8 deletions(-) create mode 100644 package/cryptsetup/patches/patch-INSTALL create mode 100644 package/cryptsetup/patches/patch-Makefile_in create mode 100644 package/cryptsetup/patches/patch-aclocal_m4 create mode 100644 package/cryptsetup/patches/patch-compile create mode 100644 package/cryptsetup/patches/patch-config_guess create mode 100644 package/cryptsetup/patches/patch-config_sub create mode 100644 package/cryptsetup/patches/patch-configure create mode 100644 package/cryptsetup/patches/patch-lib_Makefile_in create mode 100644 package/cryptsetup/patches/patch-ltmain_sh create mode 100644 package/cryptsetup/patches/patch-luks_Makefile_in create mode 100644 package/cryptsetup/patches/patch-man_Makefile_in create mode 100644 package/cryptsetup/patches/patch-src_Makefile_in create mode 100644 package/cryptsetup/patches/patch-tests_Makefile_in (limited to 'package/pkgmaker') diff --git a/.gitignore b/.gitignore index 3ead4eac4..3c58ed468 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ dl/ package/*/info.mk package/*/Config.in package/*/Config.in.lib +package/*/Config.in.kmod tools_build/ extra/ .menu diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index d3bd57e6f..4d8973482 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autotool CONFIGURE_ARGS+= --disable-selinux post-install: diff --git a/package/cryptsetup/patches/patch-INSTALL b/package/cryptsetup/patches/patch-INSTALL new file mode 100644 index 000000000..9fbf51b65 --- /dev/null +++ b/package/cryptsetup/patches/patch-INSTALL @@ -0,0 +1,345 @@ +--- cryptsetup-1.1.0.orig/INSTALL 2009-07-06 18:53:08.000000000 +0200 ++++ cryptsetup-1.1.0/INSTALL 2010-02-14 18:24:56.000000000 +0100 +@@ -1,13 +1,25 @@ +-Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +-Foundation, Inc. ++Installation Instructions ++************************* + +- This file is free documentation; the Free Software Foundation gives +-unlimited permission to copy, distribute and modify it. ++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, ++2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++ ++ Copying and distribution of this file, with or without modification, ++are permitted in any medium without royalty provided the copyright ++notice and this notice are preserved. This file is offered as-is, ++without warranty of any kind. + + 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. Some packages provide this ++`INSTALL' file but do not implement all of the features documented ++below. The lack of an optional feature in a given package is not ++necessarily a bug. More recommendations for GNU packages can be found ++in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for + various system-dependent variables used during compilation. It uses +@@ -20,9 +32,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 +@@ -32,30 +44,37 @@ 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: ++ 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. + + 3. Optionally, type `make check' to run any self-tests that come with +- the package. ++ the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and +- documentation. ++ documentation. When installing into a prefix owned by root, it is ++ recommended that the package be configured and built as a regular ++ user, and only the `make install' phase executed with root ++ privileges. + +- 5. You can remove the program binaries and object files from the ++ 5. Optionally, type `make installcheck' to repeat any self-tests, but ++ this time using the binaries in their final installed location. ++ This target does not install anything. Running this target as a ++ regular user, particularly if the prior `make install' required ++ root privileges, verifies that the installation completed ++ correctly. ++ ++ 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is +@@ -64,6 +83,16 @@ The simplest way to compile this package + all sorts of other programs in order to regenerate files that came + with the distribution. + ++ 7. Often, you can also type `make uninstall' to remove the installed ++ files again. In practice, not all packages have tested that ++ uninstallation works correctly, even though it is required by the ++ GNU Coding Standards. ++ ++ 8. Some packages, particularly those that use Automake, provide `make ++ distcheck', which can by used by developers to test that all other ++ targets like `make install' and `make uninstall' work correctly. ++ This target is generally not run by end users. ++ + Compilers and Options + ===================== + +@@ -75,7 +104,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. + +@@ -84,44 +113,89 @@ 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 `..'. ++source code in the directory that `configure' is in and in `..'. This ++is known as a "VPATH" build. + +- 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', where PREFIX must be an ++absolute file name. + + 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. ++you can set and what kinds of files go in them. In general, the ++default for these options is expressed in terms of `${prefix}', so that ++specifying just `--prefix' will affect all of the other directory ++specifications that were not explicitly provided. + +- If the package supports it, you can cause programs to be installed +-with an extra prefix or suffix on their names by giving `configure' the +-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. ++ The most portable way to affect installation locations is to pass the ++correct locations to `configure'; however, many packages provide one or ++both of the following shortcuts of passing variable assignments to the ++`make install' command line to change installation locations without ++having to reconfigure or recompile. ++ ++ The first method involves providing an override variable for each ++affected directory. For example, `make install ++prefix=/alternate/directory' will choose an alternate location for all ++directory configuration variables that were expressed in terms of ++`${prefix}'. Any directories that were specified during `configure', ++but not in terms of `${prefix}', must each be overridden at install ++time for the entire installation to be relocated. The approach of ++makefile variable overrides for each directory variable is required by ++the GNU Coding Standards, and ideally causes no recompilation. ++However, some platforms have known limitations with the semantics of ++shared libraries that end up requiring recompilation when using this ++method, particularly noticeable in packages that use GNU Libtool. ++ ++ The second method involves providing the `DESTDIR' variable. For ++example, `make install DESTDIR=/alternate/directory' will prepend ++`/alternate/directory' before all installation names. The approach of ++`DESTDIR' overrides is not required by the GNU Coding Standards, and ++does not work on platforms that have drive letters. On the other hand, ++it does better at avoiding recompilation issues, and works well even ++when some directory options were not specified in terms of `${prefix}' ++at `configure' time. + + Optional Features + ================= + ++ If the package supports it, you can cause programs to be installed ++with an extra prefix or suffix on their names by giving `configure' the ++option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. ++ + Some packages pay attention to `--enable-FEATURE' options to + `configure', where FEATURE indicates an optional part of the package. + They may also pay attention to `--with-PACKAGE' options, where PACKAGE +@@ -134,6 +208,45 @@ 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. + ++ Some packages offer the ability to configure how verbose the ++execution of `make' will be. For these packages, running `./configure ++--enable-silent-rules' sets the default to minimal output, which can be ++overridden with `make V=1'; while running `./configure ++--disable-silent-rules' sets the default to verbose, which can be ++overridden with `make V=0'. ++ ++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 -D_XOPEN_SOURCE=500" ++ ++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" ++ ++ On Solaris, don't put `/usr/ucb' early in your `PATH'. This ++directory contains several dysfunctional programs; working variants of ++these programs are available in `/usr/bin'. So, if you need `/usr/ucb' ++in your `PATH', put it _after_ `/usr/bin'. ++ ++ On Haiku, software installed for all users goes in `/boot/common', ++not `/usr/local'. It is recommended to use the following options: ++ ++ ./configure --prefix=/boot/common ++ + Specifying the System Type + ========================== + +@@ -149,14 +262,15 @@ type, such as `sun4', or a canonical nam + + where SYSTEM can have one of these forms: + +- OS KERNEL-OS ++ OS ++ KERNEL-OS + + See the file `config.sub' for the possible values of each field. If + `config.sub' isn't included in this package, then this package doesn't + 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 +@@ -186,9 +300,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 + ====================== + +@@ -197,7 +316,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' +@@ -224,6 +350,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/cryptsetup/patches/patch-Makefile_in b/package/cryptsetup/patches/patch-Makefile_in new file mode 100644 index 000000000..0bc8b95e4 --- /dev/null +++ b/package/cryptsetup/patches/patch-Makefile_in @@ -0,0 +1,58 @@ +--- cryptsetup-1.1.0.orig/Makefile.in 2010-01-17 11:29:23.000000000 +0100 ++++ cryptsetup-1.1.0/Makefile.in 2010-02-14 18:24:56.000000000 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -323,7 +323,7 @@ distclean-libtool: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -348,7 +348,7 @@ $(RECURSIVE_TARGETS): + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -512,7 +512,8 @@ distdir: $(DISTFILES) + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +@@ -556,17 +557,17 @@ dist dist-all: distdir + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac diff --git a/package/cryptsetup/patches/patch-aclocal_m4 b/package/cryptsetup/patches/patch-aclocal_m4 new file mode 100644 index 000000000..7fd490cda --- /dev/null +++ b/package/cryptsetup/patches/patch-aclocal_m4 @@ -0,0 +1,26 @@ +--- cryptsetup-1.1.0.orig/aclocal.m4 2010-01-17 11:29:20.000000000 +0100 ++++ cryptsetup-1.1.0/aclocal.m4 2010-02-14 18:24:56.000000000 +0100 +@@ -1,4 +1,4 @@ +-# generated automatically by aclocal 1.11 -*- Autoconf -*- ++# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +@@ -143,7 +143,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], + [am__api_version='1.11' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11], [], ++m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -159,7 +159,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl ++[AM_AUTOMAKE_VERSION([1.11.1])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/package/cryptsetup/patches/patch-compile b/package/cryptsetup/patches/patch-compile new file mode 100644 index 000000000..1ff0e3e7f --- /dev/null +++ b/package/cryptsetup/patches/patch-compile @@ -0,0 +1,23 @@ +--- cryptsetup-1.1.0.orig/compile 2009-08-24 17:04:56.000000000 +0200 ++++ cryptsetup-1.1.0/compile 2010-02-14 18:24:56.000000000 +0100 +@@ -1,7 +1,7 @@ + #! /bin/sh + # Wrapper for compilers which do not understand `-c -o'. + +-scriptversion=2009-04-28.21; # UTC ++scriptversion=2009-10-06.20; # UTC + + # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software + # Foundation, Inc. +@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15 + ret=$? + + if test -f "$cofile"; then +- mv "$cofile" "$ofile" ++ test "$cofile" = "$ofile" || mv "$cofile" "$ofile" + elif test -f "${cofile}bj"; then +- mv "${cofile}bj" "$ofile" ++ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" + fi + + rmdir "$lockdir" diff --git a/package/cryptsetup/patches/patch-config_guess b/package/cryptsetup/patches/patch-config_guess new file mode 100644 index 000000000..1848f8087 --- /dev/null +++ b/package/cryptsetup/patches/patch-config_guess @@ -0,0 +1,339 @@ +--- cryptsetup-1.1.0.orig/config.guess 2009-06-30 10:31:47.000000000 +0200 ++++ cryptsetup-1.1.0/config.guess 2010-02-14 18:24:56.000000000 +0100 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + # Free Software Foundation, Inc. + +-timestamp='2008-09-28' ++timestamp='2009-06-10' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -139,23 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then +- eval $set_cc_for_build +- cat << EOF > $dummy.c +- #include +- #ifdef __UCLIBC__ +- # ifdef __UCLIBC_CONFIG_VERSION__ +- LIBC=uclibc __UCLIBC_CONFIG_VERSION__ +- # else +- LIBC=uclibc +- # endif +- #else +- LIBC=gnu +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` +-fi +- + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -187,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -341,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; +@@ -348,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize +@@ -657,7 +656,7 @@ EOF + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -823,6 +822,9 @@ EOF + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +@@ -857,66 +859,43 @@ EOF + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-${LIBC} ++ echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-${LIBC} ++ echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-${LIBC} ++ echo frv-unknown-linux-gnu + exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- mips:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips +- #undef mipsel +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips +- #else +- CPU= +- #endif +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } +- ;; +- mips64:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips64 +- #undef mips64el ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif +@@ -927,16 +906,16 @@ EOF + s: ::g + p + }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-${LIBC} ++ echo or32-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) +- echo powerpc-unknown-linux-${LIBC} ++ echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-${LIBC} ++ echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +@@ -948,9 +927,9 @@ EOF + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu +@@ -958,34 +937,34 @@ EOF + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; +- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; +- *) echo hppa-unknown-linux-${LIBC} ;; ++ PA7*) echo hppa1.1-unknown-linux-gnu ;; ++ PA8*) echo hppa2.0-unknown-linux-gnu ;; ++ *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-${LIBC} ++ echo hppa64-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) +- echo ${UNAME_MACHINE}-dec-linux-${LIBC} ++ echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-${LIBC} ++ echo x86_64-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so +@@ -1000,19 +979,9 @@ EOF + p'` + case "$ld_supported_targets" in + elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" ++ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" +- exit ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" +- exit ;; + esac +- # This should get integrated into the C code below, but now we hack +- if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -1077,7 +1046,7 @@ EOF + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) +@@ -1121,8 +1090,11 @@ EOF + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 +@@ -1160,6 +1132,16 @@ EOF + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; +@@ -1172,7 +1154,7 @@ EOF + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) +@@ -1346,6 +1328,9 @@ EOF + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/package/cryptsetup/patches/patch-config_sub b/package/cryptsetup/patches/patch-config_sub new file mode 100644 index 000000000..d159ebbfd --- /dev/null +++ b/package/cryptsetup/patches/patch-config_sub @@ -0,0 +1,169 @@ +--- cryptsetup-1.1.0.orig/config.sub 2009-06-30 10:31:47.000000000 +0200 ++++ cryptsetup-1.1.0/config.sub 2010-02-14 18:24:56.000000000 +0100 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + # Free Software Foundation, Inc. + +-timestamp='2008-09-08' ++timestamp='2009-06-11' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^- + case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` +@@ -152,6 +153,9 @@ case $os in + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -244,11 +248,12 @@ case $basic_machine in + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ +- | d10v | d30v | dlx | dsp16xx | dvp \ ++ | d10v | d30v | dlx | dsp16xx \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ +@@ -270,6 +275,7 @@ case $basic_machine in + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ + | nios | nios2 \ +@@ -279,7 +285,7 @@ case $basic_machine in + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | score \ +- | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +@@ -331,6 +337,7 @@ case $basic_machine in + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ +@@ -362,7 +369,7 @@ case $basic_machine in + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +@@ -443,6 +450,10 @@ case $basic_machine in + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -459,6 +470,10 @@ case $basic_machine in + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; + c90) + basic_machine=c90-cray + os=-unicos +@@ -726,24 +741,6 @@ case $basic_machine in + basic_machine=m68k-atari + os=-mint + ;; +- mipsEE* | ee | ps2) +- basic_machine=mips64r5900el-scei +- case $os in +- -linux*) +- ;; +- *) +- os=-elf +- ;; +- esac +- ;; +- iop) +- basic_machine=mipsel-scei +- os=-irx +- ;; +- dvp) +- basic_machine=dvp-scei +- os=-elf +- ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; +@@ -1200,7 +1197,7 @@ case $basic_machine in + we32k) + basic_machine=we32k-att + ;; +- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) +@@ -1270,10 +1267,11 @@ case $os in + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +@@ -1292,7 +1290,7 @@ case $os in + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1622,7 +1620,7 @@ case $basic_machine in + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) diff --git a/package/cryptsetup/patches/patch-configure b/package/cryptsetup/patches/patch-configure new file mode 100644 index 000000000..dca09cae2 --- /dev/null +++ b/package/cryptsetup/patches/patch-configure @@ -0,0 +1,38 @@ +--- cryptsetup-1.1.0.orig/configure 2010-01-17 11:29:24.000000000 +0100 ++++ cryptsetup-1.1.0/configure 2010-02-14 18:24:56.000000000 +0100 +@@ -14619,7 +14619,7 @@ _ACEOF + + fi + +- if test x$enable_static = xyes; then ++ if test x$enable_static_cryptsetup = xyes; then + SELINUX_STATIC_LIBS=$LIBS + # Check if we need -pthread with --enable-static and selinux + saved_LIBS2=$LIBS +@@ -14684,7 +14684,7 @@ fi + fi + fi + +-if test x$enable_static = xyes; then ++if test x$enable_static_cryptsetup = xyes; then + saved_LIBS2=$LIBS + LIBS="$LIBS -static" + # Check if it there is still not some missing dependency like static selinux libs +@@ -14916,7 +14916,7 @@ fi + + + +- if test x$enable_static = xyes; then ++ if test x$enable_static_cryptsetup = xyes; then + STATIC_CRYPTSETUP_TRUE= + STATIC_CRYPTSETUP_FALSE='#' + else +@@ -14924,7 +14924,7 @@ else + STATIC_CRYPTSETUP_FALSE= + fi + +- if test x$enable_static = xno; then ++ if test x$enable_static_cryptsetup = xno; then + DYNAMIC_CRYPTSETUP_TRUE= + DYNAMIC_CRYPTSETUP_FALSE='#' + else diff --git a/package/cryptsetup/patches/patch-configure_in b/package/cryptsetup/patches/patch-configure_in index 2b4c32ad9..7d1692b35 100644 --- a/package/cryptsetup/patches/patch-configure_in +++ b/package/cryptsetup/patches/patch-configure_in @@ -1,5 +1,5 @@ --- cryptsetup-1.1.0.orig/configure.in 2010-01-17 11:26:31.000000000 +0100 -+++ cryptsetup-1.1.0/configure.in 2010-02-05 17:05:34.911823330 +0100 ++++ cryptsetup-1.1.0/configure.in 2010-02-14 18:24:56.000000000 +0100 @@ -80,7 +80,7 @@ LIBS=$saved_LIBS if test "x$enable_selinux" != xno; then AC_CHECK_LIB(sepol, sepol_bool_set) diff --git a/package/cryptsetup/patches/patch-lib_Makefile_in b/package/cryptsetup/patches/patch-lib_Makefile_in new file mode 100644 index 000000000..f03d83839 --- /dev/null +++ b/package/cryptsetup/patches/patch-lib_Makefile_in @@ -0,0 +1,8 @@ +--- cryptsetup-1.1.0.orig/lib/Makefile.in 2010-01-17 11:29:22.000000000 +0100 ++++ cryptsetup-1.1.0/lib/Makefile.in 2010-02-14 18:24:56.000000000 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/package/cryptsetup/patches/patch-ltmain_sh b/package/cryptsetup/patches/patch-ltmain_sh new file mode 100644 index 000000000..9308e958e --- /dev/null +++ b/package/cryptsetup/patches/patch-ltmain_sh @@ -0,0 +1,20 @@ +--- cryptsetup-1.1.0.orig/ltmain.sh 2010-01-17 11:29:15.000000000 +0100 ++++ cryptsetup-1.1.0/ltmain.sh 2010-02-14 18:24:56.000000000 +0100 +@@ -65,7 +65,7 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2 ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 + # automake: $automake_version + # autoconf: $autoconf_version + # +@@ -73,7 +73,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="2.2.6b Debian-2.2.6b-2" ++VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" + TIMESTAMP="" + package_revision=1.3017 + diff --git a/package/cryptsetup/patches/patch-luks_Makefile_in b/package/cryptsetup/patches/patch-luks_Makefile_in new file mode 100644 index 000000000..25c34308a --- /dev/null +++ b/package/cryptsetup/patches/patch-luks_Makefile_in @@ -0,0 +1,8 @@ +--- cryptsetup-1.1.0.orig/luks/Makefile.in 2010-01-17 11:29:22.000000000 +0100 ++++ cryptsetup-1.1.0/luks/Makefile.in 2010-02-14 18:24:56.000000000 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/package/cryptsetup/patches/patch-man_Makefile_in b/package/cryptsetup/patches/patch-man_Makefile_in new file mode 100644 index 000000000..349ff6ff4 --- /dev/null +++ b/package/cryptsetup/patches/patch-man_Makefile_in @@ -0,0 +1,8 @@ +--- cryptsetup-1.1.0.orig/man/Makefile.in 2010-01-17 11:29:23.000000000 +0100 ++++ cryptsetup-1.1.0/man/Makefile.in 2010-02-14 18:24:56.000000000 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/package/cryptsetup/patches/patch-src_Makefile_in b/package/cryptsetup/patches/patch-src_Makefile_in new file mode 100644 index 000000000..73d783646 --- /dev/null +++ b/package/cryptsetup/patches/patch-src_Makefile_in @@ -0,0 +1,8 @@ +--- cryptsetup-1.1.0.orig/src/Makefile.in 2010-01-17 11:29:23.000000000 +0100 ++++ cryptsetup-1.1.0/src/Makefile.in 2010-02-14 18:24:56.000000000 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/package/cryptsetup/patches/patch-tests_Makefile_in b/package/cryptsetup/patches/patch-tests_Makefile_in new file mode 100644 index 000000000..3e465077e --- /dev/null +++ b/package/cryptsetup/patches/patch-tests_Makefile_in @@ -0,0 +1,8 @@ +--- cryptsetup-1.1.0.orig/tests/Makefile.in 2010-01-17 11:29:23.000000000 +0100 ++++ cryptsetup-1.1.0/tests/Makefile.in 2010-02-14 18:24:56.000000000 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/package/pkgmaker b/package/pkgmaker index 7b50517f2..ccd619ac5 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -172,6 +172,9 @@ for dn in */Makefile; do if [[ $spcu = LIB* ]]; then h=5 # divert to Config.in.lib (( g5++ )) && print -u5 # been here before + elif [[ $spcu = KMOD* ]]; then + h=6 + (( g6++ )) && print -u6 else h=4 # divert to Config.in print -u4 @@ -258,8 +261,6 @@ EOF print "\t flavour ADK_PACKAGE_${dnu}_$pfcu for $PKG_NAME" done >&4 - ) 4>Config.in 5>Config.in.lib + ) 4>Config.in 5>Config.in.lib 6>Config.in.kmod cd .. done -#pbar=done -#print -u2 "$pbar" diff --git a/package/uclibc/Config.in.manual b/package/uclibc/Config.in.manual index 4100fd313..bfc1b08c5 100644 --- a/package/uclibc/Config.in.manual +++ b/package/uclibc/Config.in.manual @@ -1,5 +1,5 @@ config ADK_PACKAGE_UCLIBC - prompt "uClibc............................... embedded C library" + prompt "uClibc............................ embedded C library" bool default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY default n @@ -8,10 +8,10 @@ config ADK_PACKAGE_UCLIBC Embedded C library. config ADK_PACKAGE_UCLIBC_DEV - prompt "uClibc-dev........................... development files" + prompt "uClibc-dev........................ development files" tristate default n - depends on ADK_TARGET_LIB_UCLIBC + depends on ADK_TARGET_LIB_UCLIBC && ADK_PACKAGE_UCLIBC help C library header files. diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 7ed83c79e..9142b0718 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -82,4 +82,7 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6 default n help + +source package/exmap/Config.in.kmod + endmenu diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index e0dd123fe..3cbdf48e3 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -265,6 +265,7 @@ endmenu menu "ATM driver support" source package/sangam-atm/Config.in +source package/sangam-atm/Config.in.kmod source package/sangam-atm/Config.in.fw endmenu diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index 8b818a695..3cf61ed58 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -678,4 +678,6 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_NFLOG endmenu +source package/ipset/Config.in.kmod + endmenu -- cgit v1.2.3 From 0900eb6353809dd6cdc76bf1287f8df66e13577e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Mar 2010 19:45:28 +0100 Subject: generate Config.in even if Config.in.manual exist for base-files --- package/pkgmaker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pkgmaker') diff --git a/package/pkgmaker b/package/pkgmaker index ccd619ac5..ea89424e7 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -43,7 +43,7 @@ done for dn in */Makefile; do dn=${dn%/*} # skip if we take care of this one manually - [[ -s $dn/Config.in.manual ]] && continue + [[ $dn != "base-files" ]] && [[ -s $dn/Config.in.manual ]] && continue pbar="Pass 2: $dn ..." print -nu2 "$pbar\r" cd $dn -- cgit v1.2.3