Attachment #140784 for bug #187491

View | Details | Raw Unified | Return to bug 187491
Collapse All | Expand All




# $FreeBSD: head/shells/sash/Makefile 340722 2014-01-22 17:00:46Z mat $

PORTNAME=	sash
PORTVERSION=	3.8
CATEGORIES=	shells
MASTER_SITES=	http://members.tip.net.au/~dbell/programs/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Stand-Alone shell combining many common utilities

.if !exists(/usr/include/fs/ntfs/ntfsmount.h)
BROKEN=	Depends on fs/ntfs/ntfsmount.h
.endif

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/sash ${STAGEDIR}${PREFIX}/bin/sash
	${INSTALL_MAN} ${WRKSRC}/sash.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/sash.1

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)shells/sash/distinfo (-2 / +2 lines)
1	SHA256 (sash-3.7.tar.gz) = 352726adb9736ba5a9b459d5c8a7d7c3b2c36cc99363adccc25a8a991d719c7f	1	SHA256 (sash-3.8.tar.gz) = 13c4f9a911526949096bf543c21a41149e6b037061193b15ba6b707eea7b6579
2	SIZE (sash-3.7.tar.gz) = 50337	2	SIZE (sash-3.8.tar.gz) = 53049

Lines 1-38 Link Here

(-)shells/sash/files/patch-Makefile (-10 / +33 lines)
1	--- Makefile.orig Mon Jul 22 01:24:47 2002	1	--- Makefile.orig 2014-03-05 18:56:53.000000000 +0900
2	+++ Makefile Fri Sep 3 14:53:40 2004	2	+++ Makefile 2014-03-13 03:27:58.000000000 +0900
3	@@ -8,13 +8,13 @@	3	@@ -19,17 +19,17 @@
4	# The MOUNT_TYPE definition sets the default file system type for -mount.
5	#	4	#
		5
6	HAVE_GZIP = 1	6	HAVE_GZIP = 1
7	-HAVE_LINUX_ATTR = 1	7	-HAVE_LINUX_ATTR = 1
		8	-HAVE_LINUX_CHROOT = 1
		9	-HAVE_LINUX_LOSETUP = 1
		10	-HAVE_LINUX_PIVOT = 1
8	-HAVE_LINUX_MOUNT = 1	11	-HAVE_LINUX_MOUNT = 1
9	-HAVE_BSD_MOUNT = 0	12	-HAVE_BSD_MOUNT = 0
10	-MOUNT_TYPE = '"ext3"'	13	-MOUNT_TYPE = '"ext3"'
11	+HAVE_LINUX_ATTR = 0	14	+HAVE_LINUX_ATTR = 0
		15	+HAVE_LINUX_CHROOT = 0
		16	+HAVE_LINUX_LOSETUP = 0
		17	+HAVE_LINUX_PIVOT = 0
12	+HAVE_LINUX_MOUNT = 0	18	+HAVE_LINUX_MOUNT = 0
13	+HAVE_BSD_MOUNT = 1	19	+HAVE_BSD_MOUNT = 1
14	+MOUNT_TYPE = '"ufs"'	20	+MOUNT_TYPE = '"ufs"'
15		21
		22	OPT = -O3
16		23
17	-CFLAGS = -O3 -Wall -Wmissing-prototypes \	24	-CFLAGS = $(OPT) -Wall -Wmissing-prototypes \
18	+CFLAGS += -Wall -Wmissing-prototypes \	25	+CFLAGS += -Wall -Wmissing-prototypes \
19	-DHAVE_GZIP=$(HAVE_GZIP) \	26	-DHAVE_GZIP=$(HAVE_GZIP) \
20	-DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \	27	-DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \
21	-DHAVE_LINUX_MOUNT=$(HAVE_LINUX_MOUNT) \	28	-DHAVE_LINUX_CHROOT=$(HAVE_LINUX_CHROOT) \
22	@@ -25,13 +25,14 @@	29	@@ -43,24 +43,26 @@
23	LIBS = -lz	30	LIBS = -lz
24		31
25		32
		33	-DESTDIR =
