Attachment #152809 for bug #197495

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




PORTREVISION=	3
CATEGORIES=	net
MASTER_SITES=	http://farrokhi.net/distfiles/ \
		http://BSDforge.com/projects/source/net/nocatsplash/
DISTNAME=	NoCatSplash-nightly

MAINTAINER=	portmaster@BSDforge.com
COMMENT=	Open 802.11 Splash Screen

LICENSE=	GPLv2

USE_GNOME=	glib12

CONFLICTS=	nocatauth-server-[0-9]*

GNU_CONFIGURE=	yes
USES=		gmake tar:tgz




--- mkinstalldirs.orig	2015-02-09 08:47:12.000000000 -0800
+++ mkinstalldirs	2015-02-09 08:47:48.000000000 -0800
@@ -7,25 +7,6 @@
 errstatus=0
 dirmode=""
 
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-   case "${1}" in
-     -h | --help | --h* )			# -h for help
-	echo "${usage}" 1>&2; exit 0 ;;
-     -m )					# -m PERM arg
-	shift
-	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-	dirmode="${1}"
-	shift ;;
-     -- ) shift; break ;;			# stop option processing
-     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
-     * )  break ;;				# first non-opt arg
-   esac
-done
-
 for file
 do
   if test -d "$file"; then

Lines 1-5 Link Here

(-)nocatsplash/pkg-descr (-2 / +2 lines)
1	NoCatSplash is a Open Public Network Gateway Daemon. It performs as a	1	NoCatSplash is a Open Public Network Gateway Daemon. It performs as a
2	[captive/open/active] portal. When run on a gateway/router on a network,	2	[captive/open/active] portal. When run on a gateway/router on a network,
3	all web requests are redirected until the client either logs in or clicks	3	all web requests are redirected until the client either logs in or clicks
4	"I Accept" to an AUP. The gateway daemon then changes the firewall rules	4	"I Accept" to an AUP. The gateway daemon then changes the firewall rules
5	on the gateway to pass traffic for that client (based on IP address and	5	on the gateway to pass traffic for that client (based on IP address and




#!/bin/sh

PATH=/bin:/usr/sbin

if [ -z "${WRAP_USER}" ]; then
	WRAP_USER=nocat
fi

case $2 in
    PRE-INSTALL)
	UID=181
	GID=${UID}
	if [ ! -d "${NOCAT_DIR}" ]; then
		mkdir -p ${NOCAT_DIR}
	fi
	if pw user show "${WRAP_USER}" 2>/dev/null; then
		echo "You already have a user \"${WRAP_USER}\", so I will use it."
		if pw usermod ${WRAP_USER} -d ${NOCAT_DIR}
		then
			echo "Changed home directory of \"${WRAP_USER}\" to \"${NOCAT_DIR}\""
		else
			"${NOCAT_DIR}\" failed..."
			exit 1
		fi
		else
		if pw useradd ${WRAP_USER} -u ${UID} \
			-d ${NOCAT_DIR} -s /sbin/nologin -c "NoCat Daemon"
		then
			echo "Added user \"${WRAP_USER}\"."
		else
			echo "Adding user \"${WRAP_USER}\" failed..."
			exit 1
		fi
	fi
	;;
esac

Lines 12-14 Link Here

(-)nocatsplash/pkg-plist (+3 lines)
12	sbin/splashd	12	sbin/splashd
13	sbin/ghttpd	13	sbin/ghttpd
14	etc/nocat.conf	14	etc/nocat.conf
		15	@dir libexec/nocat
		16	@exec if ! pw groupshow nocat 2>/dev/null; then pw groupadd nocat -g 181; fi
		17	@exec if ! pw usershow nocat 2>/dev/null; then pw useradd nocat -g nocat -u 181 -h - -d /libexec/nocat -s /sbin/nologin -c "NoCat Daemon"; fi

Return to bug 197495

Lines 6-22 Link Here

(-)nocatsplash/Makefile (-4 / +4 lines)
6	PORTREVISION= 3	6	PORTREVISION= 3
7	CATEGORIES= net	7	CATEGORIES= net
8	MASTER_SITES= http://farrokhi.net/distfiles/ \	8	MASTER_SITES= http://farrokhi.net/distfiles/ \
9	http://nocat.net/download/NoCatSplash/	9	http://BSDforge.com/projects/source/net/nocatsplash/
10	DISTNAME= NoCatSplash-nightly	10	DISTNAME= NoCatSplash-nightly
11		11
12	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= portmaster@BSDforge.com
13	COMMENT= Open 802.11 Splash Screen	13	COMMENT= Open 802.11 Splash Screen
14		14
15	BROKEN= Broken pkg-install script, should use USERS and UIDs	15	LICENSE= GPLv2
16		16
17	USE_GNOME= glib12	17	USE_GNOME= glib12
18		18
19	CONFLICTS= nocatauth-server-*	19	CONFLICTS= nocatauth-server-[0-9]*
20		20
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	USES= gmake tar:tgz	22	USES= gmake tar:tgz

Line 0 Link Here

(-)nocatsplash/files/patch-mkinstalldirs (+28 lines)
	1	--- mkinstalldirs.orig 2015-02-09 08:47:12.000000000 -0800
	2	+++ mkinstalldirs 2015-02-09 08:47:48.000000000 -0800
	3	@@ -7,25 +7,6 @@
	4	errstatus=0
	5	dirmode=""
	6
	7	-usage="\
	8	-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
	9	-
	10	-# process command line arguments
	11	-while test $# -gt 0 ; do
	12	- case "${1}" in
	13	- -h \| --help \| --h* ) # -h for help
	14	- echo "${usage}" 1>&2; exit 0 ;;
	15	- -m ) # -m PERM arg
	16	- shift
	17	- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
	18	- dirmode="${1}"
	19	- shift ;;
	20	- -- ) shift; break ;; # stop option processing
	21	- -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option
	22	- * ) break ;; # first non-opt arg
	23	- esac
	24	-done
	25	-
	26	for file
	27	do
	28	if test -d "$file"; then

Lines 1-36 Link Here

(-)nocatsplash/pkg-install (-36 lines)
1	#!/bin/sh
2
3	PATH=/bin:/usr/sbin
4
5	if [ -z "${WRAP_USER}" ]; then
6	WRAP_USER=nocat
7	fi
8
9	case $2 in
10	PRE-INSTALL)
11	UID=181
12	GID=${UID}
13	if [ ! -d "${NOCAT_DIR}" ]; then
14	mkdir -p ${NOCAT_DIR}
15	fi
16	if pw user show "${WRAP_USER}" 2>/dev/null; then
17	echo "You already have a user \"${WRAP_USER}\", so I will use it."
18	if pw usermod ${WRAP_USER} -d ${NOCAT_DIR}
19	then
20	echo "Changed home directory of \"${WRAP_USER}\" to \"${NOCAT_DIR}\""
21	else
22	"${NOCAT_DIR}\" failed..."
23	exit 1
24	fi
25	else
26	if pw useradd ${WRAP_USER} -u ${UID} \
27	-d ${NOCAT_DIR} -s /sbin/nologin -c "NoCat Daemon"
28	then
29	echo "Added user \"${WRAP_USER}\"."
30	else
31	echo "Adding user \"${WRAP_USER}\" failed..."
32	exit 1
33	fi
34	fi
35	;;
36	esac