diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/autofs/autofs-4.1.4/no-bash.patch | 18 | ||||
| -rw-r--r-- | packages/autofs/autofs_4.1.4.bb | 10 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 5 | ||||
| -rw-r--r-- | packages/portmap/portmap-6.0/no-pie.patch | 14 | ||||
| -rw-r--r-- | packages/portmap/portmap_6.0.bb | 5 | ||||
| -rw-r--r-- | packages/slugos-init/files/turnup | 3 | ||||
| -rw-r--r-- | packages/slugos-init/slugos-init_0.10.bb | 2 |
7 files changed, 51 insertions, 6 deletions
diff --git a/packages/autofs/autofs-4.1.4/no-bash.patch b/packages/autofs/autofs-4.1.4/no-bash.patch new file mode 100644 index 0000000000..16e83a0371 --- /dev/null +++ b/packages/autofs/autofs-4.1.4/no-bash.patch @@ -0,0 +1,18 @@ +diff -Naur autofs-4.1.4/samples.orig/auto.net autofs-4.1.4/samples/auto.net +--- autofs-4.1.4/samples.orig/auto.net 2007-11-21 11:29:57.000000000 -0600 ++++ autofs-4.1.4/samples/auto.net 2007-11-21 11:30:27.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # $Id: auto.net,v 1.8 2005/04/05 13:02:09 raven Exp $ + +diff -Naur autofs-4.1.4/samples.orig/auto.smb autofs-4.1.4/samples/auto.smb +--- autofs-4.1.4/samples.orig/auto.smb 2007-11-21 11:29:57.000000000 -0600 ++++ autofs-4.1.4/samples/auto.smb 2007-11-21 11:30:34.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # $Id: auto.smb,v 1.3 2005/04/05 13:02:09 raven Exp $ + diff --git a/packages/autofs/autofs_4.1.4.bb b/packages/autofs/autofs_4.1.4.bb index ab2bacedb7..d9863ad9dd 100644 --- a/packages/autofs/autofs_4.1.4.bb +++ b/packages/autofs/autofs_4.1.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Kernel based automounter for linux." SECTION = "base" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \ @@ -12,9 +12,13 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 file://Makefile.rules-cross.patch;patch=1 \ file://install.patch;patch=1 \ file://auto.net-sort-option-fix.patch;patch=1 \ - file://autofs-additional-distros.patch;patch=1" + file://autofs-additional-distros.patch;patch=1 \ + file://no-bash.patch;patch=1" -inherit autotools +inherit autotools update-rc.d + +INITSCRIPT_NAME = "autofs" +INITSCRIPT_PARAMS = "defaults" EXTRA_OEMAKE="TARGET_PREFIX=${TARGET_PREFIX}" PARALLEL_MAKE = "" diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index abd9768a21..4badaa1b90 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r40" +PR = "r41" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -149,6 +149,7 @@ SLUGOS_PACKAGES = "\ net-tools \ netcat \ netpbm \ + nfs-utils \ nmap \ ntfs-3g \ ntp \ @@ -166,6 +167,7 @@ SLUGOS_PACKAGES = "\ picocom \ pkgconfig \ popt \ + portmap \ postfix \ ppp \ procps \ @@ -229,7 +231,6 @@ SLUGOS_BROKEN_PACKAGES = "\ fetchmail \ lirc-modules lirc \ madfu \ - portmap nfs-utils \ openldap \ pvrusb2-mci \ pwc \ diff --git a/packages/portmap/portmap-6.0/no-pie.patch b/packages/portmap/portmap-6.0/no-pie.patch new file mode 100644 index 0000000000..4d7e2daae4 --- /dev/null +++ b/packages/portmap/portmap-6.0/no-pie.patch @@ -0,0 +1,14 @@ +--- portmap_6.0/Makefile.orig 2007-11-21 00:35:52.000000000 -0600 ++++ portmap_6.0/Makefile 2007-11-21 00:37:23.000000000 -0600 +@@ -125,9 +125,9 @@ + all: portmap pmap_dump pmap_set portmap.man + + CPPFLAGS += $(HOSTS_ACCESS) +-portmap: CFLAGS += -fpie ++#portmap: CFLAGS += -fpie + portmap: LDLIBS += $(WRAP_LIB) +-portmap: LDFLAGS += -pie ++#portmap: LDFLAGS += -pie + portmap: portmap.o pmap_check.o from_local.o + + from_local: CPPFLAGS += -DTEST diff --git a/packages/portmap/portmap_6.0.bb b/packages/portmap/portmap_6.0.bb index 315cb4a473..335b5c6d09 100644 --- a/packages/portmap/portmap_6.0.bb +++ b/packages/portmap/portmap_6.0.bb @@ -1,11 +1,16 @@ require portmap.inc +PR = "r1" + SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \ file://destdir-no-strip.patch;patch=1 \ file://no-tcpd-support.patch;patch=1 \ file://no-libwrap.patch;patch=1;pnum=0 \ file://portmap.init " +# Remove this patch when SlugOS upgrades to binutils 1.18 +SRC_URI_append_slugos = " file://no-pie.patch;patch=1 " + S = "${WORKDIR}/${PN}_${PV}/" CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS" diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 761e07829d..8d4c3f0f93 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -28,6 +28,7 @@ d root root 0755 /var/lock/subsys none d root root 0755 /var/lib/dropbear none d root root 0755 /var/lib/misc none f root root 0664 /var/log/wtmp none +f root root 0664 /var/log/lastlog none f root root 0664 /var/run/utmp none" INRAM_NFS="\ @@ -50,6 +51,7 @@ d root root 0755 /var/lib/dropbear none d root root 0755 /var/lib/misc none d root root 0755 /var/lib/ipkg none f root root 0664 /var/log/wtmp none +f root root 0664 /var/log/lastlog none f root root 0664 /var/run/utmp none" INRAM_DISK="\ @@ -68,6 +70,7 @@ d root root 0755 /var/lib/dropbear none d root root 0755 /var/lib/misc none d root root 0755 /var/lib/ipkg none f root root 0664 /var/log/wtmp none +f root root 0664 /var/log/lastlog none f root root 0664 /var/run/utmp none" INRAM_HEADER="\ diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index c8e903ce97..247578bab3 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r89" +PR = "r90" SRC_URI = "file://boot/flash \ file://boot/disk \ |