commit 0bd09616b033a0a537a4efd0e8bed0d89ea1fbd4
Author: Jakub Bogusz <[email protected]>
Date: Sun Mar 9 22:58:29 2014 +0100
- updated to 3.8
- removed obsolete misc,losetup patches
sash-losetup.patch | 125 -----------------------------------------------------
sash-misc.patch | 11 -----
sash.spec | 14 +++---
3 files changed, 5 insertions(+), 145 deletions(-)
---
diff --git a/sash.spec b/sash.spec
index 6c14224..ba7678e 100644
--- a/sash.spec
+++ b/sash.spec
@@ -5,14 +5,12 @@ Summary(pt_BR.UTF-8): nterpretador de Comandos ligado
estaticamente com alguns c
Summary(ru.UTF-8): Статически собранный shell со встроенными базовыми
командами
Summary(uk.UTF-8): Статично зібраний shell із вбудованими базовими
командами
Name: sash
-Version: 3.7
+Version: 3.8
Release: 1
License: GPL
Group: Applications/Shells
-Source0: http://www.tip.net.au/~dbell/programs/%{name}-%{version}.tar.gz
-# Source0-md5: ee7c7ed5aad76599974d016a6f201ef4
-Patch0: %{name}-misc.patch
-Patch1: %{name}-losetup.patch
+Source0:
http://members.tip.net.au/~dbell/programs/%{name}-%{version}.tar.gz
+# Source0-md5: 105faad43be231dd9f439e96c70d76aa
BuildRequires: glibc-static
BuildRequires: zlib-static >= 1.1.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,13 +61,11 @@ Sash - це простий, статично зібраний shell, що вкл
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%{__make} \
CC="%{__cc}" \
- COPT_FLAGS="%{rpmcflags}"
+ OPT="%{rpmcflags}"
%install
rm -rf $RPM_BUILD_ROOT
@@ -86,4 +82,4 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/sash
%attr(755,root,root) %{_sbindir}/sash
-%{_mandir}/man8/*
+%{_mandir}/man8/sash.8*
diff --git a/sash-losetup.patch b/sash-losetup.patch
deleted file mode 100644
index 61601ca..0000000
--- a/sash-losetup.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- sash-3.4/sash.c.oot Mon Jan 10 10:42:05 2000
-+++ sash-3.4/sash.c Mon Jan 10 10:52:47 2000
-@@ -182,6 +182,12 @@
- },
-
- {
-+ "-losetup", do_losetup, 3, 3,
-+ "Associate a loopback device with a file",
-+ "[-d] device\n -losetup device filename"
-+ },
-+
-+ {
- "-ln", do_ln, 3, INFINITE_ARGS,
- "Link one fileName to another",
- "[-s] srcName ... destName"
---- sash-3.4/sash.h.oot Mon Jan 10 10:45:13 2000
-+++ sash-3.4/sash.h Mon Jan 10 10:45:22 2000
-@@ -93,6 +93,7 @@
- extern void do_find(int argc, const char ** argv);
- extern void do_ed(int argc, const char ** argv);
- extern void do_where(int argc, const char ** argv);
-+extern void do_losetup(int argc, const char ** argv);
-
- #ifdef HAVE_GZIP
- extern void do_gzip(int argc, const char ** argv);
---- sash-3.4/cmds.c.oot Mon Jan 10 10:45:30 2000
-+++ sash-3.4/cmds.c Mon Jan 10 10:51:10 2000
-@@ -17,6 +17,8 @@
- #include <utime.h>
- #include <errno.h>
-
-+#define dev_t dev_t
-+#include <linux/loop.h>
-
- void
- do_echo(int argc, const char ** argv)
-@@ -1152,6 +1153,60 @@
-
- if (!found)
- printf("Program \"%s\" not found in PATH\n", program);
-+}
-+
-+void
-+do_losetup(int argc, const char ** argv)
-+{
-+ int loopfd;
-+ int targfd;
-+ struct loop_info loopInfo;
-+
-+ if (!strcmp(argv[1], "-d")) {
-+ loopfd = open(argv[2], O_RDONLY);
-+ if (loopfd < 0) {
-+ fprintf(stderr, "Error opening %s: %s\n", argv[2],
-+ strerror(errno));
-+ return;
-+ }
-+
-+ if (ioctl(loopfd, LOOP_CLR_FD, 0)) {
-+ fprintf(stderr, "Error unassociating device: %s\n",
-+ strerror(errno));
-+ return;
-+ }
-+ }
-+
-+ loopfd = open(argv[1], O_RDONLY);
-+ if (loopfd < 0) {
-+ fprintf(stderr, "Error opening %s: %s\n", argv[1],
-+ strerror(errno));
-+ return;
-+ }
-+
-+ targfd = open(argv[2], O_RDONLY);
-+ if (targfd < 0) {
-+ fprintf(stderr, "Error opening %s: %s\n", argv[2],
-+ strerror(errno));
-+ return;
-+ }
-+
-+ if (ioctl(loopfd, LOOP_SET_FD, targfd)) {
-+ fprintf(stderr, "Error setting up loopback device: %s\n",
-+ strerror(errno));
-+ return;
-+ }
-+
-+ memset(&loopInfo, 0, sizeof(loopInfo));
-+ strcpy(loopInfo.lo_name, argv[2]);
-+
-+ if (ioctl(loopfd, LOOP_SET_STATUS, &loopInfo)) {
-+ fprintf(stderr, "Error setting up loopback device: %s\n",
-+ strerror(errno));
-+ return;
-+ }
-+
-+ return;
- }
-
- /* END CODE */
---- sash-3.4/sash.1.oot Mon Jan 10 10:54:37 2000
-+++ sash-3.4/sash.1 Mon Jan 10 11:26:12 2000
-@@ -24,9 +24,9 @@
- .nf
- -ar, -chattr, -chgrp, -chmod, -chown, -cmp, -cp,
- -dd, -echo, -ed, -grep, -file, -find, -gunzip,
-- -gzip, -kill, -ln, -ls, -lsattr, -mkdir, -mknod,
-- -more, -mount, -mv, -printenv, -pwd, -rm, -rmdir,
-- -sum, -sync, -tar, -touch, -umount, -where
-+ -gzip, -kill, -losetup, -ln, -ls, -lsattr, -mkdir,
-+ -mknod, -more, -mount, -mv, -printenv, -pwd, -rm,
-+ -rmdir, -sum, -sync, -tar, -touch, -umount, -where
- .fi
- .PP
- These commands are generally similar to the standard programs with similar
-@@ -302,6 +302,12 @@
- is a numeric value, or one of the special values HUP, INT,
- QUIT, KILL, TERM, STOP, CONT, USR1 or USR2.
- If no signal is specified then SIGTERM is used.
-+.TP
-+.B -losetup [-d] loopDev [file]
-+Associates loopback devices with files on the system. If -d is not given,
-+the loopback device \fBloopDev\fR is associated with \fBfile\fR. If -d is
-+given, \fBloopDev\fR is unassociated with the file it's currently configured
-+for.
- .TP
- .B -ln [-s] srcName ... destName
- Links one or more files from the
diff --git a/sash-misc.patch b/sash-misc.patch
deleted file mode 100644
index c22c455..0000000
--- a/sash-misc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sash-3.5/Makefile.orig Fri Mar 8 12:29:53 2002
-+++ sash-3.5/Makefile Wed Mar 20 01:56:46 2002
-@@ -11,7 +11,7 @@
- HAVE_LINUX_MOUNT = 1
- MOUNT_TYPE = '"ext3"'
-
--CFLAGS = -O3 -Wall -Wmissing-prototypes \
-+CFLAGS = $(COPT_FLAGS) -Wall -Wmissing-prototypes \
- -DHAVE_GZIP=$(HAVE_GZIP) \
- -DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \
- -DHAVE_LINUX_MOUNT=$(HAVE_LINUX_MOUNT) \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sash.git/commitdiff/0bd09616b033a0a537a4efd0e8bed0d89ea1fbd4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