26	-BINDIR = /bin	34	-BINDIR = /bin
27	-MANDIR = /usr/man/man1	35	-MANDIR = /usr/man
		36	+#DESTDIR =
		37	+PREFIX ?= /usr/local
		38	+MANPREFIX ?= $(PREFIX)
28	+BINDIR = $(PREFIX)/bin	39	+BINDIR = $(PREFIX)/bin
29	+MANDIR = $(MANPREFIX)/man/man1	40	+MANDIR = $(MANPREFIX)/man
30		41
31		42
32	OBJS = sash.o cmds.o cmd_dd.o cmd_ed.o cmd_grep.o cmd_ls.o cmd_tar.o \	43	OBJS = sash.o cmds.o cmd_dd.o cmd_ed.o cmd_grep.o cmd_ls.o cmd_tar.o \
33	cmd_gzip.o cmd_find.o cmd_file.o cmd_chattr.o cmd_ar.o utils.o	44	cmd_gzip.o cmd_find.o cmd_file.o cmd_chattr.o cmd_ar.o utils.o
34		45
35	+all: sash	46	+all: sash
36		47
37	sash: $(OBJS)	48	sash: $(OBJS)
38	$(CC) $(LDFLAGS) -o sash $(OBJS) $(LIBS)	49	$(CC) $(LDFLAGS) -o sash $(OBJS) $(LIBS)
		50	- strip sash
		51
		52	clean:
		53	rm -f $(OBJS) sash
		54
		55	install: sash
		56	- cp sash $(DESTDIR)/$(BINDIR)/sash
		57	- cp sash.1 $(DESTDIR)/$(MANDIR)/man1/sash.1
		58	+ ${BSD_INSTALL_PROGRAM} sash $(DESTDIR)$(BINDIR)/sash
		59	+ ${BSD_INSTALL_MAN} sash.1 $(DESTDIR)$(MANDIR)/man1/sash.1
		60
		61	$(OBJS): sash.h




--- cmds.c.orig	Mon Jul 22 00:28:19 2002
+++ cmds.c	Fri Sep  3 16:35:01 2004
@@ -17,9 +17,18 @@
 #include <utime.h>
 #include <errno.h>
 
+#if __FreeBSD__
+#include <ufs/ufs/ufsmount.h>
+#include <isofs/cd9660/cd9660_mount.h>
+#if __FreeBSD_version >= 500019
+#include <fs/msdosfs/msdosfsmount.h>
+#if __FreeBSD_version < 1000000
+#include <fs/ntfs/ntfsmount.h>
+#define HAVE_BSD_NTFSMOUNT
+#include <msdosfs/msdosfsmount.h>
+#include <ntfs/ntfsmount.h>
+#endif
+#endif
+
 #if	HAVE_LINUX_MOUNT
 #include <linux/fs.h>
-#endif
 
 /* Need to tell loop.h what the actual dev_t type is. */
 #undef dev_t
@@ -32,6 +41,7 @@
 #undef dev_t
 #define dev_t dev_t
 
+#endif
 
 int
 do_echo(int argc, const char ** argv)
@@ -716,6 +726,10 @@
 				flags |= MNT_RDONLY;
 				break;
 

 			case 's':
 				flags |= MNT_NOSUID;
 				break;
