diff options
Diffstat (limited to 'package')
27 files changed, 45 insertions, 432 deletions
diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 52a96c7e2..488041e22 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -8,7 +8,7 @@ menu "Shells" config BUSYBOX_ASH bool "ash" - default y + default n depends on !BUSYBOX_NOMMU help Tha 'ash' shell adds about 60k in the default configuration and is diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index b3e1794b0..9ffae6c92 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cyrus-sasl PKG_VERSION:= 2.1.26 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= a7f4e5e559a0e37b3ffc438c9456e425 PKG_DESCR:= a general purpose authentication library PKG_SECTION:= libs @@ -21,10 +21,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --enable-staticdlopen \ - --enable-plain \ - --enable-anon \ +CONFIGURE_ARGS+= --enable-plain \ --enable-login \ + --disable-anon \ --disable-cram \ --disable-digest \ --disable-scram \ diff --git a/package/cyrus-sasl/patches/patch-config_ltconfig b/package/cyrus-sasl/patches/patch-config_ltconfig index 7112c26e1..1a04b28e0 100644 --- a/package/cyrus-sasl/patches/patch-config_ltconfig +++ b/package/cyrus-sasl/patches/patch-config_ltconfig @@ -1,5 +1,14 @@ ---- cyrus-sasl-2.1.23.orig/config/ltconfig 2003-06-12 02:32:43.000000000 +0200 -+++ cyrus-sasl-2.1.23/config/ltconfig 2011-08-08 10:54:43.509265006 +0200 +--- cyrus-sasl-2.1.26.orig/config/ltconfig 2012-10-12 16:05:48.000000000 +0200 ++++ cyrus-sasl-2.1.26/config/ltconfig 2014-03-07 07:46:01.000000000 +0100 +@@ -2024,7 +2024,7 @@ linux-gnuoldld* | linux-gnuaout* | linux + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + version_type=linux + need_lib_prefix=no + need_version=no @@ -2034,16 +2034,7 @@ linux-gnu*) shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no diff --git a/package/epdfview/Makefile b/package/epdfview/Makefile deleted file mode 100644 index f8349b328..000000000 --- a/package/epdfview/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= epdfview -PKG_VERSION:= 0.1.8 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 0c57d5e33adbfba047ffa13e570f79d6 -PKG_DESCR:= lightweight pdf viewer -PKG_SECTION:= x11/apps -PKG_DEPENDS:= poppler libgtk -PKG_BUILDDEP:= poppler gtk+ -PKG_URL:= http://trac.emma-soft.com/epdfview/wiki -PKG_SITES:= http://openadk.org/distfiles - -PKG_CFLINE_EPDFVIEW:= depends on ADK_BROKEN - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,EPDFVIEW,epdfview,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -epdfview-install: - $(INSTALL_DIR) $(IDIR_EPDFVIEW)/usr/share/epdfview - $(CP) $(WRKINST)/usr/share/epdfview/* \ - $(IDIR_EPDFVIEW)/usr/share/epdfview - $(INSTALL_DIR) $(IDIR_EPDFVIEW)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/epdfview \ - $(IDIR_EPDFVIEW)/usr/bin - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile index e4ca57b8a..e5bb3f2bb 100644 --- a/package/gdbm/Makefile +++ b/package/gdbm/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gdbm PKG_VERSION:= 1.8.3 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 1d1b1d5c0245b1c00aff92da751e9aa1 PKG_DESCR:= disk file format database PKG_SECTION:= libs diff --git a/package/gdbm/patches/patch-configure b/package/gdbm/patches/patch-configure new file mode 100644 index 000000000..f8b196ec5 --- /dev/null +++ b/package/gdbm/patches/patch-configure @@ -0,0 +1,11 @@ +--- gdbm-1.8.3.orig/configure 2002-10-15 23:53:26.000000000 +0200 ++++ gdbm-1.8.3/configure 2014-03-07 10:48:33.000000000 +0100 +@@ -5532,7 +5532,7 @@ linux-gnuoldld* | linux-gnuaout* | linux + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + version_type=linux + need_lib_prefix=no + need_version=no diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 4c0798c26..efa23e869 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 PKG_DESCR:= A Java Virtual Machine (JVM) implementation PKG_SECTION:= lang @@ -28,12 +28,6 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual CONFIGURE_ARGS+= --enable-ffi -ifeq ($(ARCH),mips) -CONFIGURE_ARGS+= --disable-tls -endif -ifeq ($(ARCH),arm) -CONFIGURE_ARGS+= --disable-tls -endif hostpost-install: ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/bin/java diff --git a/package/jikes/Makefile b/package/jikes/Makefile index 7404fc123..be7e6a749 100644 --- a/package/jikes/Makefile +++ b/package/jikes/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.22 PKG_RELEASE:= 1 PKG_MD5SUM:= cda958c7fef6b43b803e1d1ef9afcb85 PKG_DESCR:= jikes java compiler +PKG_BUILDDEP:= jikes-host PKG_SECTION:= lang PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} @@ -17,6 +18,7 @@ include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) HOST_STYLE:= auto @@ -26,6 +28,7 @@ hostpost-install: $(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac $(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac +jikes-install: include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 20f7f60f9..7743898fd 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -24,7 +24,7 @@ ifeq ($(ADK_LINUX_SH),y) ifeq ($(ADK_TARGET_LIB_GLIBC),y) ${CP} ${STAGING_TARGET_DIR}/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) else - ${CP} ${STAGING_TARGET_DIR}/lib/!m4/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) + ${CP} ${STAGING_TARGET_DIR}/lib/m4-nofpu/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif else ${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) diff --git a/package/miax/Makefile b/package/miax/Makefile deleted file mode 100644 index 675c1f6b7..000000000 --- a/package/miax/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= miax -PKG_VERSION:= 1.4 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 44f0d2ef46ee2697d890b7b96846adc7 -PKG_DESCR:= A console iax (asterisk) client -PKG_SECTION:= misc -PKG_DEPENDS:= libpthread -PKG_URL:= http://sourceforge.net/projects/miax -PKG_SITES:= http://mesh.dl.sourceforge.net/sourceforge/miax/ -PKG_CFLINE_MIAX:= depends on ADK_BROKEN - -DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME} - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,MIAX,miax,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= manual -INSTALL_STYLE:= manual - -MAKE_FLAGS+= CC="${TARGET_CC}" \ - OFLAGS="${TARGET_CFLAGS}" \ - CPPFLAGS="${TARGET_CPPFLAGS}" \ - LDFLAGS="${TARGET_LDFLAGS}" - -do-install: - ${INSTALL_DIR} ${IDIR_MIAX}/usr/bin - ${INSTALL_BIN} ${WRKBUILD}/miax ${IDIR_MIAX}/usr/bin/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/miax/patches/01-cross.patch b/package/miax/patches/01-cross.patch deleted file mode 100644 index 04ec04d78..000000000 --- a/package/miax/patches/01-cross.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN miax-1.4-old/Makefile miax-1.4-new/Makefile ---- miax.orig/Makefile 2005-04-27 18:56:13.000000000 +0200 -+++ miax/Makefile 2013-12-22 09:48:41.000000000 +0100 -@@ -1,4 +1,5 @@ --CFLAGS= -Iiax/ -Igsm/inc -DIAXC_IAX2 -DLIBIAX -g -DPOSIXSLEEP -DLINUX -O2 -+OFLAGS= -02 -g -+CFLAGS= -Iiax/ -Igsm/inc $(CPPFLAGS) -DIAXC_IAX2 -DLIBIAX -DPOSIXSLEEP -DLINUX $(OFLAGS) - SYSLIBS=-lpthread -lm -lbluetooth - - -@@ -32,11 +33,10 @@ OBJS=\ - miax.o - - all: $(OBJS) -- gcc $(OBJS) $(CFLAGS) $(SYSLIBS) -o miax -- cp miax /bin/miax -+ $(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) $(SYSLIBS) -o miax - - static: $(OBJS) bluetooth.o -- gcc $(OBJS) $(CFLAGS) $(SYSLIBS) -static -o miax -+ $(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) $(SYSLIBS) -static -o miax - - clean: - rm -f $(OBJS) miax diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 1c18044f3..c40d9d807 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -4,16 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mksh -PKG_VERSION:= 48b +PKG_VERSION:= 49 PKG_RELEASE:= 1 -PKG_MD5SUM:= ab9baa6b5a4de9d0e6a3ce9957c18da0 +PKG_MD5SUM:= e8c205cac72c3dc8540bbc3897421422 PKG_DESCR:= MirBSD Korn Shell PKG_SECTION:= shells PKG_URL:= http://www.mirbsd.org/ PKG_SITES:= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} -PKG_FLAVOURS_MKSH:= FULL -PKGFD_FULL:= Include all features +PKG_DFLT_MKSH:= y if !ADK_TOOLCHAIN_ONLY DISTFILES= ${PKG_NAME}-R${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/${PKG_NAME} @@ -22,10 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),) TARGET_CPPFLAGS+= -DMKSH_SMALL=1 -endif - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/mtd/Makefile b/package/mtd/Makefile index d3db1d12f..3ec068036 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mtd PKG_VERSION:= 1.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_DESCR:= MTD utility PKG_SECTION:= fs diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c index bd5b50dab..bf1c343cb 100644 --- a/package/mtd/src/mtd.c +++ b/package/mtd/src/mtd.c @@ -37,7 +37,6 @@ #include <stdint.h> #include <fcntl.h> #include <errno.h> -#include <error.h> #include <err.h> #include <time.h> #include <string.h> diff --git a/package/p5-XML-Parser/Makefile b/package/p5-XML-Parser/Makefile index 13406fb9e..7c7745181 100644 --- a/package/p5-XML-Parser/Makefile +++ b/package/p5-XML-Parser/Makefile @@ -5,14 +5,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= p5-XML-Parser PKG_VERSION:= 2.40 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c66e9adba003d0667cc40115ccd837a5 PKG_DESCR:= XML::Parser PKG_SECTION:= lang -PKG_DEPENDS:= libexpat -PKG_BUILDDEP:= expat +PKG_DEPENDS:= perl libexpat +PKG_BUILDDEP:= perl-host expat PKG_SITES:= http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/ +PKG_CFLINE_P5_XML_PARSER:= depends on ADK_BROKEN + DISTFILES:= XML-Parser-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/XML-Parser-${PKG_VERSION} @@ -26,7 +28,10 @@ XAKE_FLAGS+= CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS)" include $(TOPDIR)/mk/perl.mk pre-build: - (cd ${WRKSRC} && perl Makefile.PL EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib EXPATINCPATH=${STAGING_TARGET_DIR}/usr/include) + (cd ${WRKSRC} && PATH='${HOST_PATH}' \ + perl-host Makefile.PL \ + EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib \ + EXPATINCPATH=${STAGING_TARGET_DIR}/usr/include) p5-xml-parser-install: $(INSTALL_DIR) $(IDIR_P5_XML_PARSER)$(PERL_SITEDIR) diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile deleted file mode 100644 index ff15a601b..000000000 --- a/package/proftpd/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= proftpd -PKG_VERSION:= 1.3.4d -PKG_RELEASE:= 1 -PKG_MD5SUM:= 13c6fd7ce320886adc371c81a3e23f07 -PKG_DESCR:= A very configurable FTP server -PKG_SECTION:= www -PKG_URL:= http://www.proftpd.org/ -PKG_SITES:= ftp://ftp.proftpd.org/distrib/source/ -PKG_NOPARALLEL:= 1 - -PKG_LIBC_DEPENDS:= glibc -PKG_CFLINE_PROFTPD:= depends on ADK_BROKEN - -PKG_FLAVOURS_PROFTPD:= WITH_FTPUSERS -PKGFD_WITH_FTPUSERS:= install /etc/ftpusers along with proftpd - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,PROFTPD,proftpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ARGS+= --disable-cap -CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes \ - ac_cv_func_setgrent_void=yes -TARGET_LDFLAGS+= -ltinfo - -proftpd-install: - $(INSTALL_DIR) $(IDIR_PROFTPD)/etc - $(INSTALL_DATA) ./files/proftpd.conf $(IDIR_PROFTPD)/etc/ - $(INSTALL_DIR) $(IDIR_PROFTPD)/usr/{s,}bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/ftp{count,dctl,top,who} \ - $(IDIR_PROFTPD)/usr/bin/ - $(INSTALL_BIN) $(WRKINST)/usr/sbin/{ftpshut,proftpd} \ - $(IDIR_PROFTPD)/usr/sbin/ -ifeq (${ADK_PACKAGE_PROFTPD_WITH_FTPUSERS},y) - ${INSTALL_DATA} ./files/ftpusers ${IDIR_PROFTPD}/etc/ -endif - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/proftpd/files/ftpusers b/package/proftpd/files/ftpusers deleted file mode 100644 index 4bc8872dc..000000000 --- a/package/proftpd/files/ftpusers +++ /dev/null @@ -1,37 +0,0 @@ -# Provided by ftpbase (dont remove this line!) -# /etc/ftpusers: list of users disallowed FTP access -# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/files/ftpusers,v 1.1 2005/06/28 14:52:26 uberlord Exp $ - -halt -operator -root -shutdown -sync -bin -daemon -adm -lp -mail -postmaster -news -uucp -man -games -at -cron -www -named -squid -gdm -mysql -postgres -guest -nobody -alias -qmaild -qmaill -qmailp -qmailq -qmailr -qmails -postfix diff --git a/package/proftpd/files/proftpd.conf b/package/proftpd/files/proftpd.conf deleted file mode 100644 index 8d4f7f2fa..000000000 --- a/package/proftpd/files/proftpd.conf +++ /dev/null @@ -1,60 +0,0 @@ -ServerName "ProFTPD Default Installation" -ServerType standalone -DefaultServer on - -# Port 21 is the standard FTP port. -Port 21 - -# Don't use IPv6 support by default. -UseIPv6 off - -# Umask 022 is a good standard umask to prevent new dirs and files -# from being group and world writable. -Umask 022 - -# To prevent DoS attacks, set the maximum number of child processes -# to 30. If you need to allow more than 30 concurrent connections -# at once, simply increase this value. Note that this ONLY works -# in standalone mode, in inetd mode you should use an inetd server -# that allows you to limit maximum number of processes per service -# (such as xinetd). -MaxInstances 30 - -# Set the user and group under which the server will run. -User nobody -Group nogroup - -# To cause every FTP user to be "jailed" (chrooted) into their home -# directory, uncomment this line. -#DefaultRoot ~ - -# Normally, we want files to be overwriteable. -AllowOverwrite on - -# Bar use of SITE CHMOD by default -<Limit SITE_CHMOD> - DenyAll -</Limit> - -# A basic anonymous configuration, no upload directories. If you do not -# want anonymous users, simply delete this entire <Anonymous> section. -<Anonymous ~ftp> - User ftp - Group ftp - - # We want clients to be able to login with "anonymous" as well as "ftp" - UserAlias anonymous ftp - - # Limit the maximum number of anonymous logins - MaxClients 10 - - # We want 'welcome.msg' displayed at login, and '.message' displayed - # in each newly chdired directory. - DisplayLogin welcome.msg - DisplayChdir .message - - # Limit WRITE everywhere in the anonymous chroot - <Limit WRITE> - DenyAll - </Limit> -</Anonymous> diff --git a/package/proftpd/files/proftpd.conffiles b/package/proftpd/files/proftpd.conffiles deleted file mode 100644 index 3ff0fb2e3..000000000 --- a/package/proftpd/files/proftpd.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/proftpd.conf -/etc/ftpusers diff --git a/package/proftpd/files/proftpd.init b/package/proftpd/files/proftpd.init deleted file mode 100644 index 8e605652d..000000000 --- a/package/proftpd/files/proftpd.init +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -#PKG proftpd -#INIT 60 -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${proftpd:-NO}" = x"NO" && exit 0 - exec sh $0 start - ;; -start) - [ -f /etc/proftpd.conf ] || exit - /usr/sbin/proftpd - ;; -stop) - kill $(pgrep -f /usr/sbin/proftpd) - ;; -restart) - sh $0 stop - sleep 1 - sh $0 start - ;; -*) - echo "Usage: $0 {start | stop | restart}" - exit 1 - ;; -esac -exit $? diff --git a/package/proftpd/files/proftpd.postinst b/package/proftpd/files/proftpd.postinst deleted file mode 100644 index 0b3fa08aa..000000000 --- a/package/proftpd/files/proftpd.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf proftpd proftpd NO diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in deleted file mode 100644 index e305b0c38..000000000 --- a/package/proftpd/patches/patch-Make_rules_in +++ /dev/null @@ -1,16 +0,0 @@ - do not try to set user or group id when installing ---- proftpd-1.3.3.orig/Make.rules.in 2009-11-18 22:48:25.000000000 +0100 -+++ proftpd-1.3.3/Make.rules.in 2010-05-30 12:47:38.265625000 +0200 -@@ -28,9 +28,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@ - INSTALL=@INSTALL@ - INSTALL_USER=@install_user@ - INSTALL_GROUP=@install_group@ --INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 --INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 --INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 -+INSTALL_BIN=$(INSTALL) -m 0755 -+INSTALL_SBIN=$(INSTALL) -m 0755 -+INSTALL_MAN=$(INSTALL) -m 0644 - - RM=rm -f - SHELL=@CONFIG_SHELL@ diff --git a/package/proftpd/patches/patch-Makefile_in b/package/proftpd/patches/patch-Makefile_in deleted file mode 100644 index 0f1bdd799..000000000 --- a/package/proftpd/patches/patch-Makefile_in +++ /dev/null @@ -1,33 +0,0 @@ - hiding it won't help, we install as non-root so no chown possible ---- proftpd-1.3.3.orig/Makefile.in 2009-12-16 00:24:42.000000000 +0100 -+++ proftpd-1.3.3/Makefile.in 2010-05-30 12:47:41.187500000 +0200 -@@ -79,7 +79,6 @@ check: proftpd$(EXEEXT) - $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: - @if [ ! -d $@ ]; then \ - mkdir -p $@; \ -- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ - chmod 0755 $@; \ - fi - -@@ -89,7 +88,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc - rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ - fi - ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd -- -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd - - install-libs: $(DESTDIR)$(libdir)/proftpd - cd lib/ && $(MAKE) install -@@ -125,11 +123,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE - $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut - $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop - $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs -+ $(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs - - install-conf: $(DESTDIR)$(sysconfdir) - if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \ -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \ -+ $(INSTALL) -m 0644 \ - $(top_srcdir)/sample-configurations/basic.conf \ - $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ - fi diff --git a/package/proftpd/patches/patch-locale_Makefile_in b/package/proftpd/patches/patch-locale_Makefile_in deleted file mode 100644 index 91f274ebd..000000000 --- a/package/proftpd/patches/patch-locale_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ - drop anything that has to do with owner/group changing *grrr* ---- proftpd-1.3.2b.orig/locale/Makefile.in 2009-04-29 00:50:22.000000000 +0200 -+++ proftpd-1.3.2b/locale/Makefile.in 2010-01-20 18:03:53.909480484 +0100 -@@ -51,7 +51,6 @@ install: $(LANGS) - if [ -f $$lang.mo ]; then \ - if [ ! -d $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES ]; then \ - mkdir -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ -- chown $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ - chmod 0755 $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ - fi; \ - $(INSTALL_MAN) $$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ diff --git a/package/proftpd/patches/patch-modules_mod_auth_unix_c b/package/proftpd/patches/patch-modules_mod_auth_unix_c deleted file mode 100644 index a439d6b5a..000000000 --- a/package/proftpd/patches/patch-modules_mod_auth_unix_c +++ /dev/null @@ -1,29 +0,0 @@ ---- proftpd-1.3.3.orig/modules/mod_auth_unix.c 2009-10-14 20:49:31.000000000 +0200 -+++ proftpd-1.3.3/modules/mod_auth_unix.c 2010-05-30 13:02:15.515625000 +0200 -@@ -77,6 +77,7 @@ - # endif - #endif /* PR_USE_SIA */ - -+/* - #ifdef CYGWIN - typedef void *HANDLE; - typedef unsigned long DWORD; -@@ -85,7 +86,8 @@ typedef unsigned long DWORD; - DWORD WINAPI GetVersion(void); - extern HANDLE cygwin_logon_user (const struct passwd *, const char *); - extern void cygwin_set_impersonation_token (const HANDLE); --#endif /* CYGWIN */ -+#endif -+*/ - - #ifdef SETGRENT_VOID - # define RETSETGRENTTYPE void -@@ -738,7 +740,7 @@ MODRET pw_check(cmd_rec *cmd) { - - #else /* !PR_USE_SIA */ - --# ifdef CYGWIN -+# if 0 - /* We have to do special Windows NT voodoo with Cygwin in order to be - * able to switch UID/GID. More info at - * http://cygwin.com/cygwin-ug-net/ntsec.html#NTSEC-SETUID diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile deleted file mode 100644 index c10b1ee5e..000000000 --- a/package/ussp-push/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= ussp-push -PKG_VERSION:= 0.11 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 5c44983ee27809867041feff6bb4423a -PKG_DESCR:= OBEX push command -PKG_SECTION:= misc -PKG_DEPENDS:= openobex -PKG_BUILDDEP:= openobex -PKG_SITES:= http://xmailserver.org/ -PKG_CFLINE_USSP_PUSH:= depends on ADK_BROKEN - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -MAKE_FLAGS+= OBEXINC="${TARGET_CPPFLAGS}" \ - OBEXLIB="${TARGET_LDFLAGS} -lopenobex -lbluetooth" - -ussp-push-install: - ${INSTALL_DIR} ${IDIR_USSP_PUSH}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/ussp-push ${IDIR_USSP_PUSH}/usr/bin/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ussp-push/patches/patch-src_obex_socket_c b/package/ussp-push/patches/patch-src_obex_socket_c deleted file mode 100644 index 770775175..000000000 --- a/package/ussp-push/patches/patch-src_obex_socket_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ussp-push-0.11.orig/src/obex_socket.c 2008-08-24 22:48:53.000000000 +0200 -+++ ussp-push-0.11/src/obex_socket.c 2008-10-16 11:08:10.000000000 +0200 -@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c - for (i = 0; i < niinf; i++) { - char devname[128]; - -- if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, -+ if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, - devname, 100000) >= 0) { - if (strcasecmp(devname, btname) == 0) { - *btaddr = piinf[i].bdaddr; -@@ -297,7 +297,7 @@ static int cobex_init(struct cobex_conte - gt->wfd = gt->rfd; - - tcgetattr(gt->rfd, >->oldtio); -- bzero(>->newtio, sizeof(struct termios)); -+ memset(>->newtio, 0, sizeof(struct termios)); - gt->newtio.c_cflag = B115200 | CS8 | CREAD; - gt->newtio.c_iflag = IGNPAR; - gt->newtio.c_oflag = 0; |