Hello community, here is the log from the commit of package sash for openSUSE:Factory checked in at 2014-11-24 11:14:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sash (Old) and /work/SRC/openSUSE:Factory/.sash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sash" Changes: -------- --- /work/SRC/openSUSE:Factory/sash/sash.changes 2013-04-06 19:56:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sash.new/sash.changes 2014-11-24 11:14:39.000000000 +0100 @@ -1,0 +2,18 @@ +Wed Nov 19 14:03:13 UTC 2014 - pgaj...@suse.com + +- updated to 3.8 + * The -ls command has the -n option to print numeric user and + group ids. + * The -chroot, -pivot_root, and -losetup commands have been added. + * The exit status for commands has been implemented (such as -exit). +- deleted patches: + D sash-3.7-ed-line-marking.diff (renamed to sash-ed-line-marking.diff) + D sash-3.7-ext2_fs-header.diff (upstreamed) + D sash-3.7-include.diff (renamed to sash-include.diff) + D sash-3.7-install.diff (part of sash-Makefile.diff) + D sash-3.7-raid.diff (renamed to sash-raid.diff) + D sash-3.7-shared_libc.patch (part of sash-Makefile.diff) + D sash-3.7-strip.diff (part of sash-Makefile.diff) + D sash-plus-patches-3.7.diff (upstreamed) + +------------------------------------------------------------------- Old: ---- sash-3.7-ed-line-marking.diff sash-3.7-ext2_fs-header.diff sash-3.7-include.diff sash-3.7-install.diff sash-3.7-raid.diff sash-3.7-shared_libc.patch sash-3.7-strip.diff sash-3.7.tar.gz sash-plus-patches-3.7.diff New: ---- sash-3.8.tar.gz sash-Makefile.diff sash-ed-line-marking.diff sash-include.diff sash-raid.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sash.spec ++++++ --- /var/tmp/diff_new_pack.5k97LS/_old 2014-11-24 11:14:40.000000000 +0100 +++ /var/tmp/diff_new_pack.5k97LS/_new 2014-11-24 11:14:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sash # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,62 +17,49 @@ Name: sash -BuildRequires: libext2fs-devel -BuildRequires: ncurses-devel -BuildRequires: zlib-devel-static -Version: 3.7 +Version: 3.8 Release: 0 Summary: A stand-alone shell with built-in commands License: ISC Group: System/Shells -Source: http://members.tip.net.au/~dbell/programs/sash-%{version}.tar.gz Url: http://www.tip.net.au/~dbell -Patch0: sash-%{version}-install.diff -Patch1: sash-%{version}-raid.diff -Patch2: sash-%{version}-include.diff -Patch3: sash-%{version}-strip.diff -Patch4: sash-3.7-ext2_fs-header.diff -Patch5: sash-3.7-shared_libc.patch -Patch6: sash-%{version}-ed-line-marking.diff -Patch7: sash-plus-patches-%{version}.diff +Source: http://members.tip.net.au/~dbell/programs/sash-%{version}.tar.gz +Patch0: sash-Makefile.diff +Patch1: sash-raid.diff +Patch2: sash-include.diff +Patch3: sash-ed-line-marking.diff +BuildRequires: libext2fs-devel +BuildRequires: ncurses-devel +BuildRequires: zlib-devel-static BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package includes: --chgrp, -chmod, -chown, -cmp, -cp, -dd, -echo, -ed, -grep, -gunzip, --gzip, -kill, -ln, -ls, -mkdir, -mknod, -more, -mount, -mv, -printenv, --pwd, -rm, -rmdir, -sync, -tar, -touch, -umount, -where - - - -Authors: --------- - David I. Bell <db...@canb.auug.org.au> + -ar, -chattr, -chgrp, -chmod, -chown, -chroot, -cmp, + -cp, -dd, -echo, -ed, -grep, -file, -find, -gunzip, + -gzip, -kill, -losetup, -ln, -ls, -lsattr, -mkdir, + -mknod, -more, -mount, -mv, -pivot_root, -printenv, -pwd, + -rm, -rmdir, -sum, -sync, -tar, -touch, -umount, -where %prep %setup -q %patch0 %patch1 %patch2 -%patch3 -%patch4 -p1 -%patch5 -%patch6 -p1 -%patch7 -p1 +%patch3 -p1 %build -export RPM_OPT_FLAGS -make CC="%__cc" +export OPT="%{optflags} -O3" +make %{?_smp_mflags} CC="gcc" %install -mkdir -p $RPM_BUILD_ROOT/{bin,%{_mandir}/man1} -make prefix=$RPM_BUILD_ROOT install +make DESTDIR=%{buildroot} install %files %defattr(-,root,root) -%doc README /bin/sash +%doc README CHANGES %doc %{_mandir}/man1/sash.1.gz %changelog ++++++ sash-3.7.tar.gz -> sash-3.8.tar.gz ++++++ ++++ 3965 lines of diff (skipped) ++++++ sash-Makefile.diff ++++++ Index: Makefile =================================================================== --- Makefile.orig 2014-11-19 14:51:20.911717387 +0100 +++ Makefile 2014-11-19 15:00:39.429041277 +0100 @@ -39,13 +39,12 @@ -DHAVE_BSD_MOUNT=$(HAVE_BSD_MOUNT) \ -DMOUNT_TYPE=$(MOUNT_TYPE) -LDFLAGS = -static LIBS = -lz DESTDIR = BINDIR = /bin -MANDIR = /usr/man +MANDIR = /usr/share/man OBJS = sash.o cmds.o cmd_dd.o cmd_ed.o cmd_grep.o cmd_ls.o cmd_tar.o \ @@ -53,14 +52,15 @@ sash: $(OBJS) - $(CC) $(LDFLAGS) -o sash $(OBJS) $(LIBS) - strip sash + $(CC) -o sash $(OBJS) -Wl,-Bstatic $(LIBS) -Wl,-Bdynamic -lc clean: rm -f $(OBJS) sash install: sash + mkdir -p $(DESTDIR)/$(BINDIR) cp sash $(DESTDIR)/$(BINDIR)/sash + mkdir -p $(DESTDIR)/$(MANDIR)/man1 cp sash.1 $(DESTDIR)/$(MANDIR)/man1/sash.1 $(OBJS): sash.h ++++++ sash-ed-line-marking.diff ++++++ Index: sash-3.7/cmd_ed.c =================================================================== --- sash-3.7.orig/cmd_ed.c +++ sash-3.7/cmd_ed.c @@ -247,7 +247,7 @@ doCommands(void) while (isBlank(*cp)) cp++; - if ((*cp < 'a') || (*cp > 'a') || cp[1]) + if ((*cp < 'a') || (*cp > 'z') || cp[1]) { fprintf(stderr, "Bad mark name\n"); break; ++++++ sash-include.diff ++++++ --- cmds.c +++ cmds.c @@ -18,6 +18,9 @@ #include <errno.h> #if HAVE_LINUX_MOUNT +#include <sys/socket.h> +#define pgoff_t unsigned long +#include <linux/netlink.h> #include <linux/fs.h> #endif ++++++ sash-raid.diff ++++++ Index: sash.c =================================================================== --- sash.c.orig 2014-03-07 14:18:42.000000000 +0100 +++ sash.c 2014-11-19 14:24:12.786347385 +0100 @@ -14,6 +14,9 @@ #include "sash.h" +#include <sys/ioctl.h> +#include <linux/major.h> +#include <linux/raid/md_u.h> static const char * const version = "3.8"; @@ -364,6 +367,12 @@ }, { + "raidautorun", do_raidautorun, 1, 1, + "Configure RAID devices", + "" + }, + + { NULL, 0, 0, 0, NULL, NULL @@ -1290,6 +1299,21 @@ } +int +do_raidautorun(int argc, const char ** argv) +{ + int fd = open("/dev/md0", O_RDWR); + + if(fd >= 0) + { + ioctl(fd , RAID_AUTORUN, 0); + close(fd); + } + + return 0; +} + + /* * Display the prompt string. */ Index: sash.h =================================================================== --- sash.h.orig 2014-03-07 14:46:49.000000000 +0100 +++ sash.h 2014-11-19 14:25:58.706738188 +0100 @@ -67,6 +67,7 @@ extern int do_source(int argc, const char ** argv); extern int do_umask(int argc, const char ** argv); extern int do_unalias(int argc, const char ** argv); +extern int do_raidautorun(int argc, const char ** argv); extern int do_help(int argc, const char ** argv); extern int do_ln(int argc, const char ** argv); extern int do_cp(int argc, const char ** argv); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
