Merge branch '2.6' into 2.7

Conflicts:
	dcron/Pkgfile
	util-linux-ng/Pkgfile
This commit is contained in:
Juergen Daubert 2010-07-06 17:59:47 +02:00
commit 00de5d1f43
11 changed files with 51 additions and 19 deletions

View File

@ -1,4 +1,5 @@
59a2ec9d1fe95f2a8b16814c2efbb8e7 crond
3596a4fa9cf63bdf130fd533ca7703d4 crontab
02d848ba043a9df5bf2102a9f4bc04bd dcron-4.4.tar.gz
384d0dbf3523058338ad2103114f8adc dcron.diff
d80b27b1b9532890136c14d30e2a0d2b runjobs

View File

@ -6,12 +6,14 @@ name=dcron
version=4.4
release=2
source=(http://www.jimpryor.net/linux/releases/$name-$version.tar.gz \
crontab runjobs crond)
dcron.diff crontab runjobs crond)
build() {
cd $name-$version
make PREFIX=/usr
patch -p1 -i $SRC/dcron.diff
make PREFIX=/usr
make DESTDIR=$PKG MANDIR=/usr/man CRONTAB_GROUP=users install
install -m 600 $SRC/crontab $PKG/var/spool/cron/crontabs/root

22
dcron/dcron.diff Normal file
View File

@ -0,0 +1,22 @@
diff --git a/database.c b/database.c
--- a/database.c
+++ b/database.c
@@ -410,6 +410,7 @@ SynchronizeFile(const char *dpath, const char *fileName, const char *userName)
break;
case 5:
line.cl_Freq = MONTHLY_FREQ;
+ break;
case 6:
line.cl_Freq = YEARLY_FREQ;
/* else line.cl_Freq will remain 0 */
diff --git a/database.c b/database.c
--- a/database.c
+++ b/database.c
@@ -258,6 +258,7 @@ ReadTimestamps(const char *user)
if (ptr && (*ptr == 0 || *ptr == '\n'))
/* strptime uses current seconds when seconds not specified? anyway, we don't get round minutes */
tm.tm_sec = 0;
+ tm.tm_isdst = -1;
sec = mktime(&tm);
if (sec == (time_t)-1) {
printlogf(LOG_ERR, "failed parsing timestamp for user %s job %s\n", file->cf_UserName, line->cl_JobName);

View File

@ -1 +1 @@
b672d175bbf924b3f7575a8279eb063d hdparm-9.28.tar.gz
6575aba60e5adee628414cac76549c9b hdparm-9.29.tar.gz

View File

@ -3,9 +3,9 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=hdparm
version=9.28
version=9.29
release=1
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz)
build() {
cd $name-$version

View File

@ -4,14 +4,15 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
---s--x--x root/root usr/bin/sudo
lrwxrwxrwx root/root usr/bin/sudoedit -> sudo
---x--x--x root/root usr/bin/sudoreplay
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/sudo_noexec.so
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man5/
-r--r--r-- root/root usr/man/man5/sudoers.5.gz
drwxr-xr-x root/root usr/man/man8/
-r--r--r-- root/root usr/man/man8/sudo.8.gz
lrwxrwxrwx root/root usr/man/man8/sudoedit.8.gz -> sudo.8.gz
-r--r--r-- root/root usr/man/man8/sudoreplay.8.gz
-r--r--r-- root/root usr/man/man8/visudo.8.gz
drwxr-xr-x root/root usr/sbin/
---x--x--x root/root usr/sbin/visudo

View File

@ -1 +1 @@
3ac78668427a53e12d7639fdfab2f1af sudo-1.7.2p7.tar.gz
c22115b47cb2591bceedb914b673f031 sudo-1.7.3.tar.gz

View File

@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=sudo
version=1.7.2p7
version=1.7.3
release=1
source=(http://www.sudo.ws/$name/dist/$name-$version.tar.gz)

View File

@ -1,5 +1,6 @@
drwxr-xr-x root/root bin/
-rwxr-xr-x root/root bin/dmesg
-rwxr-xr-x root/root bin/findmnt
-rwxr-xr-x root/root bin/kill
-rwxr-xr-x root/root bin/more
-rwsr-xr-x root/root bin/mount
@ -9,6 +10,8 @@ drwxr-xr-x root/root etc/
drwxr-xr-x root/root lib/
lrwxrwxrwx root/root lib/libblkid.so.1 -> libblkid.so.1.1.0
-rwxr-xr-x root/root lib/libblkid.so.1.1.0
lrwxrwxrwx root/root lib/libmount.so.1 -> libmount.so.1.1.0
-rwxr-xr-x root/root lib/libmount.so.1.1.0
lrwxrwxrwx root/root lib/libuuid.so.1 -> libuuid.so.1.3.0
-rwxr-xr-x root/root lib/libuuid.so.1.3.0
drwxr-xr-x root/root sbin/
@ -21,6 +24,7 @@ drwxr-xr-x root/root sbin/
-rwxr-xr-x root/root sbin/findfs
-rwxr-xr-x root/root sbin/fsck
-rwxr-xr-x root/root sbin/fsck.cramfs
-rwxr-xr-x root/root sbin/fsfreeze
-rwxr-xr-x root/root sbin/hwclock
-rwxr-xr-x root/root sbin/losetup
-rwxr-xr-x root/root sbin/mkfs
@ -29,6 +33,7 @@ drwxr-xr-x root/root sbin/
-rwxr-xr-x root/root sbin/pivot_root
-rwxr-xr-x root/root sbin/raw
-rwxr-xr-x root/root sbin/sfdisk
-rwxr-xr-x root/root sbin/swaplabel
lrwxrwxrwx root/root sbin/swapoff -> swapon
-rwxr-xr-x root/root sbin/swapon
-rwxr-xr-x root/root sbin/switch_root
@ -81,17 +86,23 @@ lrwxrwxrwx root/root usr/bin/linux64 -> setarch
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/blkid/
-rw-r--r-- root/root usr/include/blkid/blkid.h
drwxr-xr-x root/root usr/include/mount/
-rw-r--r-- root/root usr/include/mount/mount.h
drwxr-xr-x root/root usr/include/uuid/
-rw-r--r-- root/root usr/include/uuid/uuid.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libblkid.a
-rwxr-xr-x root/root usr/lib/libblkid.la
lrwxrwxrwx root/root usr/lib/libblkid.so -> ../../lib/libblkid.so.1.1.0
-rw-r--r-- root/root usr/lib/libmount.a
-rwxr-xr-x root/root usr/lib/libmount.la
lrwxrwxrwx root/root usr/lib/libmount.so -> ../../lib/libmount.so.1.1.0
-rw-r--r-- root/root usr/lib/libuuid.a
-rwxr-xr-x root/root usr/lib/libuuid.la
lrwxrwxrwx root/root usr/lib/libuuid.so -> ../../lib/libuuid.so.1.3.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/blkid.pc
-rw-r--r-- root/root usr/lib/pkgconfig/mount.pc
-rw-r--r-- root/root usr/lib/pkgconfig/uuid.pc
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
@ -161,7 +172,9 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/fdformat.8.gz
-rw-r--r-- root/root usr/man/man8/fdisk.8.gz
-rw-r--r-- root/root usr/man/man8/findfs.8.gz
-rw-r--r-- root/root usr/man/man8/findmnt.8.gz
-rw-r--r-- root/root usr/man/man8/fsck.8.gz
-rw-r--r-- root/root usr/man/man8/fsfreeze.8.gz
-rw-r--r-- root/root usr/man/man8/hwclock.8.gz
-rw-r--r-- root/root usr/man/man8/i386.8.gz
-rw-r--r-- root/root usr/man/man8/isosize.8.gz
@ -173,32 +186,25 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/mkswap.8.gz
-rw-r--r-- root/root usr/man/man8/mount.8.gz
-rw-r--r-- root/root usr/man/man8/pivot_root.8.gz
-rw-r--r-- root/root usr/man/man8/ramsize.8.gz
-rw-r--r-- root/root usr/man/man8/raw.8.gz
-rw-r--r-- root/root usr/man/man8/rdev.8.gz
-rw-r--r-- root/root usr/man/man8/rootflags.8.gz
-rw-r--r-- root/root usr/man/man8/rtcwake.8.gz
-rw-r--r-- root/root usr/man/man8/setarch.8.gz
-rw-r--r-- root/root usr/man/man8/sfdisk.8.gz
-rw-r--r-- root/root usr/man/man8/swaplabel.8.gz
-rw-r--r-- root/root usr/man/man8/swapoff.8.gz
-rw-r--r-- root/root usr/man/man8/swapon.8.gz
-rw-r--r-- root/root usr/man/man8/switch_root.8.gz
-rw-r--r-- root/root usr/man/man8/tunelp.8.gz
-rw-r--r-- root/root usr/man/man8/umount.8.gz
-rw-r--r-- root/root usr/man/man8/uuidd.8.gz
-rw-r--r-- root/root usr/man/man8/vidmode.8.gz
-rw-r--r-- root/root usr/man/man8/wipefs.8.gz
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/fdformat
-rwxr-xr-x root/root usr/sbin/ldattach
lrwxrwxrwx root/root usr/sbin/ramsize -> rdev
-rwxr-xr-x root/root usr/sbin/rdev
-rwxr-xr-x root/root usr/sbin/readprofile
lrwxrwxrwx root/root usr/sbin/rootflags -> rdev
-rwxr-xr-x root/root usr/sbin/rtcwake
-rwxr-xr-x root/root usr/sbin/tunelp
-rwxr-xr-x root/root usr/sbin/uuidd
lrwxrwxrwx root/root usr/sbin/vidmode -> rdev
drwxr-xr-x root/root var/
drwxr-xr-x root/root var/lib/
drwxr-xr-x root/root var/lib/libuuid/

View File

@ -1 +1 @@
4635725a3eef1c57090bac8ea5e082e6 util-linux-ng-2.17.2.tar.bz2
2f5f71e6af969d041d73ab778c141a77 util-linux-ng-2.18.tar.bz2

View File

@ -4,9 +4,9 @@
# Depends on: ncurses zlib
name=util-linux-ng
version=2.17.2
version=2.18
release=2
source=(http://ftp.kernel.org/pub/linux/utils/$name/v2.17/$name-$version.tar.bz2)
source=(http://ftp.kernel.org/pub/linux/utils/$name/v2.18/$name-$version.tar.bz2)
build() {
cd $name-$version