@@ -748,46 +762,58 @@
 #elif	HAVE_BSD_MOUNT
 	{
 		struct	    ufs_args ufs;

 		struct	    iso_args iso;
-		struct	    mfs_args mfs;
 		struct	    msdosfs_args msdosfs;
+#ifdef	HAVE_BSD_NTFSMOUNT
+		struct	    ntfs_args ntfs;
+#endif
 		void *	    args;
 
 		if (!strcmp(type, "ffs") || !strcmp(type, "ufs"))
 		{
+			memset(&ufs, 0, sizeof(ufs));
 			ufs.fspec = (char*) argv[0];
 			args = &ufs;
 		}
-		else if (!strcmp(type, "adosfs"))
-		{
-			adosfs.fspec = (char*) argv[0];
-			adosfs.uid = 0;
-			adosfs.gid = 0;
-			args = &adosfs;
-		}
 		else if (!strcmp(type, "cd9660"))
 		{
+			memset(&iso, 0, sizeof(iso));
 			iso.fspec = (char*) argv[0];
 			args = &iso;
 		}
-		else if (!strcmp(type, "mfs"))
-		{
-			mfs.fspec = (char*) argv[0];
-			args = &mfs;
-		}
 		else if (!strcmp(type, "msdos"))
 		{
+			args = &ufs;
 		} else if(!strcmp(type, "msdos")) {
+			memset(&msdosfs, 0, sizeof(msdosfs));
 			msdosfs.fspec = (char*) argv[0];
-			msdosfs.uid = 0;

+				msdosfs.mask = msdosfs.dirmask = 7555;
+			}
 			args = &msdosfs;
+#ifdef	HAVE_BSD_NTFSMOUNT
+		} else if(!strcmp(type, "ntfs")) {
+			memset(&ntfs, 0, sizeof(ntfs));
+			ntfs.fspec = (char*) argv[0];

+				ntfs.mode = 0755;
+			}
+			args = &ntfs;
+#endif
 		}
 		else
 		{
 			fprintf(stderr, "Unknown filesystem type: %s", type);
 			fprintf(stderr,
-			    "Supported: ffs ufs adosfs cd9660 mfs msdos\n");
+#ifdef	HAVE_BSD_NTFSMOUNT
+			    "Supported: ffs ufs cd9660 ext2fs msdos ntfs\n");
+#else
+			    "Supported: ffs ufs cd9660 ext2fs msdos\n");
+#endif
 
 			return 1;
 		}




--- sash.c.orig
+++ sash.c
@@ -107,7 +107,7 @@
 		"srcName ... destName"
 	},
 
-#ifdef	HAVE_LINUX_CHROOT
+#if	HAVE_LINUX_CHROOT
 	{
 		"-chroot",	do_chroot,	2,	2,
 		"change root file system",
@@ -189,7 +189,7 @@
 		"[-sig] pid ..."
 	},
 
-#ifdef	HAVE_LINUX_LOSETUP
+#if	HAVE_LINUX_LOSETUP
 	{
 		"-losetup",	do_losetup,	3,	3,
 		"Associate a loopback device with a file",
@@ -253,7 +253,7 @@
 		"srcName ... destName"
 	},
 
