Hello community, here is the log from the commit of package open-isns for openSUSE:Factory checked in at 2020-12-08 13:22:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-isns (Old) and /work/SRC/openSUSE:Factory/.open-isns.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-isns" Tue Dec 8 13:22:54 2020 rev:14 rq:853181 version:0.100 Changes: -------- --- /work/SRC/openSUSE:Factory/open-isns/open-isns.changes 2020-02-09 21:01:27.331320802 +0100 +++ /work/SRC/openSUSE:Factory/.open-isns.new.5913/open-isns.changes 2020-12-08 13:22:58.590302001 +0100 @@ -1,0 +2,23 @@ +Fri Dec 4 20:08:53 UTC 2020 - Lee Duncan <[email protected]> + +- Updated SPEC file to Recommend open-iscsi + +------------------------------------------------------------------- +Fri Dec 4 19:51:59 UTC 2020 - Lee Duncan <[email protected]> + +- Updated to latest upstream, including: + * Add man page for isnssetup. + * Fix broken server authentication initialization. + * Update version string to "0.100". + * Added a TODO: 'make depend' not worrking + * libisns: remove sighold and sigrelse + * fix compilation without deprecated OpenSSL APIs + * socket.c: include poll.h instead of sys/poll.h for POSIX compatibility + * Fix 586 compile issue and remove -Werror + * Do not ignore write() return value. + * Fix compiler issue when n + Which updates open-isns-updates.diff.bz2, and removes the + no-longer-needed patch open-isns-fix-586-time.patch. + Also, security will be enabled/configured with this update. + +------------------------------------------------------------------- Old: ---- open-isns-fix-586-time.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-isns.spec ++++++ --- /var/tmp/diff_new_pack.TPq3c1/_old 2020-12-08 13:22:59.290303980 +0100 +++ /var/tmp/diff_new_pack.TPq3c1/_new 2020-12-08 13:22:59.294303991 +0100 @@ -1,7 +1,7 @@ # # spec file for package open-isns # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,8 +24,7 @@ Release: 0 Source: %{name}-%{version}.tar.xz Patch1: %{name}-updates.diff.bz2 -Patch2: %{name}-fix-586-time.patch -Url: https://github.com/open-iscsi/%{name} +URL: https://github.com/open-iscsi/%{name} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -35,6 +34,7 @@ BuildRequires: systemd-rpm-macros %{?systemd_requires} Requires: coreutils +Recommends: open-iscsi %description This is a partial implementation of the iSNS protocol (see below), @@ -58,13 +58,12 @@ %prep %setup -n %{name}-%{version} %patch1 -p1 -%patch2 -p1 %build %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects autoconf autoheader -%configure +%configure --prefix=/usr --with-security make OPTFLAGS="%{optflags}" %install @@ -74,6 +73,7 @@ fi ln -sf /usr/sbin/service %{buildroot}/usr/sbin/rcisnsd make DESTDIR="%{buildroot}" install_hdrs install_lib +install -m 755 isnssetup %{buildroot}%{_sbindir} %post %{service_add_post isnsd.socket isnsd.service} @@ -92,15 +92,18 @@ %{_sbindir}/isnsd %{_sbindir}/isnsadm %{_sbindir}/isnsdd +%{_sbindir}/isnssetup %dir %{_sysconfdir}/isns %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/isns/isnsd.conf %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/isns/isnsadm.conf %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/isns/isnsdd.conf %{_sbindir}/rcisnsd -%doc COPYING HACKING README TODO +%license COPYING +%doc HACKING README TODO %doc %{_mandir}/man8/isnsd.8%{?ext_man} %doc %{_mandir}/man8/isnsadm.8%{?ext_man} %doc %{_mandir}/man8/isnsdd.8%{?ext_man} +%doc %{_mandir}/man8/isnssetup.8%{?ext_man} %doc %{_mandir}/man5/isns_config.5%{?ext_man} %{_unitdir}/isnsd.service %{_unitdir}/isnsd.socket ++++++ open-isns-updates.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.TPq3c1/_old 2020-12-08 13:22:59.342304127 +0100 +++ /var/tmp/diff_new_pack.TPq3c1/_new 2020-12-08 13:22:59.346304139 +0100 @@ -1,3 +1,37 @@ +diff --git a/Makefile.in b/Makefile.in +index f76880a4637f..f001a879bf4f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -118,6 +118,7 @@ install: + $(INSTALL) -m 644 $(srcdir)/doc/isnsd.8 $(MANDIR)/man8 + $(INSTALL) -m 644 $(srcdir)/doc/isnsdd.8 $(MANDIR)/man8 + $(INSTALL) -m 644 $(srcdir)/doc/isnsadm.8 $(MANDIR)/man8 ++ $(INSTALL) -m 644 $(srcdir)/doc/isnssetup.8 $(MANDIR)/man8 + $(INSTALL) -m 644 $(srcdir)/doc/isns_config.5 $(MANDIR)/man5 + $(INSTALL) -m 644 $(srcdir)/isnsd.service $(SYSTEMDDIR) + $(INSTALL) -m 644 $(srcdir)/isnsd.socket $(SYSTEMDDIR) +diff --git a/TODO b/TODO +index 2ddf0086a2d5..bfa9172f0632 100644 +--- a/TODO ++++ b/TODO +@@ -27,6 +27,10 @@ isnsdd: + we registered for ESI are seeing the server's + ESI messages. + ++isnssetup: ++- Update to support systemd, and perhaps have ++ a few options? ++ + DevAttrReg: + - Refuse registration of nodes inside the CONTROL + entity, unless it's a control node. +@@ -98,3 +102,6 @@ Renaming + + Socket code: + - impose upper limit on the reassembly buffer ++ ++Compilation: ++ - 'make depend' does not work diff --git a/client.c b/client.c index 848787718623..fda26be3f6f9 100644 --- a/client.c @@ -47,6 +81,19 @@ /* * Create the default security context +diff --git a/configure.ac b/configure.ac +index e4f3995c4a9b..d956e580dc94 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,7 +17,7 @@ AC_PATH_PROG(SH, sh) + dnl C Compiler features + AC_C_INLINE + if test "$GCC" = "yes"; then +- CFLAGS="-Wall -Werror -Wextra $CFLAGS" ++ CFLAGS="-Wall -Wextra $CFLAGS" + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + fi + diff --git a/db-policy.c b/db-policy.c index b1c46e22980d..d4a0cba432e2 100644 --- a/db-policy.c @@ -83,15 +130,93 @@ /* * Retrieve policy from database -diff --git a/include/libisns/.gitignore b/include/libisns/.gitignore +diff --git a/doc/isnssetup.8 b/doc/isnssetup.8 new file mode 100644 -index 000000000000..a3757fdb1d3a +index 000000000000..3076af5bafe9 --- /dev/null -+++ b/include/libisns/.gitignore -@@ -0,0 +1 @@ -+paths.h ++++ b/doc/isnssetup.8 +@@ -0,0 +1,64 @@ ++'\" t ++.TH ISNSSETUP 8 "4 Dec 2020" ++.SH NAME ++isnssetup \- a simple script to bootstrap an iSNS server, including security ++.SH SYNOPSIS ++.B isnssetup ++.SH DESCRIPTION ++.B isnssetup ++is a command line utility for for bootstrapping your iSNS ++installation. It sets up the authentication credentials, ++sets up the ++.B ServerAddress ++to be ++.IR localhost , ++and registers the appropriate values in the ++.B iSNS ++database. The ++.B isnssetup ++script does not take any options. ++.PP ++Running this script performs the following steps: ++.TP ++.B \(bu ++Set ++.B ServerAddress ++to ++.I localhost ++and ++.B Security ++to ++.I 1 ++for ++.B isnsadmin.conf ++and ++.BR isnsdd.conf . ++.TP ++.B \(bu ++Initialize security files by running ++.BR "isnsd --init" , ++copying the public key to the server key, then restarting ++the ++.B isnsd ++daemon, so that it sees the new authorization files. ++.TP ++.B \(bu ++Registering the control node policy, the control node itself, and ++lastly registering the server policy. ++.PP ++Note that this script is supplied as an example, although you should ++be able to use it directly if you wish. You have to be ++.B root ++to run this script successfully. ++.SH BUGS ++This script does not take ++.B systemd ++into account, so you may have to modify it to get it to work on ++a modern system. ++.SH SEE ALSO ++RFC 4171, ++.BR isnsadm (8), ++.BR isnsd (8), ++.BR isns_config (5). ++.SH AUTHORS ++Olaf Kirch <[email protected]> +diff --git a/include/libisns/paths.h.in b/include/libisns/paths.h.in +index 1e96e70e1449..d4ef8036beb1 100644 +--- a/include/libisns/paths.h.in ++++ b/include/libisns/paths.h.in +@@ -9,8 +9,8 @@ + #define ISNS_CONFIG_H + + #define __OPENISNS_MKVERSION(maj, min) (((maj) << 8) + (min)) +-#define OPENISNS_VERSION __OPENISNS_MKVERSION(0, 99); +-#define OPENISNS_VERSION_STRING "0.99" ++#define OPENISNS_VERSION __OPENISNS_MKVERSION(0, 100); ++#define OPENISNS_VERSION_STRING "0.100" + + #define ISNS_ETCDIR "/etc/isns" + #define ISNS_RUNDIR "@RUNDIR@" diff --git a/include/libisns/util.h b/include/libisns/util.h -index 417448026afb..e5ed037f0aab 100644 +index 417448026afb..f1b97f050737 100644 --- a/include/libisns/util.h +++ b/include/libisns/util.h @@ -14,6 +14,7 @@ @@ -102,6 +227,33 @@ #define array_num_elements(a) (sizeof(a) / sizeof((a)[0])) +@@ -40,14 +41,22 @@ char * print_size(unsigned long); + */ + static inline void signals_hold(void) + { +- sighold(SIGTERM); +- sighold(SIGINT); ++ sigset_t s; ++ ++ sigemptyset(&s); ++ sigaddset(&s, SIGTERM); ++ sigaddset(&s, SIGINT); ++ sigprocmask(SIG_BLOCK, &s, 0); + } + + static inline void signals_release(void) + { +- sigrelse(SIGTERM); +- sigrelse(SIGINT); ++ sigset_t s; ++ ++ sigemptyset(&s); ++ sigaddset(&s, SIGTERM); ++ sigaddset(&s, SIGINT); ++ sigprocmask(SIG_UNBLOCK, &s, 0); + } + + /* diff --git a/isnsadm.c b/isnsadm.c index 7a9600731e55..94c705e2a3b8 100644 --- a/isnsadm.c @@ -115,11 +267,24 @@ { isns_fatal("Authentication disabled in this build\n"); return NULL; +diff --git a/isnsdd.c b/isnsdd.c +index 58825cc8e68f..9cedb9f093ce 100644 +--- a/isnsdd.c ++++ b/isnsdd.c +@@ -401,7 +401,7 @@ check_portal_registration(__attribute__((unused))void *ptr) + continue; + + last_modified = isns_object_last_modified(obj); +- if (last_modified + 2 * interval > now) { ++ if ((time_t)(last_modified + 2 * interval) > now) { + good_portals++; + continue; + } diff --git a/pki.c b/pki.c -index 486d9bb00057..57ea66489a91 100644 +index 486d9bb00057..6617b8aee7df 100644 --- a/pki.c +++ b/pki.c -@@ -9,12 +9,13 @@ +@@ -9,12 +9,15 @@ #include <unistd.h> #include <limits.h> #include "config.h" @@ -129,15 +294,33 @@ #include <openssl/pem.h> #include <openssl/err.h> #include <openssl/evp.h> ++#include <openssl/dsa.h> ++#include <openssl/bn.h> #endif -#include <fcntl.h> #include <libisns/isns.h> #include "security.h" #include <libisns/util.h> -@@ -431,17 +432,43 @@ isns_dsa_load_params(const char *filename) +@@ -96,13 +99,11 @@ isns_create_dsa_context(void) + isns_security_t *ctx; + + if (!isns_openssl_init) { +- ERR_load_crypto_strings(); + #if OPENSSL_API_COMPAT < 0x10100000L ++ ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + OpenSSL_add_all_ciphers(); + OpenSSL_add_all_digests(); +-#else +- OPENSSL_init_crypto(); + #endif + isns_openssl_init = 1; + } +@@ -431,18 +432,41 @@ isns_dsa_load_params(const char *filename) return dsa; } +-static int +/* + * write one 'status' character to stdout + */ @@ -162,7 +345,7 @@ + assert(res == 1); +} + - static int ++static void isns_dsa_param_gen_callback(int stage, __attribute__((unused))int index, __attribute__((unused))void *dummy) @@ -175,13 +358,21 @@ + write_status_byte('.'); else if (stage == 2) - write(1, "/", 1); +- return 0; + write_status_byte('/'); -+ -+ /* as a callback, we must return a value, so just return success */ - return 0; } -@@ -478,7 +505,7 @@ isns_dsa_init_params(const char *filename) + int +@@ -467,7 +491,7 @@ isns_dsa_init_params(const char *filename) + isns_notice("Generating DSA parameters; this may take a while\n"); + #if OPENSSL_VERSION_NUMBER >= 0x10002000L + cb = BN_GENCB_new(); +- BN_GENCB_set(cb, (int (*)(int, int, BN_GENCB *)) isns_dsa_param_gen_callback, NULL); ++ BN_GENCB_set_old(cb, (void (*)(int, int, void *)) isns_dsa_param_gen_callback, NULL); + dsa = DSA_new(); + if (!DSA_generate_parameters_ex(dsa, dsa_key_bits, NULL, 0, NULL, NULL, cb)) { + DSA_free(dsa); +@@ -478,7 +502,7 @@ isns_dsa_init_params(const char *filename) dsa = DSA_generate_parameters(dsa_key_bits, NULL, 0, NULL, NULL, isns_dsa_param_gen_callback, NULL); #endif @@ -236,9 +427,18 @@ return NULL; } diff --git a/socket.c b/socket.c -index da9f5dcea05d..a76d593e17e4 100644 +index da9f5dcea05d..432a9bddddcd 100644 --- a/socket.c +++ b/socket.c +@@ -5,7 +5,7 @@ + */ + + #include <sys/socket.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/time.h> + #include <sys/un.h> + #include <string.h> @@ -322,8 +322,9 @@ failed: } #else /* WITH_SECURITY */ _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
