aboutsummaryrefslogtreecommitdiffstats
path: root/net/iet
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2017-01-01 01:43:48 +0800
committerrene <rene@FreeBSD.org>2017-01-01 01:43:48 +0800
commit1e443c5e7ed2689396e817332fa7c35ca6bfb11c (patch)
tree41ae4943c79f0c5f3fae555b893e75352ad7ee19 /net/iet
parent6ea4526c4dfdb96183c4263c91cd91f8d84ebd87 (diff)
downloadfreebsd-ports-gnome-1e443c5e7ed2689396e817332fa7c35ca6bfb11c.tar.gz
freebsd-ports-gnome-1e443c5e7ed2689396e817332fa7c35ca6bfb11c.tar.zst
freebsd-ports-gnome-1e443c5e7ed2689396e817332fa7c35ca6bfb11c.zip
Remove expired ports:
2016-12-31 devel/rubygem-devise-async-rails4: Not compatible with devel/rubygem-devise > 3 2016-12-31 devel/rubygem-devise-async: Not compatible with devel/rubygem-devise > 3 2016-12-31 net/iet: Upstream no longer active 2016-12-31 sysutils/geomgui: Development stopped years ago. 2016-12-31 sysutils/screen-legacy: Old version released 2008-08-07 no longer upline maintained. 2016-12-31 sysutils/ntfsprogs: Superseded by sysutils/fusefs-ntfs 2016-12-31 www/rubygem-jekyll2: Use www/rubygem-jekyll instead 2016-12-31 databases/rubygem-dm-devise: Not compatible with devel/rubygem-devise > 3 2016-12-31 devel/rubygem-sprockets211: Use devel/rubygem-sprockets or devel/rubygem-sprockets3 instead 2016-12-31 devel/p5-Parse-CPAN-Meta: Merged into devel/p5-CPAN-Meta 2.150008 2016-12-31 devel/jtag: development ceased 2003, superceded by devel/urjtag
Diffstat (limited to 'net/iet')
-rw-r--r--net/iet/Makefile43
-rw-r--r--net/iet/distinfo4
-rw-r--r--net/iet/files/ietd.in27
-rw-r--r--net/iet/files/patch-freebsd10258
-rw-r--r--net/iet/files/patch-freebsd1126
-rw-r--r--net/iet/files/patch-freebsd970
-rw-r--r--net/iet/files/patch-kernel__nthread.c11
-rw-r--r--net/iet/files/patch-soo_ioctl20
-rw-r--r--net/iet/pkg-descr8
-rw-r--r--net/iet/pkg-plist11
10 files changed, 0 insertions, 478 deletions
diff --git a/net/iet/Makefile b/net/iet/Makefile
deleted file mode 100644
index b4a5ab689ac7..000000000000
--- a/net/iet/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Created by: Xin LI <delphij@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= iet
-PORTVERSION= 1.4.20.2
-PORTREVISION= 10
-CATEGORIES= net kld
-MASTER_SITES= SF/iscsitarget/iscsitarget/${PORTVERSION}/
-DISTNAME= iscsitarget-${PORTVERSION}
-
-PATCH_SITES= LOCAL/delphij
-PATCHFILES= ${PORTNAME}-${PORTVERSION}.diff.bz2
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= The iSCSI Enterprise Target
-
-LICENSE= GPLv2
-
-DEPRECATED= Upstream no longer active
-EXPIRATION_DATE= 2016-12-31
-
-SSP_UNSAFE= kernel module does not support ssp
-BUILD_WRKSRC= ${WRKSRC}/freebsd
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-
-USE_RC_SUBR= ietd
-USES= kmod uidfix
-
-KMODDIR= ${PREFIX}/modules
-PLIST_SUB+= KMODDIR=${KMODDIR}
-MAKE_ENV+= KMODDIR=${KMODDIR} DATADIR=${DATADIR} SYSDIR="${SRC_BASE}/sys"
-
-IET_CONF_FILES= ietd.conf initiators.allow initiators.deny targets.allow
-
-.if !exists(${SRC_BASE}/sys/Makefile)
-IGNORE= requires kernel sources to build
-.endif
-
-pre-install:
- ${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${KMODDIR} ${STAGEDIR}${ETCDIR}
-
-.include <bsd.port.mk>
diff --git a/net/iet/distinfo b/net/iet/distinfo
deleted file mode 100644
index 862943390216..000000000000
--- a/net/iet/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (iscsitarget-1.4.20.2.tar.gz) = 0f3c8e2c2038fbbd7059d1efdd428260013212daca75c1d56abbeec33cb8d388
-SIZE (iscsitarget-1.4.20.2.tar.gz) = 138464
-SHA256 (iet-1.4.20.2.diff.bz2) = 7d52898f986633ee9f0bee0076416dc7f515a372b625a4f579576b7ac8e9e35d
-SIZE (iet-1.4.20.2.diff.bz2) = 25970
diff --git a/net/iet/files/ietd.in b/net/iet/files/ietd.in
deleted file mode 100644
index af3dfa333da2..000000000000
--- a/net/iet/files/ietd.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: ietd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="ietd"
-rcvar=ietd_enable
-
-command=%%PREFIX%%/sbin/${name}
-required_modules="%%PREFIX%%/modules/iet.ko:iet"
-stop_precmd="ietd_prestop"
-
-load_rc_config $name
-
-: ${ietd_enable:="NO"}
-
-ietd_prestop()
-{
- %%PREFIX%%/sbin/ietadm --op delete
-}
-
-run_rc_command "$1"
diff --git a/net/iet/files/patch-freebsd10 b/net/iet/files/patch-freebsd10
deleted file mode 100644
index 5e4137562355..000000000000
--- a/net/iet/files/patch-freebsd10
+++ /dev/null
@@ -1,258 +0,0 @@
---- kernel/iscsi.c.orig 2013-01-25 12:58:06.191784106 -0800
-+++ kernel/iscsi.c 2013-01-25 12:58:45.785782759 -0800
-@@ -1963,7 +1963,7 @@
- return ctr_major;
- }
- #else
-- ietdev = make_dev(&iet_csw, 0, UID_ROOT, GID_WHEEL, 0550, ctr_name);
-+ ietdev = make_dev(&iet_csw, 0, UID_ROOT, GID_WHEEL, 0550, "%s", ctr_name);
- #endif
-
- #ifdef LINUX
---- kernel/block-io.c.orig 2013-01-25 12:58:06.194781035 -0800
-+++ kernel/block-io.c 2013-01-25 12:58:45.786780433 -0800
-@@ -260,7 +260,9 @@
- int flags = FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE);
- int vaccess;
- int error;
-+#if defined(NDHASGIANT)
- int vfslocked;
-+#endif
- struct vnode *devvp = NULL;
- struct g_provider *pp;
- struct g_geom *gp;
-@@ -270,13 +272,19 @@
- if (!bio_data->path)
- return -(ENOMEM);
-
-+#if defined(MPSAFE)
- NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, path, curthread);
-+#else
-+ NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, path, curthread);
-+#endif
- error = vn_open(&nd, &flags, 0, NULL);
- if (error) {
- eprintk("failed to open disk %s error %d\n", path, error);
- return -(error);
- }
-+#if defined(NDHASGIANT)
- vfslocked = NDHASGIANT(&nd);
-+#endif
- NDFREE(&nd, NDF_ONLY_PNBUF);
-
- devvp = nd.ni_vp;
-@@ -321,7 +329,9 @@
- g_topology_unlock();
- bio_data->bdev = devvp;
- VOP_UNLOCK(devvp, 0);
-+#if defined(NDHASGIANT)
- VFS_UNLOCK_GIANT(vfslocked);
-+#endif
- return 0;
-
- gcleanup: /* On geom errors */
-@@ -331,7 +341,9 @@
- failed:
- VOP_UNLOCK(devvp, 0);
- (void)vn_close(devvp, flags, curthread->td_ucred, curthread);
-+#if defined(NDHASGIANT)
- VFS_UNLOCK_GIANT(vfslocked);
-+#endif
- return -(error);
- }
- #endif
-@@ -439,11 +451,15 @@
- }
-
- if (bio_data->bdev) {
-+#if defined(NDHASGIANT)
- int vfslocked;
-
- vfslocked = VFS_LOCK_GIANT(bio_data->bdev->v_mount);
-+#endif
- (void)vn_close(bio_data->bdev, flags, curthread->td_ucred, curthread);
-+#if defined(NDHASGIANT)
- VFS_UNLOCK_GIANT(vfslocked);
-+#endif
- }
-
- if (bio_data->path)
---- kernel/file-io.c.orig 2013-01-25 12:58:06.197782092 -0800
-+++ kernel/file-io.c 2013-01-25 13:01:32.708794758 -0800
-@@ -24,8 +24,15 @@
- struct file *filp;
- #else
- struct vnode *vp;
-+#if defined(NDHASGIANT)
- int vfslocked;
-- int error, aresid;
-+#endif
-+ int error;
-+#if ((__FreeBSD_version < 1000000 && __FreeBSD_version >= 900506) || (__FreeBSD_version >= 1000009))
-+ ssize_t aresid;
-+#else
-+ int aresid;
-+#endif
- #endif
- struct fileio_data *p = lu->private;
- page_t *page;
-@@ -40,8 +47,10 @@
- filp = p->filp;
- #else
- vp = p->filevp;
-+#if defined(NDHASGIANT)
- vfslocked = VFS_LOCK_GIANT(vp->v_mount);
- #endif
-+#endif
-
- size = tio->size;
- offset= tio->offset;
-@@ -87,8 +96,10 @@
- }
- assert(!size);
- #ifdef FREEBSD
-+#if defined(NDHASGIANT)
- VFS_UNLOCK_GIANT(vfslocked);
- #endif
-+#endif
- return err;
- }
-
-@@ -149,12 +160,17 @@
- static int fileio_sync(struct iet_volume *lu, struct tio *tio)
- {
- struct fileio_data *p = lu->private;
-- int vfslocked, error;
-+#if defined(NDHASGIANT)
-+ int vfslocked;
-+#endif
-+ int error;
- struct vnode *vp;
- struct mount *mp;
-
- vp = p->filevp;
-+#if defined(NDHASGIANT)
- vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-+#endif
- if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
- goto drop;
-
-@@ -163,7 +179,9 @@
- VOP_UNLOCK(vp, 0);
- vn_finished_write(mp);
- drop:
-+#if defined(NDHASGIANT)
- VFS_UNLOCK_GIANT(vfslocked);
-+#endif
- return error;
- }
-
-@@ -174,16 +192,25 @@
- struct nameidata nd;
- struct vnode *filevp;
- struct vattr vattr;
-+#if defined(NDHASGIANT)
- int vfslocked;
-+#endif
- int flags = FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE);
-
- info->path = kstrdup(path, GFP_KERNEL);
- if (!info->path)
- return -ENOMEM;
-
-+#if defined(NDHASGIANT)
- NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, path, curthread);
-+#else
-+ NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, path, curthread);
-+#endif
- error = namei(&nd);
-+#if defined(NDHASGIANT)
- vfslocked = NDHASGIANT(&nd);
-+#else
-+#endif
- if (error) {
- eprintk("lookup failed for %s err %d\n", path, error);
- return -(error);
-@@ -193,7 +220,9 @@
- if (filevp->v_type != VREG) {
- eprintk("path %s not a regular file\n", path);
- NDFREE(&nd, 0);
-+#if defined(NDHASGIANT)
- VFS_UNLOCK_GIANT(vfslocked);
-+#endif
- return -(EINVAL);
- }
-
-@@ -201,7 +230,9 @@
- if (error != 0) {
- eprintk("failed to open path %s err %d\n", path, error);
- NDFREE(&nd, 0);
-+#if defined(NDHASGIANT)
- VFS_UNLOCK_GIANT(vfslocked);
-+#endif
- return -(error);
- }
- NDFREE(&nd, NDF_ONLY_PNBUF);
-@@ -212,7 +243,9 @@
- VOP_UNLOCK(filevp, 0);
- (void)vn_close(filevp, flags, curthread->td_ucred, curthread);
- vrele(filevp);
-+#if defined(NDHASGIANT)
- VFS_UNLOCK_GIANT(vfslocked);
-+#endif
- return -(error);
- }
-
-@@ -300,12 +333,16 @@
- #else
- if (p->filevp) {
- int flags = FMODE_READ | (LUReadonly(lu) ? 0 : FMODE_WRITE);
-+#if defined(NDHASGIANT)
- int vfslocked;
-
- vfslocked = VFS_LOCK_GIANT(p->filevp->v_mount);
-+#endif
- vn_close(p->filevp, flags, curthread->td_ucred, curthread);
- vrele(p->filevp);
-+#if defined(NDHASGIANT)
- VFS_UNLOCK_GIANT(vfslocked);
-+#endif
- }
- #endif
- kfree(p);
---- kernel/ietbsd.h.orig 2013-06-18 20:31:28.000000000 -0400
-+++ kernel/ietbsd.h 2013-06-18 20:38:05.000000000 -0400
-@@ -11,6 +11,7 @@
- #include <sys/malloc.h>
- #include <sys/lock.h>
- #include <sys/mutex.h>
-+#include <sys/rwlock.h>
- #include <sys/bio.h>
- #include <sys/time.h>
- #include <sys/queue.h>
---- usr/bsddefs.h.orig 2013-06-18 20:39:09.000000000 -0400
-+++ usr/bsddefs.h 2013-06-18 22:23:09.000000000 -0400
-@@ -1,6 +1,8 @@
- #ifndef BSDDEFS_H_
- #define BSDDEFS_H_ 1
-
-+#include <sys/param.h>
-+
- #define SOL_TCP IPPROTO_TCP
- #define TCP_CORK TCP_NOPUSH
-
-@@ -8,6 +10,7 @@
- #define s6_addr16 __u6_addr.__u6_addr16
- #define s6_addr32 __u6_addr.__u6_addr32
-
-+#if __FreeBSD_version < 1000028
- static inline char *
- strchrnul (const char *s, int c_in)
- {
-@@ -17,5 +20,6 @@
-
- return (char *) s;
- }
-+#endif
-
- #endif
diff --git a/net/iet/files/patch-freebsd11 b/net/iet/files/patch-freebsd11
deleted file mode 100644
index 26bd1785b3bc..000000000000
--- a/net/iet/files/patch-freebsd11
+++ /dev/null
@@ -1,26 +0,0 @@
---- kernel/ietbsd.h.orig 2014-07-23 22:45:36.000000000 -0700
-+++ kernel/ietbsd.h 2014-07-23 22:46:55.000000000 -0700
-@@ -642,7 +642,9 @@
- #define SAM_STAT_RESERVATION_CONFLICT SCSI_STATUS_RESERV_CONFLICT
- #define SAM_STAT_CHECK_CONDITION SCSI_STATUS_CHECK_COND
- #define WRITE_VERIFY 0x2e
-+#ifndef VERIFY_16
- #define VERIFY_16 0x8f
-+#endif
- #define DATA_PROTECT SSD_KEY_DATA_PROTECT
- #define NO_SENSE SSD_KEY_NO_SENSE
- #define MEDIUM_ERROR SSD_KEY_MEDIUM_ERROR
---- kernel/conn.c.orig 2015-02-13 14:23:20.438348146 -0800
-+++ kernel/conn.c 2015-02-13 14:33:52.728261609 -0800
-@@ -80,7 +80,11 @@
-
- if ((so->so_state & SS_ISDISCONNECTING) ||(so->so_state & SS_ISDISCONNECTED))
- conn_close(conn);
-+#if __FreeBSD_version >= 1100048
-+ else if (soreadable(so))
-+#else
- else if (so->so_rcv.sb_cc || !(so->so_rcv.sb_state & SBS_CANTRCVMORE))
-+#endif
- __nthread_wakeup(info);
-
- return (SU_OK);
diff --git a/net/iet/files/patch-freebsd9 b/net/iet/files/patch-freebsd9
deleted file mode 100644
index dec7ed8d8e0d..000000000000
--- a/net/iet/files/patch-freebsd9
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git kernel/eventbsd.c kernel/eventbsd.c
-index f8572b1..fd98590 100644
---- kernel/eventbsd.c
-+++ kernel/eventbsd.c
-@@ -105,7 +105,11 @@ int iet_poll(struct cdev *dev, int poll_events, struct thread *td)
- return (ret);
- }
-
-+#if __FreeBSD_version >= 900006
-+int iet_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr __unused)
-+#else
- int iet_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
-+#endif
- {
- int page_idx;
- page_t **bufs;
-diff --git kernel/ietbsd.h kernel/ietbsd.h
-index 32e20d3..fddc225 100644
---- kernel/ietbsd.h
-+++ kernel/ietbsd.h
-@@ -468,7 +468,11 @@ complete_all(wait_chan_t *chan)
- #define init_waitqueue_head(h) wait_chan_init(h, "iet")
- #define wait_event_interruptible wait_on_chan_interruptible
- #define wait_event wait_on_chan
-+#if __FreeBSD_version >= 900032
-+#define yield() kern_yield(curthread->td_user_pri)
-+#else
- #define yield uio_yield
-+#endif
- #define timer_pending callout_pending
- #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
-diff --git kernel/iscsi.h kernel/iscsi.h
-index 611f839..1c3c391 100644
---- kernel/iscsi.h
-+++ kernel/iscsi.h
-@@ -432,7 +432,7 @@ extern void event_exit(void);
- extern void iet_mmap_exit(void);
- extern int iet_mmap_init(void);
- int iet_poll(struct cdev *dev, int events, struct thread *td);
--int iet_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot);
-+d_mmap_t iet_mmap;
- int iet_ioctl(struct cdev *dev, unsigned long cmd, caddr_t arg, int fflag, struct thread *td);
- #endif
-
---- ./kernel/conn.c.orig 2010-04-11 08:13:42.000000000 -0700
-+++ ./kernel/conn.c 2011-09-09 13:16:38.386740084 -0700
-@@ -250,14 +250,22 @@ static int iet_conn_alloc(struct iscsi_s
- #ifdef LINUX
- conn->file = fget(info->fd);
- #else
-+#if __FreeBSD_version < 900041
- error = fget(curthread, info->fd, &conn->file);
-+#else
-+ error = fget(curthread, info->fd, 0, &conn->file);
-+#endif
- if (error != 0) {
- eprintk("failed to get fd %d\n", error);
- kfree(conn);
- return error;
- }
-
-+#if __FreeBSD_version < 900041
- error = fgetsock(curthread, info->fd, &conn->sock, 0);
-+#else
-+ error = fgetsock(curthread, info->fd, 0, &conn->sock, 0);
-+#endif
- if (error != 0) {
- eprintk("failed to get sock %d\n", error);
- fdrop(conn->file, curthread);
diff --git a/net/iet/files/patch-kernel__nthread.c b/net/iet/files/patch-kernel__nthread.c
deleted file mode 100644
index 06a60becde5b..000000000000
--- a/net/iet/files/patch-kernel__nthread.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kernel/nthread.c.orig 2011-04-01 10:25:22.720654061 -0700
-+++ ./kernel/nthread.c 2011-04-01 10:25:22.790651367 -0700
-@@ -147,7 +147,7 @@
- set_fs(oldfs);
- #else
- uio_fill(&uio, iov, i, len, UIO_READ);
-- flags = MSG_WAITALL | MSG_NOSIGNAL;
-+ flags = MSG_DONTWAIT | MSG_NOSIGNAL;
- res = soreceive(conn->sock, NULL, &uio, NULL, NULL, &flags);
- map_result(&res, &uio, len, 1);
- #endif
diff --git a/net/iet/files/patch-soo_ioctl b/net/iet/files/patch-soo_ioctl
deleted file mode 100644
index 9da60ef95bb8..000000000000
--- a/net/iet/files/patch-soo_ioctl
+++ /dev/null
@@ -1,20 +0,0 @@
---- kernel/nthread.c.orig 2014-10-30 11:29:21.000000000 -0700
-+++ kernel/nthread.c 2014-10-30 11:30:14.000000000 -0700
-@@ -91,7 +91,7 @@
- return 0;
- #endif
-
-- error = soo_ioctl(&filetmp, FIONREAD, &avail, NULL, curthread);
-+ error = fo_ioctl(&filetmp, FIONREAD, &avail, NULL, curthread);
- if (error)
- return 0;
-
-@@ -350,7 +350,7 @@
- filetmp.f_data = conn->sock;
- filetmp.f_cred = NULL;
-
-- error = soo_ioctl(&filetmp, FIONSPACE, &avail, NULL, curthread);
-+ error = fo_ioctl(&filetmp, FIONSPACE, &avail, NULL, curthread);
- if (error)
- return 0;
-
diff --git a/net/iet/pkg-descr b/net/iet/pkg-descr
deleted file mode 100644
index b14cb92294e2..000000000000
--- a/net/iet/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-iSCSI Enterprise Target is a simple open source iSCSI target with
-professional features, that works well in enterprise environments
-under real workloads, and is scalable and versatile enough to meet
-the challenge of future storage needs and developments.
-
-The port work was originally done by QuadStor.
-
-WWW: http://iscsitarget.sourceforge.net/
diff --git a/net/iet/pkg-plist b/net/iet/pkg-plist
deleted file mode 100644
index 6a2c63d243a8..000000000000
--- a/net/iet/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-modules/iet.ko
-@sample %%DATADIR%%/ietd.conf etc/iet/ietd.conf
-@sample %%DATADIR%%/initiators.allow etc/iet/initiators.allow
-@sample %%DATADIR%%/initiators.deny etc/iet/initiators.deny
-@sample %%DATADIR%%/targets.allow etc/iet/targets.allow
-man/man5/ietd.conf.5.gz
-man/man8/ietadm.8.gz
-man/man8/ietd.8.gz
-sbin/ietd
-sbin/ietadm
-@dir etc/iet