Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ppp for openSUSE:Factory checked in 
at 2022-05-28 00:28:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
 and      /work/SRC/openSUSE:Factory/.ppp.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ppp"

Sat May 28 00:28:00 2022 rev:48 rq:979444 version:2.4.9

Changes:
--------
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes  2022-05-24 20:31:25.954922923 
+0200
+++ /work/SRC/openSUSE:Factory/.ppp.new.2254/ppp.changes        2022-05-28 
00:28:01.737646858 +0200
@@ -1,0 +2,7 @@
+Thu May 26 18:43:35 UTC 2022 - Martin Li??ka <mli...@suse.cz>
+
+- Add ppp-compiling-with-clang-encounters-an-error-in-eap-tls..patch
+  that fixed the following rpmlint error:
+  executable-stack (Badness: 10000) /usr/sbin/pppd
+
+-------------------------------------------------------------------

New:
----
  ppp-compiling-with-clang-encounters-an-error-in-eap-tls..patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ppp.spec ++++++
--- /var/tmp/diff_new_pack.vNpCyl/_old  2022-05-28 00:28:02.529647921 +0200
+++ /var/tmp/diff_new_pack.vNpCyl/_new  2022-05-28 00:28:02.533647926 +0200
@@ -62,6 +62,8 @@
 Patch5:         ppp-fork-fix.patch
 # misc tiny stuff
 Patch6:         ppp-misc.patch
+# PATCH-FIX-UPSTREAM ppp-fork-fix.patch -- fix E: executable-stack (Badness: 
10000) /usr/sbin/pppd
+Patch7:         ppp-compiling-with-clang-encounters-an-error-in-eap-tls..patch
 # Of cause any other compatible libc would work, like musl, but 2.24 required 
for SOL_NETLINK
 BuildRequires:  glibc-devel >= 2.24
 BuildRequires:  libpcap-devel
@@ -114,6 +116,7 @@
 %patch4 -p1
 %patch5
 %patch6
+%patch7 -p1
 
 %if "%{_lib}" == "lib64"
 %patch2 -p1


++++++ ppp-compiling-with-clang-encounters-an-error-in-eap-tls..patch ++++++
diff --git a/pppd/eap-tls.c b/pppd/eap-tls.c
index 5740f30..46a4d5b 100644
--- a/pppd/eap-tls.c
+++ b/pppd/eap-tls.c
@@ -280,6 +280,23 @@ ENGINE *eaptls_ssl_load_engine( char *engine_name )
 
 
 
+#ifndef OPENSSL_NO_ENGINE
+static int eaptls_UI_writer(UI *ui, UI_STRING *uis)
+{
+    PW_CB_DATA* cb_data = (PW_CB_DATA*)UI_get0_user_data(ui);
+    UI_set_result(ui, uis, cb_data->password);
+    return 1;
+}
+
+static int eaptls_UI_stub(UI* ui) {
+    return 1;
+}
+
+static int eaptls_UI_reader(UI *ui, UI_STRING *uis) {
+    return 1;
+}
+#endif
+
 /*
  * Initialize the SSL stacks and tests if certificates, key and crl
  * for client or server use can be loaded.
@@ -516,20 +533,11 @@ SSL_CTX *eaptls_init_ssl(int init_server, char 
*cacertfile, char *capath,
         {
             UI_METHOD* transfer_pin = UI_create_method("transfer_pin");
 
-            int writer (UI *ui, UI_STRING *uis)
-            {
-                PW_CB_DATA* cb_data = (PW_CB_DATA*)UI_get0_user_data(ui);
-                UI_set_result(ui, uis, cb_data->password);
-                return 1;
-            };
-            int stub (UI* ui) {return 1;};
-            int stub_reader (UI *ui, UI_STRING *uis) {return 1;};
-
-            UI_method_set_writer(transfer_pin,  writer);
-            UI_method_set_opener(transfer_pin,  stub);
-            UI_method_set_closer(transfer_pin,  stub);
-            UI_method_set_flusher(transfer_pin, stub);
-            UI_method_set_reader(transfer_pin,  stub_reader);
+            UI_method_set_writer(transfer_pin,  eaptls_UI_writer);
+            UI_method_set_opener(transfer_pin,  eaptls_UI_stub);
+            UI_method_set_closer(transfer_pin,  eaptls_UI_stub);
+            UI_method_set_flusher(transfer_pin, eaptls_UI_stub);
+            UI_method_set_reader(transfer_pin,  eaptls_UI_reader);
 
             dbglog( "Using our private key '%s' in engine", pkey_identifier );
             pkey = ENGINE_load_private_key(pkey_engine, pkey_identifier, 
transfer_pin, &cb_data);

Reply via email to