[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / ham / dpbox / patches

File: [cvs.NetBSD.org] / pkgsrc / ham / dpbox / patches / patch-aa (download)

Revision 1.5, Mon Jan 8 03:42:13 2007 UTC (14 years ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, pkgsrc-2007Q1-base, pkgsrc-2007Q1, cwrapper, cube-native-xorg-base, cube-native-xorg, HEAD
Changes since 1.4: +7 -2 lines

Made the package work for unprivileged users by installing the set-uid
binary with 4511 instead of 4111. Generally, there should be no problem
with these binaries being readable by their owner.

$NetBSD: patch-aa,v 1.5 2007/01/08 03:42:13 rillig Exp $

--- Makefile.netbsd.orig	2000-04-27 22:18:57.000000000 +0930
+++ Makefile.netbsd	2006-04-21 10:41:09.000000000 +0930
@@ -1,9 +1,9 @@
 ###############################################################################
 #                                                                             #
-# This is the Makefile of dpbox-5.08 for NetBSD                               #
+# This is the Makefile of dpbox-6.00.00 for NetBSD                            #
 #                                                                             #
-# Version:     1.0.0                                                          #
-# Date   :     16 September 1999                                              #
+# Version:     1.2.0                                                          #
+# Date   :     15 May 2000                                                    #
 # Author :     Berndt Josef Wulf, VK5ABN                                      #
 #                                                                             #
 ###############################################################################
@@ -19,11 +19,12 @@
 INSTALL_CONF	= ${INSTALL} -m 440
 MKDIR		= mkdir -p
 LN		= ln -sf
-
-prefix		= /usr/pkg
+CHMOD		= /bin/chmod
+SED		= /usr/bin/sed
 bindir		= $(prefix)/bin
 sbindir		= $(prefix)/sbin
 confdir		= $(prefix)/share/dpbox/conf
+exampledir	= $(prefix)/share/examples/dpbox/conf
 docdir		= $(prefix)/share/doc/dpbox
 landir		= $(prefix)/share/dpbox/language
 spooldir	= /var/spool/dpbox
@@ -63,10 +64,6 @@
 
 OTHER_SRCS	= dpputlinks.c dpcodeconv.c dpgate.c crawler.c dpmybbs.c
 
-SUBDIRS		= indexes infofiles newmail import save crawler \
-		  fileserv fileserv/incoming fileserv/temp7pl fileserv/newbin \
-		  privserv privserv/temp7pl proto server stat stat/extusers
-
 all:	dpbox crawler cgi toolbox
 
 tgz:
@@ -96,11 +93,12 @@
 	$(INSTALL_PROGRAM) dpbox $(sbindir)
 
 	$(MKDIR) $(bindir)
-	$(INSTALL_PROGRAM) -m u+s,a+x dpgate $(bindir)
+	$(INSTALL_PROGRAM) -m 4511 dpgate $(bindir)
 	$(INSTALL_PROGRAM) dpputlinks $(bindir)
 	$(INSTALL_PROGRAM) dpcodeconv $(bindir)
 	$(INSTALL_PROGRAM) dpmybbs $(bindir)
-	$(INSTALL) -m 555 ../cgi/dpboxcgi/dphttp $(bindir)
+	$(SED) "s,/installdir,$(bindir)," < ../cgi/dpboxcgi/dphttp > $(bindir)/dphttp
+	$(CHMOD) 555 $(bindir)/dphttp
 
 	$(MKDIR) $(docdir)
 	$(INSTALL_DATA) ../document/* $(docdir)
@@ -123,59 +121,51 @@
 	$(LN) HELP_SYS.DL $(landir)/HELP_SYS.HB
 	$(LN) HELP_SYS.DL $(landir)/HELP_SYS.OE1
 
-	for i in $(SUBDIRS); \
-	do \
-		$(MKDIR) $(spooldir)/$$i; \
-	done;
-
 	$(MKDIR) $(prefix)/libexec/dpbox
 	$(INSTALL) -m 555 ../run/* $(prefix)/libexec/dpbox
 	$(INSTALL_PROGRAM) crawler $(prefix)/libexec/dpbox
-	$(INSTALL_DATA) ../crawler/stopwords $(spooldir)/crawler
 
-	@if [ -f ${confdir}/dpbox.ini ]; then \
-	  echo "***********************************************************"; \
-	  echo "*                                                         *"; \
-	  echo "*                      W A R N I N G                      *"; \
-	  echo "*                      =============                      *"; \
-	  echo "*                                                         *"; \
-	  echo "*  A previously installed version of DPBOX was dected     *"; \
-	  echo "*  on this system. The installation of the configuration  *"; \
-	  echo "*  files was suspended in order to preserve the           *"; \
-	  echo "*  old configuration.                                     *"; \
-	  echo "*                                                         *"; \
-	  echo "*  Please refer to the documentation and CHANGE logfile   *"; \
-	  echo "*  and manually adjust the configuration files where      *"; \
-	  echo "*  necessary.                                             *"; \
-	  echo "*                                                         *"; \
-	  echo "***********************************************************"; \
-	else \
-	  $(MKDIR) $(confdir); \
-	  $(INSTALL_CONF) ../dpbox.ini $(confdir)/dpbox.ini; \
-	  $(MKDIR) $(confdir)/system; \
-	  $(INSTALL_CONF) ../system/* $(confdir)/system ; \
-	  $(MKDIR) $(confdir)/sf ; \
-	  $(INSTALL_CONF) ../sf/* $(confdir)/sf; \
-	fi
-
-	@if [ -e ${cgidir} ]; then \
-	  echo "installing cgi-scripts"; \
-	  $(INSTALL) -m 755 ../cgi/cgi/* $(cgidir); \
-	  $(INSTALL_DATA) ../cgi/dpboxcgi/*.html $(cgidir); \
-	fi
-
-	@if [ -e ${httpdir} ]; then \
-	  echo "installing html pages"; \
-	  $(MKDIR) $(httpdir)/dpbox/pic; \
-	  $(INSTALL_DATA) ../cgi/dpbox/*.html $(httpdir)/dpbox; \
-	  $(INSTALL_DATA) ../cgi/dpbox/pic/* $(httpdir)/dpbox/pic; \
-	fi
-
-	@echo 
-	@echo dpbox installation complete
-	@echo 
-	@echo Now edit the configuration files in $(confdir) and 
-	@echo $(confdir)/dpbox.ini!!!
+	$(MKDIR) $(exampledir)
+	$(INSTALL_CONF) ../dpbox.ini $(exampledir)/dpbox.ini
+	$(MKDIR) $(exampledir)/crawler
+	$(INSTALL_DATA) ../crawler/stopwords $(exampledir)/crawler
+	$(MKDIR) $(exampledir)/system
+	$(INSTALL_CONF) ../system/* $(exampledir)/system
+	$(MKDIR) $(exampledir)/sf
+	$(INSTALL_CONF) ../sf/* $(exampledir)/sf
+
+	$(MKDIR) $(cgidir)
+	echo "installing cgi-scripts";
+	@for i in `ls -1 ../cgi/cgi`; \
+	do \
+	  $(SED) "s,/installdir,$(bindir)," < ../cgi/cgi/$$i > $(cgidir)/$$i; \
+	  $(CHMOD) 555 $(cgidir)/$$i; \
+	done; \
+	$(INSTALL_DATA) ../cgi/dpboxcgi/*.html $(cgidir);
+
+	$(MKDIR) $(httpdir)
+	echo "installing html pages";
+	$(MKDIR) $(httpdir)/dpbox/pic;
+	$(INSTALL_DATA) ../cgi/dpbox/*.html $(httpdir)/dpbox;
+	$(INSTALL_DATA) ../cgi/dpbox/pic/* $(httpdir)/dpbox/pic;
+
+	@echo
+	@echo "***********************************************************"
+	@echo "*                                                         *"
+	@echo "* The installation of dpbox is now completed.             *"
+	@echo "*                                                         *"
+	@echo "* Please read the documentation provided with this        *"
+	@echo "* package carefully and edit all configuration files      *"
+	@echo "* to reflect your system setup!                           *"
+	@echo "*                                                         *"
+	@echo "* The documentation can be found in                       *"
+	@echo "*             $(docdir)                    *"
+	@echo "*                                                         *"
+	@echo "* The configuration files are located in                  *"
+	@echo "*             $(confdir)                   *"
+	@echo "*                                                         *"
+	@echo "***********************************************************"
+	@echo
 
 clean:
 	$(RM)  *.o *~ .*~ *.orig *.bak *.s *.core  
@@ -193,4 +183,3 @@
 ifeq (.depend,$(wildcard .depend))
 include .depend
 endif
-