NetBSD Problem Report #19566
Received: (qmail 20800 invoked by uid 605); 26 Dec 2002 13:11:35 -0000
Message-Id: <11250-1040908297@rainier.reedmedia.net>
Date: Thu, 26 Dec 2002 05:11:37 -0800
From: reed@reedmedia.net
Sender: gnats-bugs-owner@netbsd.org
Reply-To: reed@reedmedia.net
To: gnats-bugs@gnats.netbsd.org
Subject: xisp should make the group (patch included)
X-Send-Pr-Version: 3.95
>Number: 19566
>Category: pkg
>Synopsis: comms/xisp assumes dialer group exists (patch included)
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: reed
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Dec 26 13:12:00 +0000 2002
>Closed-Date: Fri Oct 06 22:27:53 +0000 2006
>Last-Modified: Fri Oct 06 22:27:53 +0000 2006
>Originator:
>Release: NetBSD 1.6
>Organization:
http://bsd.reedmedia.net/
>Environment:
System: NetBSD rainier.reedmedia.net 1.6 NetBSD 1.6 (JCR-20020927) #3: Sat Sep 28 13:40:20 PDT 2002 reed@rainier.reedmedia.net:/usr/src/sys/arch/i386/compile/JCR-20020927 i386
Architecture: i386
Machine: i386
>Description:
comms/xisp should build on systems without dialer group.
>How-To-Repeat:
install comms/xisp on system without dialer group and it will fail.
>Fix:
This patch implements a DIALER_GROUP (maybe it should be called
MODEM_GROUP) in mk/bsd.pkg.defaults.mk. Later this should be used for
comms/hylafax, comms/minicom, and the net/ppp package I need to submit.
This patch also takes advantage of this new group for comms/xisp.
--- mk/bsd.pkg.defaults.mk.orig Fri Dec 20 18:07:27 2002
+++ mk/bsd.pkg.defaults.mk Thu Dec 26 04:50:19 2002
@@ -564,6 +564,13 @@
# Possible: YES, NO
# Default: NO
+DIALER_GROUP?= dialer
+# Used in the xisp package to specify the default group for the
+# xisp binaries. Also the modem device and pppd and chat should
+# have access permissions by this group.
+# Possible: dialer, dip, uucp, root, dialout, or any other group
+# Default: dialer
+
DT_LAYOUT?= US
# Used by dt package to specify the keyboard layout.
# Possible: US, FI, FR, GER, DV
--- comms/xisp/patches/patch-aa.orig Thu Dec 26 04:38:14 2002
+++ comms/xisp/patches/patch-aa Thu Dec 26 04:39:02 2002
@@ -94,7 +94,7 @@
-#INSTALL = /usr/bin/install
+INSTPPPDIR = $(PREFIX)/share/examples/xisp
+DESTDIR =
-+GROUP = dialer
++GROUP = $(DIALER_GROUP)
+GCCFLAGS = -Wall -O
+EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
+EXTRALIBS = -lcrypt
--- comms/xisp/Makefile.orig Wed Dec 25 12:07:05 2002
+++ comms/xisp/Makefile Thu Dec 26 05:03:15 2002
@@ -12,6 +12,14 @@
HOMEPAGE= http://xisp.hellug.gr/
COMMENT= User-friendly X11 interface to pppd/chat
+DIALER_GROUP?= dialer
+PKG_GROUPS= ${DIALER_GROUP}
+BUILD_DEFS+= DIALER_GROUP
+
+MESSAGE_SUBST+= DIALER_GROUP=${DIALER_GROUP}
+
+MAKE_ENV+= DIALER_GROUP="${DIALER_GROUP}"
+
USE_BUILDLINK2= YES
USE_X11BASE= YES
@@ -24,4 +32,5 @@
.include "../../graphics/xpm/buildlink2.mk"
.include "../../x11/xforms/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
--- comms/xisp/MESSAGE.orig Thu Dec 26 04:50:43 2002
+++ comms/xisp/MESSAGE Thu Dec 26 04:51:41 2002
@@ -11,7 +11,7 @@
${X11BASE}/share/examples/xisp/peers/xisp_modem to /etc/ppp/peers
${X11BASE}/share/examples/xisp/peers/xisp_dialer to /etc/ppp/peers
-and make sure the file ownerships are set for user "root" and group "dialer"
-to be able to fully use this package.
+and make sure the file ownerships are set for user "root" and group
+"${DIALER_GROUP}" to be able to fully use this package.
===========================================================================
--- comms/xisp/distinfo.orig Thu Dec 26 04:57:40 2002
+++ comms/xisp/distinfo Thu Dec 26 04:57:47 2002
@@ -2,4 +2,4 @@
SHA1 (xisp-2.6p1.tar.gz) = 5e6f1795f20b22fd26212215b86b505e00d43b9e
Size (xisp-2.6p1.tar.gz) = 260645 bytes
-SHA1 (patch-aa) = 73d3a226124082f9f98e616e8b0bf1b7d8f26f04
+SHA1 (patch-aa) = c1a0de28a48d94412024c15fcf5a71effccc6268
>Release-Note:
>Audit-Trail:
From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@gnats.netbsd.org
Cc:
Subject: pkg/19566
Date: Mon, 31 Mar 2003 19:02:24 -0800 (PST)
Please update xisp to newer version. Old distfile not on download sites
anymore.
This needs to be tested more. But here is a patch (which includes creating
group). (Also use patch already in the PR for the mk/bsd.pkg.defaults.mk
defaults.)
Jeremy C. Reed
Index: comms/xisp/MESSAGE
===================================================================
RCS file: /cvsroot/pkgsrc/comms/xisp/MESSAGE,v
retrieving revision 1.1
diff -b -u -r1.1 MESSAGE
--- comms/xisp/MESSAGE 2001/10/31 20:44:44 1.1
+++ comms/xisp/MESSAGE 2003/04/01 02:55:53
@@ -11,7 +11,7 @@
${X11BASE}/share/examples/xisp/peers/xisp_modem to /etc/ppp/peers
${X11BASE}/share/examples/xisp/peers/xisp_dialer to /etc/ppp/peers
-and make sure the file ownerships are set for user "root" and group "dialer"
-to be able to fully use this package.
+and make sure the file ownerships are set for user "root" and group
+"${DIALER_GROUP}" to be able to fully use this package.
===========================================================================
Index: comms/xisp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/xisp/Makefile,v
retrieving revision 1.15
diff -b -u -r1.15 Makefile
--- comms/xisp/Makefile 2002/12/28 21:22:54 1.15
+++ comms/xisp/Makefile 2003/04/01 02:55:53
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.15 2002/12/28 21:22:54 jschauma Exp $
#
-DISTNAME= xisp-2.6p1
-PKGREVISION= 2
+DISTNAME= xisp-2.7
CATEGORIES= comms x11
MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/network/serial/} \
http://xisp.hellug.gr/release/ \
@@ -11,6 +10,15 @@
MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://xisp.hellug.gr/
COMMENT= User-friendly X11 interface to pppd/chat
+
+USE_PKGINSTALL= YES
+DIALER_GROUP?= dialer
+PKG_GROUPS= ${DIALER_GROUP}
+BUILD_DEFS+= DIALER_GROUP
+
+MESSAGE_SUBST+= DIALER_GROUP=${DIALER_GROUP}
+
+MAKE_ENV+= DIALER_GROUP="${DIALER_GROUP}"
USE_BUILDLINK2= YES
USE_X11BASE= YES
Index: comms/xisp/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/comms/xisp/distinfo,v
retrieving revision 1.5
diff -b -u -r1.5 distinfo
--- comms/xisp/distinfo 2002/09/21 23:17:24 1.5
+++ comms/xisp/distinfo 2003/04/01 02:55:53
@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.5 2002/09/21 23:17:24 jlam Exp $
-SHA1 (xisp-2.6p1.tar.gz) = 5e6f1795f20b22fd26212215b86b505e00d43b9e
-Size (xisp-2.6p1.tar.gz) = 260645 bytes
-SHA1 (patch-aa) = 73d3a226124082f9f98e616e8b0bf1b7d8f26f04
+SHA1 (xisp-2.7.tar.gz) = 4009d00bf5149ba3a3afac519b7e8d22839c4bf4
+Size (xisp-2.7.tar.gz) = 294184 bytes
+SHA1 (patch-aa) = 9a062ead4a0fbe9c21d9d7cd1a04db8408076601
Index: comms/xisp/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/comms/xisp/patches/patch-aa,v
retrieving revision 1.7
diff -b -u -r1.7 patch-aa
--- comms/xisp/patches/patch-aa 2002/09/21 23:17:25 1.7
+++ comms/xisp/patches/patch-aa 2003/04/01 02:55:53
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.7 2002/09/21 23:17:25 jlam Exp $
-
---- Makefile.orig Thu Aug 26 08:08:51 1999
-+++ Makefile Wed Apr 17 14:55:31 2002
-@@ -8,11 +8,11 @@
+--- Makefile.orig Sat Nov 24 04:48:51 2001
++++ Makefile Mon Mar 31 18:23:04 2003
+@@ -12,12 +12,12 @@
# Compilation/installation vars (global for all following sections) |
#=====================================================================
#
+-CC = gcc
-PREFIX = /usr/local
-X11PREFIX = /usr/X11R6
-INCX11 = $(X11PREFIX)/include
-LIBX11 = $(X11PREFIX)/lib
-INCFORMS = $(X11PREFIX)/include
++#CC = $(GCC)
+#PREFIX = /usr/local
+#X11PREFIX = /usr/X11R6
+INCX11 = $(X11BASE)/include
@@ -19,10 +19,10 @@
LIBFORMS = $(X11PREFIX)/lib
MODEM_DEV = modem
MODEM_PATH = /dev/$(MODEM_DEV)
-@@ -24,25 +24,25 @@
- # Normal (i.e. SuSE-6.x) vars; for SuSE-5.x use the lines which
- # DO NOT include -lcrypt in EXTRALIBS and -DGLIBC2 in EXTRADEFS.
- #----------------------------------------------------------------
+@@ -29,26 +29,26 @@
+ # Normal (i.e. SuSE-6.x,7.x) vars; for SuSE-5.x use the lines which
+ # DO NOT include -lcrypt for EXTRALIBS and -DGLIBC2 for EXTRADEFS.
+ #-------------------------------------------------------------------
-BINX11 = $(X11PREFIX)/bin
-USRLOCAL = $(PREFIX)/bin
-SBINDIR = /usr/sbin
@@ -32,9 +32,10 @@
-MANDIR = $(X11PREFIX)/man/man1
-ETCPPP = /etc/ppp
-INSTPPPDIR = $(ETCPPP)
+-PPPDLCKDIR = /var/lock
-DESTDIR =
-GROUP = uucp
--GCCFLAGS = -Wall -O
+-CCFLAGS = -Wall -O
-EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2
+#BINX11 = $(X11PREFIX)/bin
+#USRLOCAL = $(PREFIX)/bin
@@ -45,9 +46,10 @@
+#MANDIR = $(X11PREFIX)/man/man1
+#ETCPPP = /etc/ppp
+#INSTPPPDIR = $(ETCPPP)
++#PPPDLCKDIR = /var/lock
+#DESTDIR =
+#GROUP = uucp
-+#GCCFLAGS = -Wall -O
++#CCFLAGS = -Wall -O
+#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2
#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\"
-EXTRALIBS = -lcrypt
@@ -62,7 +64,7 @@
#
# Debian vars (if your Debian distribution is relatively
# old and does not use glibc2, use the lines which DO NOT
-@@ -166,24 +166,24 @@
+@@ -187,25 +187,25 @@
#
# NetBSD vars
#-------------
@@ -84,18 +86,20 @@
+OPTSDIR = $(ETCPPP)
#INSTPPPDIR = $(ETCPPP)
-##INSTPPPDIR = $(PREFIX)/share/examples/xisp
+-#PPPDLCKDIR = /var/spool/lock
-#DESTDIR =
-#GROUP = dialer
--#GCCFLAGS = -Wall -O
+-#CCFLAGS = -Wall -O
-#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
-#EXTRALIBS = -lcrypt
-#LINKX11 = -Wl,-R$(LIBX11)
-#LINKFORMS = -L$(LIBFORMS) -lforms
-#INSTALL = /usr/bin/install
+INSTPPPDIR = $(PREFIX)/share/examples/xisp
++PPPDLCKDIR = /var/spool/lock
+DESTDIR =
-+GROUP = dialer
-+GCCFLAGS = -Wall -O
++GROUP = $(DIALER_GROUP)
++CCFLAGS = -Wall -O
+EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
+EXTRALIBS = -lcrypt
+LINKX11 = -Wl,-R$(LIBX11) -Wl,-R$(LOCALBASE)/lib
@@ -104,32 +108,30 @@
#
# FreeBSD vars
#-------------
-@@ -261,16 +261,16 @@
- gcc $(GCCOPTS) -c network.c
-
- xispdial: xispdial.c common.h version.h
-- gcc $(GCCOPTS) -o xispdial xispdial.c
-+ gcc $(GCCOPTS) $(LINKX11) -o xispdial xispdial.c
-
- xisprccv: xisprccv.o pcode.o
-- gcc -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) -lm
-+ gcc -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) $(LINKX11) -lm
+@@ -328,7 +328,7 @@
+ $(CC) $(CCOPTS) -o xispdial xispdial.o $(SHAREOBJ)
- xisprccv.o: xisprccv.c common.h version.h pcode.h logs.h
- gcc $(GCCOPTS) -c xisprccv.c
+ xispdial.o: xispdial.c common.h version.h
+- $(CC) $(CCOPTS) -c xispdial.c
++ $(CC) $(CCOPTS) $(LINKX11) -c xispdial.c
+
+ xisprccv: xisprccv.o pcode.o $(SHAREOBJ)
+ $(CC) -o xisprccv xisprccv.o pcode.o $(SHAREOBJ) $(EXTRALIBS) -lm
+@@ -337,7 +337,7 @@
+ $(CC) $(CCOPTS) -c xisprccv.c
xispterm: xispterm.h xispterm.c
-- gcc $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lX11 -lm
-+ gcc $(GCCOPTS) $(LINKX11) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lX11 -lm
+- $(CC) $(CCOPTS) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c \
++ $(CC) $(CCOPTS) $(LINKX11) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c \
+ $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lXpm -lX11 -lm
rcio.o: rcio.h rcio.c common.h version.h
- gcc $(GCCOPTS) -c rcio.c
-@@ -279,7 +279,7 @@
- gcc $(GCCOPTS) -c logs.c
+@@ -350,7 +350,7 @@
+ $(CC) $(CCOPTS) -c xisp_euidaccess.c
xispid: xispid.c
-- gcc $(GCCOPTS) -o xispid xispid.c
-+ gcc $(GCCOPTS) $(LINKX11) -o xispid xispid.c
+- $(CC) $(CCOPTS) -o xispid xispid.c
++ $(CC) $(CCOPTS) $(LINKX11) -o xispid xispid.c
- install: xisp xispdial xisprccv xispterm xispid
- if [ ! -d $(DESTDIR)$(BINX11) ]; then $(INSTALL) -d $(DESTDIR)$(BINX11); fi
+ xisp.1: xisp.man
+ sed -e s,@ETCPPP@,$(DESTDIR)$(ETCPPP),g \
From: Min Sik Kim <minskim@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: pr/19566 CVS commit: pkgsrc
Date: Mon, 7 Jun 2004 14:47:34 +0000 (UTC)
Module Name: pkgsrc
Committed By: minskim
Date: Mon Jun 7 14:47:34 UTC 2004
Modified Files:
pkgsrc/comms/xisp: Makefile distinfo
pkgsrc/comms/xisp/patches: patch-aa
pkgsrc/doc: CHANGES TODO
Log Message:
Update xisp to 2.7p1, because 2.6p1 doesn't build with gcc>=3.3. This
partially addresses PR pkg/19566.
See http://xisp.hellug.gr/history.html for changes since 2.6p1.
To generate a diff of this commit:
cvs rdiff -r1.19 -r1.20 pkgsrc/comms/xisp/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/comms/xisp/distinfo
cvs rdiff -r1.7 -r1.8 pkgsrc/comms/xisp/patches/patch-aa
cvs rdiff -r1.6180 -r1.6181 pkgsrc/doc/CHANGES
cvs rdiff -r1.1823 -r1.1824 pkgsrc/doc/TODO
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Responsible-Changed-From-To: pkg-manager->reed
Responsible-Changed-By: joerg@netbsd.org
Responsible-Changed-When: Mon, 02 Oct 2006 19:05:09 +0000
Responsible-Changed-Why:
Eat^WFix your own bugs.
From: "Jeremy C. Reed" <reed@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc:
Subject: PR/19566 CVS commit: pkgsrc/comms/xisp
Date: Fri, 6 Oct 2006 22:14:44 +0000 (UTC)
Module Name: pkgsrc
Committed By: reed
Date: Fri Oct 6 22:14:44 UTC 2006
Modified Files:
pkgsrc/comms/xisp: MESSAGE Makefile distinfo
pkgsrc/comms/xisp/patches: patch-aa patch-ac
Log Message:
This adds a mk.conf setting for the xisp "dialer" group. I call it
"DIALER_GROUP" instead of "XISP_GROUP" as maybe it can be used for other
packages also later.
This is for PR pkg/19566.
Update MESSAGE to use LOCALBASE instead of X11BASE. (From
Manuel Bouyer)
And update MESSAGE to not hardcode the "group".
This also updates patch-ac because of conflicting types for fprintf and
printf. I don't know how this package built before on NetBSD recently.
Also this patch honors VARBASE and PKGMANDIR.
Thank you Manuel Bouyer for testing this.
To generate a diff of this commit:
cvs rdiff -r1.1 -r1.2 pkgsrc/comms/xisp/MESSAGE
cvs rdiff -r1.25 -r1.26 pkgsrc/comms/xisp/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/comms/xisp/distinfo
cvs rdiff -r1.9 -r1.10 pkgsrc/comms/xisp/patches/patch-aa
cvs rdiff -r1.3 -r1.4 pkgsrc/comms/xisp/patches/patch-ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: reed@netbsd.org
State-Changed-When: Fri, 06 Oct 2006 22:27:53 +0000
State-Changed-Why:
Committed this improvement.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.