-#ifdef	HAVE_LINUX_PIVOT
+#if	HAVE_LINUX_PIVOT
 	{
 		"-pivot_root",	do_pivot_root,	3,	3,
 		"pivot the root file system",

Lines 1-4 Link Here

(-)shells/sash/pkg-plist (-2 / +2 lines)
1	bin/sash	1	bin/sash
		2	@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells ; rm -f /etc/shells.bak
		3	@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells ; rm -f /etc/shells.bak
2	man/man1/sash.1.gz	4	man/man1/sash.1.gz
3	@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
4	@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells

Return to bug 187491

Lines 2-20 Link Here

(-)shells/sash/Makefile (-9 / +1 lines)
2	# $FreeBSD: head/shells/sash/Makefile 340722 2014-01-22 17:00:46Z mat $	2	# $FreeBSD: head/shells/sash/Makefile 340722 2014-01-22 17:00:46Z mat $
3		3
4	PORTNAME= sash	4	PORTNAME= sash
5	PORTVERSION= 3.7	5	PORTVERSION= 3.8
6	CATEGORIES= shells	6	CATEGORIES= shells
7	MASTER_SITES= http://members.tip.net.au/~dbell/programs/	7	MASTER_SITES= http://members.tip.net.au/~dbell/programs/
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Stand-Alone shell combining many common utilities	10	COMMENT= Stand-Alone shell combining many common utilities
11		11
12	.if !exists(/usr/include/fs/ntfs/ntfsmount.h)
13	BROKEN= Depends on fs/ntfs/ntfsmount.h
14	.endif
15
16	do-install:
17	${INSTALL_PROGRAM} ${WRKSRC}/sash ${STAGEDIR}${PREFIX}/bin/sash
18	${INSTALL_MAN} ${WRKSRC}/sash.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/sash.1
19
20	.include <bsd.port.mk>	12	.include <bsd.port.mk>

Lines 1-25 Link Here

(-)shells/sash/files/patch-cmds.c (-20 / +44 lines)
1	--- cmds.c.orig Mon Jul 22 00:28:19 2002	1	--- cmds.c.orig Mon Jul 22 00:28:19 2002
2	+++ cmds.c Fri Sep 3 16:35:01 2004	2	+++ cmds.c Fri Sep 3 16:35:01 2004
3	@@ -17,6 +17,18 @@	3	@@ -17,9 +17,18 @@
4	#include <utime.h>	4	#include <utime.h>
5	#include <errno.h>	5	#include <errno.h>
6		6
7	+#if __FreeBSD__	7	+#if __FreeBSD__
8	+#include <ufs/ufs/ufsmount.h>	8	+#include <ufs/ufs/ufsmount.h>
9	+#include <isofs/cd9660/cd9660_mount.h>	9	+#include <isofs/cd9660/cd9660_mount.h>
10	+#if __FreeBSD_version >= 500019
11	+#include <fs/msdosfs/msdosfsmount.h>	10	+#include <fs/msdosfs/msdosfsmount.h>
		11	+#if __FreeBSD_version < 1000000
12	+#include <fs/ntfs/ntfsmount.h>	12	+#include <fs/ntfs/ntfsmount.h>
13	+#else	13	+#define HAVE_BSD_NTFSMOUNT
14	+#include <msdosfs/msdosfsmount.h>
15	+#include <ntfs/ntfsmount.h>
16	+#endif	14	+#endif
17	+#endif	15	+#endif
18	+	16	+
19	#if HAVE_LINUX_MOUNT	17	#if HAVE_LINUX_MOUNT
20	#include <linux/fs.h>	18	#include <linux/fs.h>
21	#endif	19	-#endif
22	@@ -564,6 +576,10 @@	20
		21	/* Need to tell loop.h what the actual dev_t type is. */
		22	#undef dev_t
		23	@@ -32,6 +41,7 @@
		24	#undef dev_t
		25	#define dev_t dev_t
		26
		27	+#endif
		28
		29	int
		30	do_echo(int argc, const char ** argv)
		31	@@ -716,6 +726,10 @@
23	flags \|= MNT_RDONLY;	32	flags \|= MNT_RDONLY;
24	break;	33	break;
25		34
Lines 30-36 Link Here
30	case 's':	39	case 's':
31	flags \|= MNT_NOSUID;	40	flags \|= MNT_NOSUID;
32	break;	41	break;
33	@@ -594,35 +610,47 @@	42	@@ -748,46 +762,58 @@
34	#elif HAVE_BSD_MOUNT	43	#elif HAVE_BSD_MOUNT
35	{	44	{
36	struct ufs_args ufs;	45	struct ufs_args ufs;
Lines 38-67 Link Here
38	struct iso_args iso;	47	struct iso_args iso;
39	- struct mfs_args mfs;	48	- struct mfs_args mfs;
40	struct msdosfs_args msdosfs;	49	struct msdosfs_args msdosfs;
		50	+#ifdef HAVE_BSD_NTFSMOUNT
41	+ struct ntfs_args ntfs;	51	+ struct ntfs_args ntfs;
		52	+#endif
42	void * args;	53	void * args;
43		54
44	if(!strcmp(type, "ffs") \|\| !strcmp(type, "ufs")) {	55	if (!strcmp(type, "ffs") \|\| !strcmp(type, "ufs"))
		56	{
45	+ memset(&ufs, 0, sizeof(ufs));	57	+ memset(&ufs, 0, sizeof(ufs));
46	ufs.fspec = (char*) argv[0];	58	ufs.fspec = (char*) argv[0];
47	args = &ufs;	59	args = &ufs;
48	- } else if(!strcmp(type, "adosfs")) {	60	}
		61	- else if (!strcmp(type, "adosfs"))
		62	- {
49	- adosfs.fspec = (char*) argv[0];	63	- adosfs.fspec = (char*) argv[0];
50	- adosfs.uid = 0;	64	- adosfs.uid = 0;
51	- adosfs.gid = 0;	65	- adosfs.gid = 0;
52	- args = &adosfs;	66	- args = &adosfs;
53	} else if(!strcmp(type, "cd9660")) {	67	- }
		68	else if (!strcmp(type, "cd9660"))
		69	{
54	+ memset(&iso, 0, sizeof(iso));	70	+ memset(&iso, 0, sizeof(iso));
55	iso.fspec = (char*) argv[0];	71	iso.fspec = (char*) argv[0];
56	args = &iso;	72	args = &iso;
57	- } else if(!strcmp(type, "mfs")) {	73	}
		74	- else if (!strcmp(type, "mfs"))
		75	- {
58	- mfs.fspec = (char*) argv[0];	76	- mfs.fspec = (char*) argv[0];
59	- args = &mfs;	77	- args = &mfs;
60	+ } else if(!strcmp(type, "ext2fs")) {	78	- }
61	+ memset(&ufs, 0, sizeof(ufs));	79	else if (!strcmp(type, "msdos"))
62	+ ufs.fspec = (char*) argv[0];	80	{
63	+ args = &ufs;
64	} else if(!strcmp(type, "msdos")) {
65	+ memset(&msdosfs, 0, sizeof(msdosfs));	81	+ memset(&msdosfs, 0, sizeof(msdosfs));
66	msdosfs.fspec = (char*) argv[0];	82	msdosfs.fspec = (char*) argv[0];
67	- msdosfs.uid = 0;	83	- msdosfs.uid = 0;
Lines 73-78 Link Here
73	+ msdosfs.mask = msdosfs.dirmask = 7555;	89	+ msdosfs.mask = msdosfs.dirmask = 7555;
74	+ }	90	+ }
75	args = &msdosfs;	91	args = &msdosfs;
		92	+#ifdef HAVE_BSD_NTFSMOUNT
76	+ } else if(!strcmp(type, "ntfs")) {	93	+ } else if(!strcmp(type, "ntfs")) {
77	+ memset(&ntfs, 0, sizeof(ntfs));	94	+ memset(&ntfs, 0, sizeof(ntfs));
78	+ ntfs.fspec = (char*) argv[0];	95	+ ntfs.fspec = (char*) argv[0];
Lines 83-93 Link Here
83	+ ntfs.mode = 0755;	100	+ ntfs.mode = 0755;
84	+ }	101	+ }
85	+ args = &ntfs;	102	+ args = &ntfs;
86	} else {	103	+#endif
		104	}
		105	else
		106	{
87	fprintf(stderr, "Unknown filesystem type: %s", type);	107	fprintf(stderr, "Unknown filesystem type: %s", type);
88	fprintf(stderr,	108	fprintf(stderr,
89	- "Supported: ffs ufs adosfs cd9660 mfs msdos\n");	109	- "Supported: ffs ufs adosfs cd9660 mfs msdos\n");
		110	+#ifdef HAVE_BSD_NTFSMOUNT
90	+ "Supported: ffs ufs cd9660 ext2fs msdos ntfs\n");	111	+ "Supported: ffs ufs cd9660 ext2fs msdos ntfs\n");
91	return;	112	+#else
92	}	113	+ "Supported: ffs ufs cd9660 ext2fs msdos\n");
		114	+#endif
93		115
		116	return 1;
		117	}

Line 0 Link Here

(-)shells/sash/files/patch-sash.c (+29 lines)
	1	--- sash.c.orig
	2	+++ sash.c
	3	@@ -107,7 +107,7 @@
	4	"srcName ... destName"
	5	},
	6
	7	-#ifdef HAVE_LINUX_CHROOT
	8	+#if HAVE_LINUX_CHROOT
	9	{
	10	"-chroot", do_chroot, 2, 2,
	11	"change root file system",
	12	@@ -189,7 +189,7 @@
	13	"[-sig] pid ..."
	14	},
	15
	16	-#ifdef HAVE_LINUX_LOSETUP
	17	+#if HAVE_LINUX_LOSETUP
	18	{
	19	"-losetup", do_losetup, 3, 3,
	20	"Associate a loopback device with a file",
	21	@@ -253,7 +253,7 @@
	22	"srcName ... destName"
	23	},
	24
	25	-#ifdef HAVE_LINUX_PIVOT
	26	+#if HAVE_LINUX_PIVOT
	27	{
	28	"-pivot_root", do_pivot_root, 3, 3,
	29	"pivot the root file system",