* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/files/
@ 2017-02-09 22:37 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-02-09 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 26f8ebb05c1a162637961e02affc5ae2b5dfb9c0
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb 7 16:48:35 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 22:37:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f8ebb0
sys-power/nut: remove unused patch/files
Closes: https://github.com/gentoo/gentoo/pull/3870
sys-power/nut/files/nut-2.2.2-init.d-upsd | 38 ----------------------
sys-power/nut/files/nut-2.2.2-init.d-upsmon | 30 -----------------
.../nut/files/nut-2.4.3-lowspeed-buffer-size.patch | 21 ------------
3 files changed, 89 deletions(-)
diff --git a/sys-power/nut/files/nut-2.2.2-init.d-upsd b/sys-power/nut/files/nut-2.2.2-init.d-upsd
deleted file mode 100644
index 56f524a2c7..0000000000
--- a/sys-power/nut/files/nut-2.2.2-init.d-upsd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload"
-
-pidfile=/var/lib/nut/upsd.pid
-bin=/usr/sbin/upsd
-
-depend() {
- need net
- before upsmon
- after upsdrv
-}
-
-start() {
- ebegin "Starting upsd"
- # clean up first
- pkill -u root,nut -x ${bin}
- sleep 1
- rm -f ${pidfile}
- # now start up
- start-stop-daemon --start --quiet --exec ${bin}
- eend $?
-}
-
-stop() {
- ebegin "Stopping upsd"
- start-stop-daemon --stop --quiet --pidfile ${pidfile}
- eend $?
-}
-
-reload() {
- ebegin "Reloading upsd"
- start-stop-daemon --stop --signal HUP --oknodo --quiet --pidfile ${pidfile}
- eend $?
-}
diff --git a/sys-power/nut/files/nut-2.2.2-init.d-upsmon b/sys-power/nut/files/nut-2.2.2-init.d-upsmon
deleted file mode 100644
index 079255dca6..0000000000
--- a/sys-power/nut/files/nut-2.2.2-init.d-upsmon
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload"
-
-pidfile=/var/run/upsmon.pid
-bin=/usr/sbin/upsmon
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting upsmon"
- start-stop-daemon --start --quiet --exec ${bin}
- eend $?
-}
-
-stop() {
- ebegin "Stopping upsmon"
- start-stop-daemon --stop --quiet --pidfile ${pidfile}
- eend $?
-}
-reload() {
- ebegin "Reloading upsd"
- start-stop-daemon --stop --signal HUP --oknodo --quiet --pidfile ${pidfile}
- eend $?
-}
diff --git a/sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch b/sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch
deleted file mode 100644
index e9a4da8fab..0000000000
--- a/sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=318937
-http://boxster.ghz.cc/projects/nut/changeset/2407
-
-Index: /trunk/drivers/libhid.c
-===================================================================
---- /trunk/drivers/libhid.c (revision 2336)
-+++ /trunk/drivers/libhid.c (revision 2407)
-@@ -142,5 +142,5 @@
- int id = pData->ReportID;
- int r;
-- unsigned char buf[SMALLBUF];
-+ unsigned char buf[8]; /* Maximum size for low-speed USB devices */
-
- if (rbuf->ts[id] + age > time(NULL)) {
-@@ -470,5 +470,5 @@
- int HIDGetEvents(hid_dev_handle_t udev, HIDData_t **event, int eventsize)
- {
-- unsigned char buf[SMALLBUF];
-+ unsigned char buf[8]; /* Maximum size for low-speed USB devices */
- int itemCount = 0;
- int buflen, r, i;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/files/
@ 2020-09-20 14:41 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2020-09-20 14:41 UTC (permalink / raw
To: gentoo-commits
commit: d97eb7668e05cf59cbbdfe4bebd48832dfd12b8f
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 28 16:50:05 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 14:38:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97eb766
sys-power/nut: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/17299
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-power/nut/files/NUT-Monitor-1.3-paths.patch | 48 -------------------------
1 file changed, 48 deletions(-)
diff --git a/sys-power/nut/files/NUT-Monitor-1.3-paths.patch b/sys-power/nut/files/NUT-Monitor-1.3-paths.patch
deleted file mode 100644
index 17bedaead72..00000000000
--- a/sys-power/nut/files/NUT-Monitor-1.3-paths.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/scripts/python/app/NUT-Monitor
-+++ b/scripts/python/app/NUT-Monitor
-@@ -70,7 +70,7 @@
- ( cmd_opts, args ) = opt_parser.parse_args()
-
-
-- self.__glade_file = os.path.join( os.path.dirname( sys.argv[0] ), "gui-1.3.glade" )
-+ self.__glade_file = '/usr/share/nut/gui-1.3.glade'
-
- self.__widgets["interface"] = gtk.glade.XML( self.__glade_file, "window1", APP )
- self.__widgets["main_window"] = self.__widgets["interface"].get_widget("window1")
-@@ -103,11 +103,11 @@
-
- # Create the tray icon and connect it to the show/hide method...
- self.__widgets["status_icon"] = gtk.StatusIcon()
-- self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) )
-+ self.__widgets["status_icon"].set_from_file( "/usr/share/nut/pixmaps/on_line.png" )
- self.__widgets["status_icon"].set_visible( True )
- self.__widgets["status_icon"].connect( "activate", self.tray_activated )
-
-- self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) )
-+ self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut/pixmaps/on_line.png" )
-
- # Define interface callbacks actions
- self.__callbacks = { "on_window1_destroy" : self.quit,
-@@ -265,8 +265,8 @@
- #-------------------------------------------------------------------
- # Change the status icon and tray icon
- def change_status_icon( self, icon="on_line", blink=False ) :
-- self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) )
-- self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) )
-+ self.__widgets["status_icon"].set_from_file( "/usr/share/nut/pixmaps/%s.png" % icon )
-+ self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut/pixmaps/%s.png" % icon )
- self.__widgets["status_icon"].set_blinking( blink )
-
- #-------------------------------------------------------------------
-@@ -719,9 +719,9 @@
-
- for k,v in vars.iteritems() :
- if ( rwvars.has_key( k ) ) :
-- icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-rw.png" )
-+ icon_file = "/usr/share/nut/pixmaps/var-rw.png"
- else :
-- icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-ro.png" )
-+ icon_file = "/usr/share/nut/pixmaps/var-ro.png"
-
- icon = gtk.gdk.pixbuf_new_from_file( icon_file )
- self.__widgets["ups_vars_tree_store"].append( [ icon, k, v ] )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/files/
@ 2023-06-23 21:29 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2023-06-23 21:29 UTC (permalink / raw
To: gentoo-commits
commit: f202d61b3b796b6d6741c832ff65f87112628c5f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 20 10:48:55 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 21:28:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f202d61b
sys-power/nut: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31556
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/nut-2.8.0-fix-man-page-generation.patch | 64 ----------------------
1 file changed, 64 deletions(-)
diff --git a/sys-power/nut/files/nut-2.8.0-fix-man-page-generation.patch b/sys-power/nut/files/nut-2.8.0-fix-man-page-generation.patch
deleted file mode 100644
index ff224a4774bf..000000000000
--- a/sys-power/nut/files/nut-2.8.0-fix-man-page-generation.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From c0d9ce265c6ca627039845d9544ebbdf87a00f7f Mon Sep 17 00:00:00 2001
-From: Timo Kokkonen <timo.t.kokkonen@iki.fi>
-Date: Mon, 11 Jul 2022 20:41:12 +0300
-Subject: [PATCH] docs: man: upsd: Fix driver list when building only some of
- drivers
-
-There are two issues that come up in man page generation when only
-some of the drivers are built.
-
-First is that during configure phase DRIVER_MAN_LIST is collected by
-searching any .8 files matching the driver names. This does not work
-very well as during the first configure call these files don't exist
-yet as none of them are compiled yet. Searching the .txt files where
-they are built from works better.
-
-Second issue is that SRC_DRIVERS_PAGES list needs to contain the
-source files where the driver list is generated from. If only some
-drivers are built, this needs to be populated from the list of files
-we collected to DRIVER_MAN_LIST during configure phase.
-
-Adding these entries will ensure manpage generation will not fail if
-only some of the drivers are built
-
-Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>
----
- configure.ac | 4 ++--
- docs/man/Makefile.am | 6 ++++++
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3aa26c24e..a49ca4417 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1745,8 +1745,8 @@ if test "${WITH_MANS}" = "yes"; then
- else
- DRIVER_MAN_LIST=""
- for i in ${DRIVER_BUILD_LIST}; do
-- if test -f ${srcdir}/docs/man/$i.8; then
-- DRIVER_MAN_LIST="${DRIVER_MAN_LIST} $i.8"
-+ if test -f ${srcdir}/docs/man/$i.txt; then
-+ DRIVER_MAN_LIST="${DRIVER_MAN_LIST} $i.txt"
- fi
- done
- AC_MSG_RESULT(${DRIVER_MAN_LIST})
-diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am
-index 0d693a355..a7345264b 100644
---- a/docs/man/Makefile.am
-+++ b/docs/man/Makefile.am
-@@ -695,6 +695,12 @@ SRC_DRIVERS_PAGES = \
- $(SRC_MODBUS_PAGES) \
- $(SRC_LINUX_I2C_PAGES)
-
-+if SOME_DRIVERS
-+SRC_DRIVERS_PAGES += \
-+ $(DRIVER_MAN_LIST)
-+endif
-+
-+
- # distribute everything, even those not installed by default
- # Note that 'dist' target requires AsciiDoc!
- SRC_ALL_PAGES = \
---
-2.35.1
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/files/
@ 2024-05-30 14:55 Arthur Zamarin
0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2024-05-30 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 17aa70262a6681b9d13ab3bf432133fe41f7b511
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue May 28 16:31:26 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May 30 14:54:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17aa7026
sys-power/nut: remove unused patches/files
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/36879
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-power/nut/files/lighttpd_nut.conf-2.2.0 | 22 ----
sys-power/nut/files/nut-2.6.5-init.d-upsd | 37 ------
sys-power/nut/files/nut-2.7.1-snmpusb-order.patch | 37 ------
sys-power/nut/files/nut-2.7.4-nut-scanner.patch | 35 -----
sys-power/nut/files/nut-2.7.4-py3.patch | 56 --------
sys-power/nut/files/nut-2.7.4-slibtool.patch | 61 ---------
sys-power/nut/files/nut-openssl-1.1-support.patch | 151 ----------------------
7 files changed, 399 deletions(-)
diff --git a/sys-power/nut/files/lighttpd_nut.conf-2.2.0 b/sys-power/nut/files/lighttpd_nut.conf-2.2.0
deleted file mode 100644
index 434be8c87e61..000000000000
--- a/sys-power/nut/files/lighttpd_nut.conf-2.2.0
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Lighttpd configuration for using NUT under Gentoo Linux.
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-###############################################################################
-
-# Simple copy this to /etc/lighttpd/ and include it in your lighttpd.conf.
-# It will make NUT available at http://$HOST/nut/
-
-server.modules += ("mod_cgi")
-
-# If you want to limit it to some host, uncomment the host check and modify it to your needs.
-# $HTTP["host"] == "www2.example.org" {
-alias.url += ( "/nut/" => "/usr/share/nut/cgi/" )
-$HTTP["url"] =~ "^/nut/" {
- dir-listing.activate = "disable"
- cgi.assign = ( ".cgi" => "" )
- index-file.names = ( "upsstats.cgi" )
-}
-# }
-
-# vim: set ft=conf foldmethod=marker et :
diff --git a/sys-power/nut/files/nut-2.6.5-init.d-upsd b/sys-power/nut/files/nut-2.6.5-init.d-upsd
deleted file mode 100644
index c4debd306601..000000000000
--- a/sys-power/nut/files/nut-2.6.5-init.d-upsd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-pidfile=/var/lib/nut/upsd.pid
-bin=/usr/sbin/upsd
-
-depend() {
- use net
- before upsmon
- after upsdrv
-}
-
-start() {
- ebegin "Starting upsd"
- # clean up first
- pkill -u root,nut -x ${bin}
- sleep 1
- rm -f ${pidfile}
- # now start up
- start-stop-daemon --start --quiet --exec ${bin}
- eend $?
-}
-
-stop() {
- ebegin "Stopping upsd"
- start-stop-daemon --stop --quiet --pidfile ${pidfile}
- eend $?
-}
-
-reload() {
- ebegin "Reloading upsd"
- start-stop-daemon --stop --signal HUP --oknodo --quiet --pidfile ${pidfile}
- eend $?
-}
diff --git a/sys-power/nut/files/nut-2.7.1-snmpusb-order.patch b/sys-power/nut/files/nut-2.7.1-snmpusb-order.patch
deleted file mode 100644
index e62b6571d2ce..000000000000
--- a/sys-power/nut/files/nut-2.7.1-snmpusb-order.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-The code that generates the SNMP and USB headers to compile against does not
-have a deterministic order, leading to different results at times.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude .libs --exclude '*.o' --exclude core nut-2.7.1.orig/tools/nut-snmpinfo.py nut-2.7.1/tools/nut-snmpinfo.py
---- nut-2.7.1.orig/tools/nut-snmpinfo.py 2014-01-04 19:08:19.117150636 -0800
-+++ nut-2.7.1/tools/nut-snmpinfo.py 2013-07-26 12:41:11.000000000 -0700
-@@ -78,7 +78,9 @@
- output_file.write( "/* SNMP IDs device table */\n" )
- output_file.write( "static snmp_device_id_t snmp_device_table[] = {\n" )
-
--for filename in glob.glob('../drivers/*-mib.c'):
-+mibs = glob.glob('../drivers/*-mib.c')
-+mibs.sort()
-+for filename in mibs:
- list_of_line = open(filename,'r').read().split(';')
- for line in list_of_line:
- if "mib2nut_info_t" in line:
-diff -Nuar --exclude .libs --exclude '*.o' --exclude core nut-2.7.1.orig/tools/nut-usbinfo.pl nut-2.7.1/tools/nut-usbinfo.pl
---- nut-2.7.1.orig/tools/nut-usbinfo.pl 2014-01-04 19:12:45.595949760 -0800
-+++ nut-2.7.1/tools/nut-usbinfo.pl 2013-11-17 11:27:38.000000000 -0800
-@@ -75,7 +75,12 @@
-
- ################# MAIN #################
-
--find(\&find_usbdevs,$scanPath);
-+find({
-+ wanted => \&find_usbdevs,
-+ follow => 1,
-+ preprocess => sub { return sort @_ },
-+ },
-+ $scanPath);
- &gen_usb_files;
-
- ################# SUB METHOD #################
-
diff --git a/sys-power/nut/files/nut-2.7.4-nut-scanner.patch b/sys-power/nut/files/nut-2.7.4-nut-scanner.patch
deleted file mode 100644
index c846e3a782cd..000000000000
--- a/sys-power/nut/files/nut-2.7.4-nut-scanner.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5d98d5536699222bc93c58c1e6f6df43dc9bfcff Mon Sep 17 00:00:00 2001
-From: Arnaud Quette <arnaud.quette@free.fr>
-Date: Thu, 10 Mar 2016 14:41:40 +0100
-Subject: [PATCH] Fix nut-scanner compilation in some environments
-
-Following the commits 5187dab (common: add some string-related functions) and
-e767df5 (common: consolidate some string-related functions), the build rules of
-nut-scanner were not updated to also use str.c. Since the libcommon.la
-dependency was still there, some environments managed to build cleanly, while
-other are failing. Update build dependencies to fix this situation
----
- tools/nut-scanner/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/nut-scanner/Makefile.am b/tools/nut-scanner/Makefile.am
-index 558cb23b8f..db85c68287 100644
---- a/tools/nut-scanner/Makefile.am
-+++ b/tools/nut-scanner/Makefile.am
-@@ -14,14 +14,14 @@ libnutscan_la_SOURCES = scan_nut.c scan_ipmi.c \
- scan_avahi.c scan_eaton_serial.c nutscan-serial.c \
- ../../drivers/serial.c \
- ../../drivers/bcmxcp_ser.c \
-- ../../common/common.c
-+ ../../common/common.c ../../common/str.c
- libnutscan_la_LIBADD = $(NETLIBS) $(LIBLTDL_LIBS)
- libnutscan_la_LDFLAGS = $(SERLIBS) -version-info 1:0:0
- libnutscan_la_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include $(LIBLTDL_CFLAGS) -I$(top_srcdir)/drivers
-
- nut_scanner_SOURCES = nut-scanner.c
- nut_scanner_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include
--nut_scanner_LDADD = libnutscan.la ../../common/libcommon.la
-+nut_scanner_LDADD = libnutscan.la
-
- if WITH_SSL
- libnutscan_la_CFLAGS += $(LIBSSL_CFLAGS)
diff --git a/sys-power/nut/files/nut-2.7.4-py3.patch b/sys-power/nut/files/nut-2.7.4-py3.patch
deleted file mode 100644
index dbe661982eb1..000000000000
--- a/sys-power/nut/files/nut-2.7.4-py3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From eea0c5e9e5566c36a8b1e364ed4909231901a8f5 Mon Sep 17 00:00:00 2001
-From: Florian Bruhin <git@the-compiler.org>
-Date: Tue, 29 Nov 2016 10:45:04 +0100
-Subject: [PATCH 1/2] Make gen-nutupsconf-aug.py work with Python 3
-
-This makes the script work with Python 2.6+.
-Fixes #345.
----
- scripts/augeas/gen-nutupsconf-aug.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/augeas/gen-nutupsconf-aug.py b/scripts/augeas/gen-nutupsconf-aug.py
-index 55db17a73..4bb201602 100755
---- a/scripts/augeas/gen-nutupsconf-aug.py
-+++ b/scripts/augeas/gen-nutupsconf-aug.py
-@@ -18,6 +18,8 @@
- # This program extracts all drivers specific variables, declared
- # using 'addvar()' and output a complete ups.conf lens for Augeas
-
-+from __future__ import print_function
-+
- import sys
- import re
- import glob
-@@ -69,7 +71,7 @@ def grep(string,list):
-
- if (len(sys.argv) == 2):
- dirPrefix = sys.argv[1]
-- print dirPrefix
-+ print(dirPrefix)
-
- # 1/ Extract all specific drivers parameters, in a sorted list with unique entries
- # 1.1/ List all drivers implementation files
-
-From 7bf209a5deef1ec1f05cf89c25c8399590d4e4e8 Mon Sep 17 00:00:00 2001
-From: Florian Bruhin <git@the-compiler.org>
-Date: Tue, 29 Nov 2016 17:37:01 +0100
-Subject: [PATCH 2/2] Fix gitlog2changelog.py on python 3
-
----
- tools/gitlog2changelog.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/gitlog2changelog.py b/tools/gitlog2changelog.py
-index d8c089187..f0bea4af6 100755
---- a/tools/gitlog2changelog.py
-+++ b/tools/gitlog2changelog.py
-@@ -80,7 +80,7 @@
- else:
- message = message + " " + line.strip()
- # If this line is hit all of the files have been stored for this commit
-- elif re.search('files? changed', line) >= 0:
-+ elif re.search('files? changed', line):
- filesFound = True
- continue
- # Collect the files for this commit. FIXME: Still need to add +/- to files
diff --git a/sys-power/nut/files/nut-2.7.4-slibtool.patch b/sys-power/nut/files/nut-2.7.4-slibtool.patch
deleted file mode 100644
index ddcebdc2ec4f..000000000000
--- a/sys-power/nut/files/nut-2.7.4-slibtool.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From a0328e384ad3fb230c2276c8b6dd9f2c47ac07fb Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Sat, 27 Mar 2021 15:18:17 -0700
-Subject: [PATCH] drivers: Fix undefined references with slibtool.
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- drivers/Makefile.am | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/Makefile.am b/drivers/Makefile.am
-index 40746364e3..3c2277cfc0 100644
---- a/drivers/Makefile.am
-+++ b/drivers/Makefile.am
-@@ -4,8 +4,8 @@
- # (libtool version of the static lib, in order to access LTLIBOBJS)
- #FIXME: SERLIBS is only useful for LDADD_DRIVERS_SERIAL not for LDADD_COMMON
- LDADD_COMMON = ../common/libcommon.la ../common/libparseconf.la
--LDADD_DRIVERS = $(LDADD_COMMON) main.o dstate.o
--LDADD_DRIVERS_SERIAL = $(LDADD_DRIVERS) $(SERLIBS) serial.o
-+LDADD_DRIVERS = libdummy.la $(LDADD_COMMON)
-+LDADD_DRIVERS_SERIAL = libdummy_serial.la $(LDADD_DRIVERS) $(SERLIBS)
-
- # most targets are drivers, so make this the default
- LDADD = $(LDADD_DRIVERS_SERIAL)
-@@ -109,6 +109,7 @@ bcmxcp_LDADD = $(LDADD) -lm
- belkin_SOURCES = belkin.c
- belkinunv_SOURCES = belkinunv.c
- bestfcom_SOURCES = bestfcom.c
-+bestfortress_SOURCES = bestfortress.c
- bestuferrups_SOURCES = bestuferrups.c
- bestups_SOURCES = bestups.c
- blazer_ser_SOURCES = blazer.c blazer_ser.c
-@@ -198,7 +199,6 @@ richcomm_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS)
- riello_usb_SOURCES = riello.c riello_usb.c libusb.c usb-common.c
- riello_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
-
--
- # HID-over-serial
- mge_shut_SOURCES = usbhid-ups.c libshut.c libhid.c hidparser.c mge-hid.c
- # per-target CFLAGS are necessary here
-@@ -253,7 +253,7 @@ nutdrv_qx_LDADD = $(LDADD_DRIVERS) -lm
- nutdrv_qx_CFLAGS = $(AM_CFLAGS)
- if WITH_SERIAL
- nutdrv_qx_CFLAGS += -DQX_SERIAL
--nutdrv_qx_LDADD += $(SERLIBS) serial.o
-+nutdrv_qx_LDADD += libdummy_serial.la $(SERLIBS)
- endif
- if WITH_USB
- nutdrv_qx_CFLAGS += -DQX_USB
-@@ -291,5 +291,8 @@ dist_noinst_HEADERS = apc-mib.h apc-hid.h baytech-mib.h bcmxcp.h bcmxcp_ser.h \
-
- # Define a dummy library so that Automake builds rules for the
- # corresponding object files. This library is not actually built,
--EXTRA_LIBRARIES = libdummy.a
--libdummy_a_SOURCES = main.c dstate.c serial.c
-+EXTRA_LTLIBRARIES = libdummy.la libdummy_serial.la
-+libdummy_la_SOURCES = main.c dstate.c
-+libdummy_la_LDFLAGS = -no-undefined -static
-+libdummy_serial_la_SOURCES = serial.c
-+libdummy_serial_la_LDFLAGS = -no-undefined -static
diff --git a/sys-power/nut/files/nut-openssl-1.1-support.patch b/sys-power/nut/files/nut-openssl-1.1-support.patch
deleted file mode 100644
index 5d1c2afe7dca..000000000000
--- a/sys-power/nut/files/nut-openssl-1.1-support.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
-From: Arjen de Korte <build+lede@de-korte.org>
-Date: Mon, 27 Nov 2017 21:10:13 +0100
-Subject: [PATCH] Add support for openssl-1.1.0
-
---- a/clients/upsclient.c
-+++ b/clients/upsclient.c
-@@ -299,11 +299,6 @@
- {
- #ifdef WITH_OPENSSL
- int ret, ssl_mode = SSL_VERIFY_NONE;
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-- const SSL_METHOD *ssl_method;
--#else
-- SSL_METHOD *ssl_method;
--#endif
- #elif defined(WITH_NSS) /* WITH_OPENSSL */
- SECStatus status;
- #endif /* WITH_OPENSSL | WITH_NSS */
-@@ -315,22 +310,32 @@
- }
-
- #ifdef WITH_OPENSSL
--
-- SSL_library_init();
-- SSL_load_error_strings();
-
-- ssl_method = TLSv1_client_method();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ SSL_load_error_strings();
-+ SSL_library_init();
-
-- if (!ssl_method) {
-- return 0;
-- }
-+ ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-+#else
-+ ssl_ctx = SSL_CTX_new(TLS_client_method());
-+#endif
-
-- ssl_ctx = SSL_CTX_new(ssl_method);
- if (!ssl_ctx) {
- upslogx(LOG_ERR, "Can not initialize SSL context");
- return -1;
- }
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ /* set minimum protocol TLSv1 */
-+ SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-+#else
-+ ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
-+ if (ret != 1) {
-+ upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
-+ return -1;
-+ }
-+#endif
-+
- if (!certpath) {
- if (certverify == 1) {
- upslogx(LOG_ERR, "Can not verify certificate if any is specified");
-@@ -737,7 +742,7 @@
- switch(res)
- {
- case 1:
-- upsdebugx(3, "SSL connected");
-+ upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
- break;
- case 0:
- upslog_with_errno(1, "SSL_connect do not accept handshake.");
---- a/clients/upssched.c
-+++ b/clients/upssched.c
-@@ -794,7 +794,7 @@
- }
-
- if (!strcmp(cmd, "EXECUTE")) {
-- if (ca1 == '\0') {
-+ if (ca1[0] == '\0') {
- upslogx(LOG_ERR, "Empty EXECUTE command argument");
- return;
- }
---- a/m4/nut_check_libopenssl.m4
-+++ b/m4/nut_check_libopenssl.m4
-@@ -58,7 +58,7 @@
-
- dnl check if openssl is usable
- AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
-- AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
-+ AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
-
- if test "${nut_have_openssl}" = "yes"; then
- nut_with_ssl="yes"
---- a/server/netssl.c
-+++ b/server/netssl.c
-@@ -274,7 +274,7 @@
- {
- case 1:
- client->ssl_connected = 1;
-- upsdebugx(3, "SSL connected");
-+ upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
- break;
-
- case 0:
-@@ -370,13 +370,7 @@
- {
- #ifdef WITH_NSS
- SECStatus status;
--#elif defined(WITH_OPENSSL)
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-- const SSL_METHOD *ssl_method;
--#else
-- SSL_METHOD *ssl_method;
--#endif
--#endif /* WITH_NSS|WITH_OPENSSL */
-+#endif /* WITH_NSS */
-
- if (!certfile) {
- return;
-@@ -386,18 +380,29 @@
-
- #ifdef WITH_OPENSSL
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- SSL_load_error_strings();
- SSL_library_init();
-
-- if ((ssl_method = TLSv1_server_method()) == NULL) {
-+ ssl_ctx = SSL_CTX_new(SSLv23_server_method());
-+#else
-+ ssl_ctx = SSL_CTX_new(TLS_server_method());
-+#endif
-+
-+ if (!ssl_ctx) {
- ssl_debug();
-- fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
-+ fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
- }
-
-- if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ /* set minimum protocol TLSv1 */
-+ SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-+#else
-+ if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
- ssl_debug();
-- fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
-+ fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
- }
-+#endif
-
- if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
- ssl_debug();
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-05-30 14:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-30 14:55 [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2023-06-23 21:29 Conrad Kostecki
2020-09-20 14:41 Conrad Kostecki
2017-02-09 22:37 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox