From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- sys-power/Manifest.gz | Bin 5077 -> 5074 bytes sys-power/nut/Manifest | 5 +- sys-power/nut/files/nut-2.7.2-no-libdummy.patch | 13 ----- sys-power/nut/files/nut-2.7.4-nut-scanner.patch | 35 ++++++++++++++ sys-power/nut/files/nut-2.7.4-slibtool.patch | 61 ++++++++++++++++++++++++ sys-power/nut/nut-2.7.4-r7.ebuild | 7 ++- 6 files changed, 105 insertions(+), 16 deletions(-) delete mode 100644 sys-power/nut/files/nut-2.7.2-no-libdummy.patch create mode 100644 sys-power/nut/files/nut-2.7.4-nut-scanner.patch create mode 100644 sys-power/nut/files/nut-2.7.4-slibtool.patch (limited to 'sys-power') diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz index 00a7d462d4f8..45da32991bbd 100644 Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest index 588848e7cc88..decd402cf3b0 100644 --- a/sys-power/nut/Manifest +++ b/sys-power/nut/Manifest @@ -5,10 +5,11 @@ AUX nut-2.6.5-init.d-upsd 671 BLAKE2B a8658d22ffdba585d9fd6de13a347a16e98182bd48 AUX nut-2.6.5-init.d-upslog 573 BLAKE2B 2a0e04f83990035beb12eee33cfe7ce4fdcd1f310a7ba6f2255e4ad3a1f76245acf4a66332eea5cce7765d914ce7c14f02da50ebb8fa8640c871a12f492ed28b SHA512 06ca7fa8f3fe729b07a919d2a0ecb573b8ac180c447f927504524fca18894e045492458271b9a15898861cb3839b9fb95b2c843e241c7148bc25331ab8360b36 AUX nut-2.6.5-init.d-upsmon 557 BLAKE2B a48b215181d6b40691db244d38b5868e69844f5a1ee6f91cb8815c4386ae801f957b2fbaf53fbe5dd98925be42036dbd54dd5d13c0077c8884e018fac24d101a SHA512 9ccf947b2c5e7a73e96148edb7684f21ae84c4212b980f2ba7b88006dc1e3400b1b9017202b87648f928a3e19f4898094622a6683e0995b72f355ccb394280c3 AUX nut-2.7.1-snmpusb-order.patch 1417 BLAKE2B 20c3150559d3810c8bf15a9560ccf950ad1bb26bd58b4f2bcf3736871f4599bc3ad948e5f008b1549184f78d0fa3b417bbc8728660fbb110f4537fce83231bad SHA512 df3701821bc4ef45a5089e4d4439c3367fb23cefce7d06168bd422a8c32a1b373ae9fb3456bd5f90a51a672edf9ce29254a08c2045efe210a11b82399793ec19 -AUX nut-2.7.2-no-libdummy.patch 535 BLAKE2B f18f65ca92e834b5e085358a09c7363cf156b4a156c6c99d4f7cc34a17d25cf1518f342c072791eb37db613a6dafc32aeed364b88063c4d92d20e21e34a5d807 SHA512 a402a70a4cfc922d31203560627ace87f82795aef072d333cb1bfb91a6b67fbc10769e5d68a8d2741ca512b81b5754e9141b68dcb197dbe558ed5556e2de37a1 +AUX nut-2.7.4-nut-scanner.patch 1615 BLAKE2B dd672f2996ca650a6456084dc92d6a9c6ea1b0fe2d1b812bffcfdefda5e797f3f89e19e325f5a2d9ba066b077b9855d2403e111038bd4024f255f2fee243f500 SHA512 5db031aa5c74e4987824b2ac7a5f6e073de16b8958104ceabb7482a6c6b7779d8380fc30b6189ca2cfee9ab795a7413e537d093b0a338aee73d3385b54d280d7 AUX nut-2.7.4-py3.patch 1940 BLAKE2B 5bb77bca18ad40a1ba4e579098accb0135c0f4b24436425de3983204554ddb0aeceb473a7a6729048dbfb6175e015129a8bfcce26b169b3e21c905f9f08f079e SHA512 2a4f12954bdf2e50cbfb7a7dd09ed83be27ed2a6d0a2e4244ca8b309614515599c81541b5cfb4c81244b739cf3a47d56cb2746db3fae9e8861c5115c0287041b +AUX nut-2.7.4-slibtool.patch 2470 BLAKE2B 6baadd663f83209f3abbb4a6b83f170df56da07bb679f6e47571151406c879cfe9a0dbe17fa72678ca66fdcd07ad07bfb8a38e4821cf529e9367a71fad18de69 SHA512 9dfa6c38a56dcf6d743e4ea4eb46ff5e4a81e77eb79df97921662e00c6f4bee4f70a845c3e49ef5ecda31e0e90b8e7f5b450a9c3cd8c5742b093409b894556a8 AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1 AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a -EBUILD nut-2.7.4-r7.ebuild 8748 BLAKE2B 7ef88bc7588399130a0f72d63f0d9f38f150fa5b8675520e35f2304e1f01873094d37f6eb7c5badd698f01459dffebca68da42c5b11c752d0cebb781ba0a91e4 SHA512 d7425b3ba2b16fa77f597df10d6e91857c7409ee80b26f51e4f1db893ef7f81d3d6f9b6cf01b73d28f513312e9d55a02cacb8f6190bbc9e017f736a3928ffa9a +EBUILD nut-2.7.4-r7.ebuild 8831 BLAKE2B 4391c9c831d4fb0043c9116fe08d01627b9b7b342d5f711cdf4a8d516a95cd7d1e7022aa91ea1318bb9a07513dead4348d0d9ed4281b553be734455fe441ee27 SHA512 cb877b5432e426870c45cca693f80764ed44591f06b3ea86533d8ba7a744a5ebb672476a31de837db2f51abb523df65581f43df2d5cc903398dc732824071c92 MISC metadata.xml 5272 BLAKE2B cc580840e8c437fb37cd8c2132d2daf6751097374ccf11c5a7519756adc6b5d3654e3c40cfe7a66cee8ee5b016c09f65f4f425e4edbd503aed88da5f0eedc1a9 SHA512 f3133fcd673344452904f95d5898fdca3988970bf6526f50191cfa1741fb222468dc00652e968ba305a21851e6a070478627d181c26f6a1d152a215399f469ee diff --git a/sys-power/nut/files/nut-2.7.2-no-libdummy.patch b/sys-power/nut/files/nut-2.7.2-no-libdummy.patch deleted file mode 100644 index ca0d8be028f5..000000000000 --- a/sys-power/nut/files/nut-2.7.2-no-libdummy.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/Makefile.am b/drivers/Makefile.am -index 99614ca..42b3611 100644 ---- a/drivers/Makefile.am -+++ b/drivers/Makefile.am -@@ -267,5 +267,6 @@ dist_noinst_HEADERS = apc-mib.h apc-hid.h baytech-mib.h bcmxcp.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_LIBRARIES = -+#EXTRA_LIBRARIES = libdummy.a -+#libdummy_a_SOURCES = main.c dstate.c serial.c 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 new file mode 100644 index 000000000000..c846e3a782cd --- /dev/null +++ b/sys-power/nut/files/nut-2.7.4-nut-scanner.patch @@ -0,0 +1,35 @@ +From 5d98d5536699222bc93c58c1e6f6df43dc9bfcff Mon Sep 17 00:00:00 2001 +From: Arnaud Quette +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-slibtool.patch b/sys-power/nut/files/nut-2.7.4-slibtool.patch new file mode 100644 index 000000000000..ddcebdc2ec4f --- /dev/null +++ b/sys-power/nut/files/nut-2.7.4-slibtool.patch @@ -0,0 +1,61 @@ +From a0328e384ad3fb230c2276c8b6dd9f2c47ac07fb Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sat, 27 Mar 2021 15:18:17 -0700 +Subject: [PATCH] drivers: Fix undefined references with slibtool. + +Signed-off-by: orbea +--- + 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/nut-2.7.4-r7.ebuild b/sys-power/nut/nut-2.7.4-r7.ebuild index 581389d74b18..d1fe21dbae53 100644 --- a/sys-power/nut/nut-2.7.4-r7.ebuild +++ b/sys-power/nut/nut-2.7.4-r7.ebuild @@ -83,11 +83,12 @@ NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}" NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}" PATCHES=( - "${FILESDIR}"/${PN}-2.7.2-no-libdummy.patch "${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch "${FILESDIR}"/nut-openssl-1.1-support.patch "${FILESDIR}"/nut-2.7.4-py3.patch + "${FILESDIR}"/nut-2.7.4-nut-scanner.patch + "${FILESDIR}"/nut-2.7.4-slibtool.patch ) src_prepare() { @@ -110,7 +111,11 @@ src_prepare() { src_configure() { local myconf + append-flags -fno-lto + # bug #786702 + append-cxxflags -std=c++14 + tc-export CC tc-export CXX tc-export AR -- cgit v1.2.3