Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openfortivpn for openSUSE:Factory
checked in at 2022-05-09 18:44:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openfortivpn (Old)
and /work/SRC/openSUSE:Factory/.openfortivpn.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openfortivpn"
Mon May 9 18:44:22 2022 rev:21 rq:975757 version:1.17.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/openfortivpn/openfortivpn.changes
2022-04-01 21:38:13.652100930 +0200
+++ /work/SRC/openSUSE:Factory/.openfortivpn.new.1538/openfortivpn.changes
2022-05-09 18:45:20.528294644 +0200
@@ -1,0 +2,6 @@
+Sat May 7 14:00:06 UTC 2022 - Martin Hauke <mar...@gmx.de>
+
+- Update to version 1.17.3
+ * fix regression: spurious warning message after reading config
+
+-------------------------------------------------------------------
Old:
----
openfortivpn-1.17.2.tar.gz
New:
----
openfortivpn-1.17.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openfortivpn.spec ++++++
--- /var/tmp/diff_new_pack.6SAfiI/_old 2022-05-09 18:45:21.264295507 +0200
+++ /var/tmp/diff_new_pack.6SAfiI/_new 2022-05-09 18:45:21.272295517 +0200
@@ -17,7 +17,7 @@
Name: openfortivpn
-Version: 1.17.2
+Version: 1.17.3
Release: 0
Summary: Client for PPP+SSL VPN tunnel services
License: GPL-3.0-or-later
++++++ openfortivpn-1.17.2.tar.gz -> openfortivpn-1.17.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openfortivpn-1.17.2/CHANGELOG.md
new/openfortivpn-1.17.3/CHANGELOG.md
--- old/openfortivpn-1.17.2/CHANGELOG.md 2022-03-31 08:30:13.000000000
+0200
+++ new/openfortivpn-1.17.3/CHANGELOG.md 2022-05-03 17:51:49.000000000
+0200
@@ -14,6 +14,10 @@
This high level changelog is usually updated when a release is tagged.
On the master branch there may be changes that are not (yet) described here.
+### 1.17.3
+
+* [-] fix regression: spurious warning message after reading config
+
### 1.17.2
* [-] fix memory leak when reading user input
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openfortivpn-1.17.2/configure.ac
new/openfortivpn-1.17.3/configure.ac
--- old/openfortivpn-1.17.2/configure.ac 2022-03-31 08:30:13.000000000
+0200
+++ new/openfortivpn-1.17.3/configure.ac 2022-05-03 17:51:49.000000000
+0200
@@ -2,13 +2,12 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63])
-AC_INIT([openfortivpn], [1.17.2])
+AC_INIT([openfortivpn], [1.17.3])
AC_CONFIG_SRCDIR([src/main.c])
AM_INIT_AUTOMAKE([foreign subdir-objects])
# Checks for programs.
AC_PROG_CC
-AC_PROG_CC_STDC
AC_PROG_MKDIR_P
AC_PROG_SED
AC_PROG_INSTALL
@@ -449,4 +448,5 @@
AC_CONFIG_COMMANDS([timestamp], [touch src/.dirstamp])
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openfortivpn-1.17.2/src/config.c
new/openfortivpn-1.17.3/src/config.c
--- old/openfortivpn-1.17.2/src/config.c 2022-03-31 08:30:13.000000000
+0200
+++ new/openfortivpn-1.17.3/src/config.c 2022-05-03 17:51:49.000000000
+0200
@@ -32,8 +32,6 @@
#include <openssl/x509.h> /* work around OpenSSL bug: missing definition of
STACK_OF */
#include <openssl/tls1.h>
-#include <sys/stat.h>
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
@@ -180,20 +178,16 @@
*/
int load_config(struct vpn_config *cfg, const char *filename)
{
- int ret = ERR_CFG_UNKNOWN;
+ int ret = 0;
FILE *file;
- struct stat stat;
char *line = NULL;
size_t len = 0;
ssize_t read;
file = fopen(filename, "r");
- if (file == NULL)
- return ERR_CFG_SEE_ERRNO;
-
- if (fstat(fileno(file), &stat) == -1) {
+ if (file == NULL) {
ret = ERR_CFG_SEE_ERRNO;
- goto err_close;
+ goto err_return;
}
// Read line by line
@@ -450,24 +444,17 @@
cfg->check_virtual_desktop = strdup(val);
} else {
log_warn("Bad key in configuration file: \"%s\".\n",
key);
- goto err_close;
+ goto err_free;
}
}
-
- if (errno != 0) // From getline
+ if (ferror(file))
ret = ERR_CFG_SEE_ERRNO;
- else
- ret = 0;
-err_close:
- if (fclose(file)) {
- log_warn("Could not close %s (%s).\n", filename,
strerror(errno));
- if (ret == ERR_CFG_SEE_ERRNO) {
- // fclose just ruined the errno, so don't rely on it
anymore.
- ret = ERR_CFG_UNKNOWN;
- }
- }
+err_free:
free(line);
+ if (fclose(file))
+ log_warn("Could not close %s (%s).\n", filename,
strerror(errno));
+err_return:
return ret;
}
