mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-28 01:06:17 +00:00
o) Delete needlessly patches
o) Install sample config and add them to pkg-plist Submitted by: Andrzej Tobola <A.Tobola@wilk.2a.pl>
This commit is contained in:
Lars Koeller
parent
c1d5a3efd7
commit
a98e8965c6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=97335
@ -95,8 +95,10 @@ post-install:
|
||||
${ECHO_CMD} "@dirrm etc/apcupsd" >> ${TMPPLIST}
|
||||
${ECHO_CMD} "@unexec if [ -d %D/etc/apcupsd ]; then echo \"If you are permanently removing this port, you should do a ``rm -rf ${PREFIX}/etc/apcupsd`` to remove config files left.\" | fmt ; fi" >> ${TMPPLIST}
|
||||
# Install sample startup script
|
||||
${INSTALL_SCRIPT} ${FILESDIR}/${STARTUP_SCRIPT} \
|
||||
${PREFIX}/etc/rc.d/${STARTUP_SCRIPT}
|
||||
${INSTALL_SCRIPT} ${FILESDIR}/${STARTUP_SCRIPT} ${PREFIX}/etc/rc.d/${STARTUP_SCRIPT}
|
||||
${INSTALL_DATA} ${FILESDIR}/apcupsd.conf.net-master.sample ${PREFIX}/etc/apcupsd/
|
||||
${INSTALL_DATA} ${FILESDIR}/apcupsd.conf.net-slave.sample ${PREFIX}/etc/apcupsd/
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
@${MKDIR} ${DOCSDIR}
|
||||
.for filen in ${PORTDOCS}
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
*** configure.orig Fri Oct 3 21:22:27 2003
|
||||
--- configure Sat Nov 1 13:36:46 2003
|
||||
***************
|
||||
*** 8530,8536 ****
|
||||
LDFLAGS="${LDFLAGS} -L$withval/lib"
|
||||
fi
|
||||
|
||||
! LIBS="${LIBS} -lwrap -lnsl"
|
||||
|
||||
if test "${ac_cv_header_tcpd_h+set}" = set; then
|
||||
echo "$as_me:$LINENO: checking for tcpd.h" >&5
|
||||
--- 8530,8536 ----
|
||||
LDFLAGS="${LDFLAGS} -L$withval/lib"
|
||||
fi
|
||||
|
||||
! LIBS="${LIBS} -lwrap"
|
||||
|
||||
if test "${ac_cv_header_tcpd_h+set}" = set; then
|
||||
echo "$as_me:$LINENO: checking for tcpd.h" >&5
|
||||
***************
|
||||
*** 9035,9041 ****
|
||||
LDFLAGS=${_ldflags}
|
||||
GDINCLUDE='-I$(topdir)/src/gd1.2'
|
||||
LIBGD=gd1.2
|
||||
! LIBGDOBJ='$(topdir)/src/gd1.2/libgd.a'
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define IMGFMT_GIF 1
|
||||
_ACEOF
|
||||
--- 9035,9041 ----
|
||||
LDFLAGS=${_ldflags}
|
||||
GDINCLUDE='-I$(topdir)/src/gd1.2'
|
||||
LIBGD=gd1.2
|
||||
! LIBGDOBJ='$(topdir)/src/gd1.2/libgd.a -lm'
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define IMGFMT_GIF 1
|
||||
_ACEOF
|
||||
@ -1,196 +0,0 @@
|
||||
*** doc/apcupsd.man.orig Sun Nov 2 11:39:52 2003
|
||||
--- doc/apcupsd.man Sun Nov 2 11:45:58 2003
|
||||
***************
|
||||
*** 8,22 ****
|
||||
.SH NAME
|
||||
apcupsd \- daemon for most APC's UPS for Linux
|
||||
.SH SYNOPSIS
|
||||
! .B /sbin/apcupsd
|
||||
.br
|
||||
! .B /etc/apcupsd/apccontrol
|
||||
.br
|
||||
! .B /etc/apcupsd/apcupsd.conf
|
||||
.br
|
||||
! .B /sbin/apcaccess
|
||||
.br
|
||||
! .B /sbin/apcnetd
|
||||
.br
|
||||
.SH DESCRIPTION
|
||||
.LP
|
||||
--- 8,22 ----
|
||||
.SH NAME
|
||||
apcupsd \- daemon for most APC's UPS for Linux
|
||||
.SH SYNOPSIS
|
||||
! .B %PREFIX%/sbin/apcupsd
|
||||
.br
|
||||
! .B %PREFIX%/etc/apcupsd/apccontrol
|
||||
.br
|
||||
! .B %PREFIX%/etc/apcupsd/apcupsd.conf
|
||||
.br
|
||||
! .B %PREFIX%/sbin/apcaccess
|
||||
.br
|
||||
! .B %PREFIX%/sbin/apcnetd
|
||||
.br
|
||||
.SH DESCRIPTION
|
||||
.LP
|
||||
***************
|
||||
*** 29,35 ****
|
||||
above shutdown conditions is met, "apcupsd" will inform users about this
|
||||
fact.
|
||||
|
||||
! The shutdown is made by script calls to "/etc/apcupsd/apccontrol", which
|
||||
is called by "apcupsd". Consequently, no changes to /etc/inittab are necessary.
|
||||
There is no communication between "apcupsd" and init(1) process.
|
||||
Apcupsd modifies the halt script so that at the end of the shutdown
|
||||
--- 29,35 ----
|
||||
above shutdown conditions is met, "apcupsd" will inform users about this
|
||||
fact.
|
||||
|
||||
! The shutdown is made by script calls to "%PREFIX%/etc/apcupsd/apccontrol", which
|
||||
is called by "apcupsd". Consequently, no changes to /etc/inittab are necessary.
|
||||
There is no communication between "apcupsd" and init(1) process.
|
||||
Apcupsd modifies the halt script so that at the end of the shutdown
|
||||
***************
|
||||
*** 58,71 ****
|
||||
.TP
|
||||
.B \-c --configure
|
||||
Attempts to configure the UPS EPROM to the values specified in the
|
||||
! configuration file "/etc/apcupsd/apcupsd.conf".
|
||||
.TP
|
||||
.B \-d --debug <level>
|
||||
Turns on debugging output for a NETSLAVE or a NETMASTER.
|
||||
.TP
|
||||
.B \-f --config-file <file>
|
||||
Specifies the location of the configuration file. The default
|
||||
! is: /etc/apcupsd/apcupsd.conf
|
||||
.TP
|
||||
.B \-k --killpower
|
||||
Attempt to turn the UPS off. This option is normally only
|
||||
--- 58,71 ----
|
||||
.TP
|
||||
.B \-c --configure
|
||||
Attempts to configure the UPS EPROM to the values specified in the
|
||||
! configuration file "%PREFIX%/etc/apcupsd/apcupsd.conf".
|
||||
.TP
|
||||
.B \-d --debug <level>
|
||||
Turns on debugging output for a NETSLAVE or a NETMASTER.
|
||||
.TP
|
||||
.B \-f --config-file <file>
|
||||
Specifies the location of the configuration file. The default
|
||||
! is: %PREFIX%/etc/apcupsd/apcupsd.conf
|
||||
.TP
|
||||
.B \-k --killpower
|
||||
Attempt to turn the UPS off. This option is normally only
|
||||
***************
|
||||
*** 74,80 ****
|
||||
.TP
|
||||
.B \-n --rename-ups
|
||||
Attempts to change the UPS name stored in the UPS EPROM
|
||||
! to that specified in your "/etc/apcupsd/apcupsd.conf" file.
|
||||
.TP
|
||||
.B \-u --update-battery-date
|
||||
Attempts to update the battery date stored in the UPS EPROM. Normally
|
||||
--- 74,80 ----
|
||||
.TP
|
||||
.B \-n --rename-ups
|
||||
Attempts to change the UPS name stored in the UPS EPROM
|
||||
! to that specified in your "%PREFIX%/etc/apcupsd/apcupsd.conf" file.
|
||||
.TP
|
||||
.B \-u --update-battery-date
|
||||
Attempts to update the battery date stored in the UPS EPROM. Normally
|
||||
***************
|
||||
*** 88,99 ****
|
||||
|
||||
.SH CONFIGURATION
|
||||
It may be necessary to change the configuration information in the file
|
||||
! "/etc/apcupsd/apcupsd.conf" to meet your needs and to correspond to your
|
||||
configuration. This file is a plain ASCII file and you can use your
|
||||
favorite editor to change it.
|
||||
.LP
|
||||
Configuration commands in
|
||||
! .B /etc/apcupsd/apcupsd.conf
|
||||
are:
|
||||
|
||||
.LP
|
||||
--- 88,99 ----
|
||||
|
||||
.SH CONFIGURATION
|
||||
It may be necessary to change the configuration information in the file
|
||||
! "%PREFIX%/etc/apcupsd/apcupsd.conf" to meet your needs and to correspond to your
|
||||
configuration. This file is a plain ASCII file and you can use your
|
||||
favorite editor to change it.
|
||||
.LP
|
||||
Configuration commands in
|
||||
! .B %PREFIX%/etc/apcupsd/apcupsd.conf
|
||||
are:
|
||||
|
||||
.LP
|
||||
***************
|
||||
*** 163,169 ****
|
||||
If you want the apcupsd network information server to provide
|
||||
the last 10 events via the network, you must specify a
|
||||
file where apcupsd will save these events. The default is:
|
||||
! /etc/apcupsd/apcupsd.events. Currently, apcupsd will save
|
||||
at most the last 50 events. When more than 50 events are
|
||||
recorded and a network request for the events arrives,
|
||||
the network server will truncate the file to
|
||||
--- 163,169 ----
|
||||
If you want the apcupsd network information server to provide
|
||||
the last 10 events via the network, you must specify a
|
||||
file where apcupsd will save these events. The default is:
|
||||
! /var/log/apcupsd.events. Currently, apcupsd will save
|
||||
at most the last 50 events. When more than 50 events are
|
||||
recorded and a network request for the events arrives,
|
||||
the network server will truncate the file to
|
||||
***************
|
||||
*** 524,536 ****
|
||||
are disabled or set to default values. Currently, there is not a known
|
||||
way for early signals to be sent to BASIC Ports. MINUTES are set to 0.
|
||||
.SH FILES
|
||||
! .B /etc/apcupsd/apcupsd.conf
|
||||
- configuration file.
|
||||
.br
|
||||
! .B /etc/apcupsd/apcupsd.status
|
||||
- STATUS file
|
||||
.br
|
||||
! .B /etc/apcupsd/apcupsd.events
|
||||
- where up to the last 50 events are stored
|
||||
for the network information server.
|
||||
.SH EVENTS
|
||||
--- 524,536 ----
|
||||
are disabled or set to default values. Currently, there is not a known
|
||||
way for early signals to be sent to BASIC Ports. MINUTES are set to 0.
|
||||
.SH FILES
|
||||
! .B %PREFIX%/etc/apcupsd/apcupsd.conf
|
||||
- configuration file.
|
||||
.br
|
||||
! .B /var/log/apcupsd.status
|
||||
- STATUS file
|
||||
.br
|
||||
! .B /var/log/apcupsd.events
|
||||
- where up to the last 50 events are stored
|
||||
for the network information server.
|
||||
.SH EVENTS
|
||||
***************
|
||||
*** 539,548 ****
|
||||
...
|
||||
|
||||
These events are sent to the system log, optionally sent
|
||||
! to the temporary events file (/etc/apcupsd/apcupsd.events),
|
||||
! and they also generate a call to /etc/apcupsd/apccontrol
|
||||
which in turn will call any scripts you have placed in the
|
||||
! /etc/apcupsd directory.
|
||||
|
||||
.SH DATA format
|
||||
If the DATATIME configuration command is set nonzero,
|
||||
--- 539,548 ----
|
||||
...
|
||||
|
||||
These events are sent to the system log, optionally sent
|
||||
! to the temporary events file (/var/log/apcupsd.events),
|
||||
! and they also generate a call to %PREFIX%/etc/apcupsd/apccontrol
|
||||
which in turn will call any scripts you have placed in the
|
||||
! %PREFIX%/etc/apcupsd directory.
|
||||
|
||||
.SH DATA format
|
||||
If the DATATIME configuration command is set nonzero,
|
||||
@ -1,25 +0,0 @@
|
||||
*** platforms/Makefile.in.orig Sat Nov 1 13:40:40 2003
|
||||
--- platforms/Makefile.in Sat Nov 1 13:41:12 2003
|
||||
***************
|
||||
*** 32,41 ****
|
||||
echo " Found old apccontrol moving it to $(DESTDIR)$(sysconfdir)/apccontrol.orig"; \
|
||||
fi
|
||||
@if test -f ./$(DISTNAME)/apccontrol; then \
|
||||
! $(INSTALL_PROGRAM) -m 744 ./$(DISTNAME)/apccontrol \
|
||||
$(DESTDIR)$(sysconfdir)/apccontrol; \
|
||||
else \
|
||||
! $(INSTALL_PROGRAM) -m 744 ./apccontrol \
|
||||
$(DESTDIR)$(sysconfdir)/apccontrol; \
|
||||
fi
|
||||
(cd etc/; $(MAKE) DESTDIR=$(DESTDIR) install)
|
||||
--- 32,41 ----
|
||||
echo " Found old apccontrol moving it to $(DESTDIR)$(sysconfdir)/apccontrol.orig"; \
|
||||
fi
|
||||
@if test -f ./$(DISTNAME)/apccontrol; then \
|
||||
! $(INSTALL_SCRIPT) -m 744 ./$(DISTNAME)/apccontrol \
|
||||
$(DESTDIR)$(sysconfdir)/apccontrol; \
|
||||
else \
|
||||
! $(INSTALL_SCRIPT) -m 744 ./apccontrol \
|
||||
$(DESTDIR)$(sysconfdir)/apccontrol; \
|
||||
fi
|
||||
(cd etc/; $(MAKE) DESTDIR=$(DESTDIR) install)
|
||||
@ -1,19 +0,0 @@
|
||||
*** platforms/etc/Makefile.in.orig Sat Nov 1 13:46:41 2003
|
||||
--- platforms/etc/Makefile.in Sat Nov 1 13:47:05 2003
|
||||
***************
|
||||
*** 34,40 ****
|
||||
$(RMF) $(DESTDIR)$(sysconfdir)/$$src.orig; \
|
||||
mv $(DESTDIR)$(sysconfdir)/$$src $(DESTDIR)$(sysconfdir)/$$src.orig; \
|
||||
fi; \
|
||||
! $(INSTALL_PROGRAM) $$src $(DESTDIR)$(sysconfdir)/$$src; \
|
||||
done
|
||||
|
||||
uninstall:
|
||||
--- 34,40 ----
|
||||
$(RMF) $(DESTDIR)$(sysconfdir)/$$src.orig; \
|
||||
mv $(DESTDIR)$(sysconfdir)/$$src $(DESTDIR)$(sysconfdir)/$$src.orig; \
|
||||
fi; \
|
||||
! $(INSTALL_SCRIPT) $$src $(DESTDIR)$(sysconfdir)/$$src; \
|
||||
done
|
||||
|
||||
uninstall:
|
||||
@ -1,127 +0,0 @@
|
||||
|
||||
This patch fixes a segfault during startup of apcupsd when
|
||||
running with the USB driver. To apply it:
|
||||
|
||||
cd <apcupsd-source>
|
||||
patch -p0 <3.10.6-1-usb-segfault.patch
|
||||
make
|
||||
...
|
||||
|
||||
|
||||
|
||||
? find.syslog
|
||||
? src/drivers/snmp/drv_powernet.c.new
|
||||
? src/drivers/snmp/powernet-mib-mgr.c.new
|
||||
? src/drivers/snmp/powernet-mib.h.new
|
||||
? src/lib/stfSJuzf
|
||||
Index: ChangeLog
|
||||
===================================================================
|
||||
RCS file: /cvsroot/apcupsd/apcupsd/ChangeLog,v
|
||||
retrieving revision 1.36
|
||||
diff -u -b -r1.36 ChangeLog
|
||||
--- ChangeLog 11 Oct 2003 09:45:20 -0000 1.36
|
||||
+++ ChangeLog 27 Oct 2003 19:49:44 -0000
|
||||
@@ -5,6 +5,10 @@
|
||||
/* http://sourceforge.net/projects/apcupsd */
|
||||
/***************************************************************************/
|
||||
|
||||
+28Oct03
|
||||
+- Bob Kuo found a bug that caused a seg fault, which was due
|
||||
+ to my code that walked off the end of a table in linux-usb.c
|
||||
+
|
||||
----> Release apcupsd-3.10.6 (10 October 2003)
|
||||
11Oct03
|
||||
- Release 3.10.6 10Oct03 as offical stable version.
|
||||
Index: doc/home-page/support.html
|
||||
===================================================================
|
||||
RCS file: /cvsroot/apcupsd/apcupsd/doc/home-page/support.html,v
|
||||
retrieving revision 1.6
|
||||
diff -u -b -r1.6 support.html
|
||||
--- doc/home-page/support.html 18 Oct 2003 11:32:49 -0000 1.6
|
||||
+++ doc/home-page/support.html 27 Oct 2003 19:49:47 -0000
|
||||
@@ -52,6 +52,11 @@
|
||||
you must replace the <b>at</b> with an @ symbol.
|
||||
Please see <b>Information Needed</b> below for what to
|
||||
include in your support request.
|
||||
+p>I get a number of "off-list" emails sent
|
||||
+directly to me. Please always copy the appropriate list, if you
|
||||
+do not copy the list, I may not answer you, or I will answer by copying
|
||||
+the list. If you <em>really</em> have something confidential,
|
||||
+please clearly indicate it.
|
||||
<p>The second way is to use the support tracking tool on SourceForge at
|
||||
<a href="http://sourceforge.net/tracker/?group_id=54413&func=browse">
|
||||
http://sourceforge.net/tracker/?group_id=54413&func=browse</a>.<br>This
|
||||
Index: doc/home-page/support.wml
|
||||
===================================================================
|
||||
RCS file: /cvsroot/apcupsd/apcupsd/doc/home-page/support.wml,v
|
||||
retrieving revision 1.2
|
||||
diff -u -b -r1.2 support.wml
|
||||
--- doc/home-page/support.wml 22 Jun 2003 15:57:37 -0000 1.2
|
||||
+++ doc/home-page/support.wml 27 Oct 2003 19:49:47 -0000
|
||||
@@ -15,6 +15,11 @@
|
||||
you must replace the <b>at</b> with an @ symbol.
|
||||
Please see <b>Information Needed</b> below for what to
|
||||
include in your support request.
|
||||
+p>I get a number of "off-list" emails sent
|
||||
+directly to me. Please always copy the appropriate list, if you
|
||||
+do not copy the list, I may not answer you, or I will answer by copying
|
||||
+the list. If you <em>really</em> have something confidential,
|
||||
+please clearly indicate it.
|
||||
|
||||
<p>The second way is to use the support tracking tool on SourceForge at
|
||||
<a href="http://sourceforge.net/tracker/?group_id=54413&func=browse">
|
||||
Index: doc/techlogs/kes-3.10.6
|
||||
===================================================================
|
||||
RCS file: /cvsroot/apcupsd/apcupsd/doc/techlogs/kes-3.10.6,v
|
||||
retrieving revision 1.33
|
||||
diff -u -b -r1.33 kes-3.10.6
|
||||
--- doc/techlogs/kes-3.10.6 3 Oct 2003 19:22:29 -0000 1.33
|
||||
+++ doc/techlogs/kes-3.10.6 27 Oct 2003 19:49:48 -0000
|
||||
@@ -1,11 +1,14 @@
|
||||
Technical notes on version 3.10.6
|
||||
- 04 October 2003
|
||||
+ 28 October 2003
|
||||
Kern Sibbald
|
||||
|
||||
General:
|
||||
|
||||
Changes submitted this submission:
|
||||
-03Oct03
|
||||
+28Oct03
|
||||
+- Bob Kuo found a bug that caused a seg fault, which was due
|
||||
+ to my code that walked off the end of a table in linux-usb.c
|
||||
+03Oct03 Released here
|
||||
- Move the old manual to old_documents and commit the
|
||||
new docbook manual to the CVS. Don't include the web
|
||||
html directory.
|
||||
Index: include/version.h
|
||||
===================================================================
|
||||
RCS file: /cvsroot/apcupsd/apcupsd/include/version.h,v
|
||||
retrieving revision 1.49
|
||||
diff -u -b -r1.49 version.h
|
||||
--- include/version.h 11 Oct 2003 09:45:20 -0000 1.49
|
||||
+++ include/version.h 27 Oct 2003 19:49:48 -0000
|
||||
@@ -2,5 +2,5 @@
|
||||
#define AVERSION 3
|
||||
#define VERSION "3.10.6"
|
||||
#define VSTRING "3106"
|
||||
-#define ADATE "10 October 2003"
|
||||
-#define LSMDATE "10Oct03"
|
||||
+#define ADATE "28 October 2003"
|
||||
+#define LSMDATE "28Oct03"
|
||||
Index: src/drivers/usb/linux-usb.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/apcupsd/apcupsd/src/drivers/usb/linux-usb.c,v
|
||||
retrieving revision 1.19
|
||||
diff -u -b -r1.19 linux-usb.c
|
||||
--- src/drivers/usb/linux-usb.c 29 Sep 2003 13:37:40 -0000 1.19
|
||||
+++ src/drivers/usb/linux-usb.c 27 Oct 2003 19:49:50 -0000
|
||||
@@ -731,7 +731,7 @@
|
||||
* know_info table and see if we have a match.
|
||||
* If so, allocate a new entry for it.
|
||||
*/
|
||||
- for (k=0; k <= (int)KNOWN_INFO_SZ; k++) {
|
||||
+ for (k=0; k < (int)KNOWN_INFO_SZ; k++) {
|
||||
USB_INFO *info;
|
||||
int ci = known_info[k].ci;
|
||||
|
||||
@ -2,6 +2,8 @@ sbin/apcupsd
|
||||
sbin/apcaccess
|
||||
sbin/apcnisd
|
||||
%%POWERFL%%sbin/powerflute
|
||||
etc/apcupsd/apcupsd.conf.net-master.sample
|
||||
etc/apcupsd/apcupsd.conf.net-slave.sample
|
||||
etc/apcupsd/apccontrol
|
||||
etc/apcupsd/changeme
|
||||
etc/apcupsd/commfailure
|
||||
|
||||
Loading…
Reference in New Issue
Block a user