Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package apache-rex for openSUSE:Factory
checked in at 2021-12-18 20:29:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-rex (Old)
and /work/SRC/openSUSE:Factory/.apache-rex.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-rex"
Sat Dec 18 20:29:50 2021 rev:25 rq:940936 version:20211102
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache-rex/apache-rex.changes 2021-01-14
15:04:47.694726713 +0100
+++ /work/SRC/openSUSE:Factory/.apache-rex.new.2520/apache-rex.changes
2021-12-18 20:30:18.242244476 +0100
@@ -1,0 +2,6 @@
+Thu Dec 16 14:41:42 UTC 2021 - David Anes <david.a...@suse.com>
+
+- version update to 20211102
+ * add mod_php-ssl
+
+-------------------------------------------------------------------
New:
----
generate_tarball.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-rex.spec ++++++
--- /var/tmp/diff_new_pack.IotXfu/_old 2021-12-18 20:30:18.778244774 +0100
+++ /var/tmp/diff_new_pack.IotXfu/_new 2021-12-18 20:30:18.786244778 +0100
@@ -16,16 +16,11 @@
#
-#
-%if 0%{?suse_version} > 1230
%define macros_dir %{_rpmconfigdir}/macros.d
-%else
-%define macros_dir %{_sysconfdir}/rpm
-%endif
%define macros_file macros.apache-rex
Name: apache-rex
-Version: 20210108
+Version: 20211102
Release: 0
Summary: Script for Apache HTTPD Runnable Examples
License: Apache-2.0
@@ -34,6 +29,8 @@
Source0: %{name}.tar.bz2
Source1: apache-rex-rpmlintrc
Source2: %{macros_file}
+# simple script to generate the tarball from a commit id
+Source1000: generate_tarball.sh
Requires: apache2-devel
Requires: apache2-utils
Requires: curl
++++++ apache-rex-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.IotXfu/_old 2021-12-18 20:30:18.842244809 +0100
+++ /var/tmp/diff_new_pack.IotXfu/_new 2021-12-18 20:30:18.850244814 +0100
@@ -1,4 +1,6 @@
addFilter("apache-rex.noarch: W: files-duplicate")
addFilter("apache-rex.noarch: W: zero-length")
+addFilter("apache-rex.noarch: E: zero-length")
addFilter("apache-rex.noarch: W: wrong-file-end-of-line-encoding")
+(No newline at EOF)
++++++ apache-rex.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_php-ssl/BINARIES
new/apache-rex/mod_php-ssl/BINARIES
--- old/apache-rex/mod_php-ssl/BINARIES 1970-01-01 01:00:00.000000000 +0100
+++ new/apache-rex/mod_php-ssl/BINARIES 2021-11-02 10:37:06.000000000 +0100
@@ -0,0 +1 @@
+openssl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_php-ssl/DESCRIPTION
new/apache-rex/mod_php-ssl/DESCRIPTION
--- old/apache-rex/mod_php-ssl/DESCRIPTION 1970-01-01 01:00:00.000000000
+0100
+++ new/apache-rex/mod_php-ssl/DESCRIPTION 2021-11-02 10:37:06.000000000
+0100
@@ -0,0 +1 @@
+How to utilize ssl connection to php server.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_php-ssl/MODULES
new/apache-rex/mod_php-ssl/MODULES
--- old/apache-rex/mod_php-ssl/MODULES 1970-01-01 01:00:00.000000000 +0100
+++ new/apache-rex/mod_php-ssl/MODULES 2021-11-02 10:37:06.000000000 +0100
@@ -0,0 +1 @@
+ssl mime log_config version php.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_php-ssl/MODULES_OPT
new/apache-rex/mod_php-ssl/MODULES_OPT
--- old/apache-rex/mod_php-ssl/MODULES_OPT 1970-01-01 01:00:00.000000000
+0100
+++ new/apache-rex/mod_php-ssl/MODULES_OPT 2021-11-02 10:37:06.000000000
+0100
@@ -0,0 +1 @@
+socache_shmcb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_php-ssl/encrypt.php
new/apache-rex/mod_php-ssl/encrypt.php
--- old/apache-rex/mod_php-ssl/encrypt.php 1970-01-01 01:00:00.000000000
+0100
+++ new/apache-rex/mod_php-ssl/encrypt.php 2021-11-02 10:37:06.000000000
+0100
@@ -0,0 +1,13 @@
+<?php
+
+$plaintext = "message to be encrypted";
+$method = 'AES-256-CBC';
+$key = random_bytes(32);
+$iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length($plaintext));
+$encrypted = openssl_encrypt($plaintext, $method, $key, $options=0, $iv);
+$decrypted = openssl_decrypt($encrypted, $method, $key, $options=0, $iv);
+
+echo $decrypted." -> ".$encrypted." "."\n";
+
+?>
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_php-ssl/example.conf.in
new/apache-rex/mod_php-ssl/example.conf.in
--- old/apache-rex/mod_php-ssl/example.conf.in 1970-01-01 01:00:00.000000000
+0100
+++ new/apache-rex/mod_php-ssl/example.conf.in 2021-11-02 10:37:06.000000000
+0100
@@ -0,0 +1,38 @@
+ServerName aserver.suse.cz
+
+<IfVersion >= 2.4.2>
+ DefaultRuntimeDir @AREX_RUN_DIR@/run
+</IfVersion>
+
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl .crl
+
+SSLEngine on
+
+SSLCertificateFile @AREX_RUN_DIR@/aserver.suse.cz/my.crt
+SSLCertificateKeyFile @AREX_RUN_DIR@/aserver.suse.cz/private.key
+
+SSLSessionCache shmcb:@AREX_RUN_DIR/ssl_scache(512000)
+SSLSessionCacheTimeout 300
+
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+
+SSLProtocol all
+<IfVersion >= 2.3.0>
+SSLCipherSuite DEFAULT
+</IfVersion>
+<IfVersion < 2.3.0>
+SSLCipherSuite ALL
+</IfVersion>
+SSLHonorCipherOrder on
+
+CustomLog @AREX_RUN_DIR@/test-server_log ssl_combined
+
+<Directory @AREX_DOCUMENT_ROOT@>
+ <FilesMatch "\.ph(p|tml)">
+ SetHandler application/x-httpd-php
+ </FilesMatch>
+ @AREX_ALLOW_FROM_LOCALHOST@
+</Directory>
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_php-ssl/pre-run.sh
new/apache-rex/mod_php-ssl/pre-run.sh
--- old/apache-rex/mod_php-ssl/pre-run.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/apache-rex/mod_php-ssl/pre-run.sh 2021-11-02 10:37:06.000000000
+0100
@@ -0,0 +1,16 @@
+#
+# create CA certificate and SERVER certificate
+#
+. ../lib/openssl
+echo Setup CA
+echo ~~~~~~~~
+openssl_setup_ca $AREX_RUN_DIR
+echo
+echo Setup SERVER
+echo ~~~~~~~~~~~~
+openssl_setup_entity $AREX_RUN_DIR aserver.suse.cz
+echo
+#
+# create runtime dir, see DefaultRuntimeDir directive
+#
+mkdir -p $AREX_RUN_DIR/run
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_php-ssl/run.sh
new/apache-rex/mod_php-ssl/run.sh
--- old/apache-rex/mod_php-ssl/run.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/apache-rex/mod_php-ssl/run.sh 2021-11-02 10:37:06.000000000 +0100
@@ -0,0 +1,13 @@
+exit_code=0
+
+echo "[1] access trough https to php script"
+cp welcome.php $AREX_DOCUMENT_ROOT
+curl -s --cacert $AREX_RUN_DIR/ca/my.crt --resolve
"aserver.suse.cz:$AREX_PORT:127.0.0.1"
https://aserver.suse.cz:$AREX_PORT/welcome.php \
+ | grep 'HELLO FROM PHP MODULE, USING SSL' || exit_code=1
+
+echo "[2] use php openssl extension"
+cp encrypt.php $AREX_DOCUMENT_ROOT
+curl -s --cacert $AREX_RUN_DIR/ca/my.crt --resolve
"aserver.suse.cz:$AREX_PORT:127.0.0.1"
https://aserver.suse.cz:$AREX_PORT/encrypt.php \
+ | grep 'message to be encrypted' || exit_code=1
+
+exit $exit_code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_php-ssl/skip.sh
new/apache-rex/mod_php-ssl/skip.sh
--- old/apache-rex/mod_php-ssl/skip.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/apache-rex/mod_php-ssl/skip.sh 2021-11-02 10:37:06.000000000 +0100
@@ -0,0 +1,2 @@
+# REASON: curl does not have --resolve or not using prefork MPM
+exit $([ $AREX_CURL_HAVE_RESOLVE -eq 0 -o ! $AREX_MPM == 'prefork' ])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_php-ssl/welcome.php
new/apache-rex/mod_php-ssl/welcome.php
--- old/apache-rex/mod_php-ssl/welcome.php 1970-01-01 01:00:00.000000000
+0100
+++ new/apache-rex/mod_php-ssl/welcome.php 2021-11-02 10:37:06.000000000
+0100
@@ -0,0 +1 @@
+<?php print strtoupper("hello from php module, using SSL"); ?>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/apache-rex/mod_ssl-pkcs11/skip.sh
new/apache-rex/mod_ssl-pkcs11/skip.sh
--- old/apache-rex/mod_ssl-pkcs11/skip.sh 2021-01-08 15:15:02.216511041
+0100
+++ new/apache-rex/mod_ssl-pkcs11/skip.sh 2021-11-02 10:37:06.000000000
+0100
@@ -1,2 +1,2 @@
# REASON: curl does not have --resolve
-exit $([ $AREX_CURL_HAVE_RESOLVE -eq 0 || $AREX_APACHE_VERSION -ge 20443 ])
+exit $([ $AREX_CURL_HAVE_RESOLVE -eq 0 ] || [ $AREX_APACHE_VERSION -gt 20443 ])
++++++ generate_tarball.sh ++++++
#!/bin/bash
if [ -n "$1" ]; then
rm -rf apache_rex
git clone https://github.com/pgajdos/apache-rex __repo
cd __repo
git checkout -b $1
git archive --format=tar --prefix="apache-rex/" $1 | bzip2 >
../apache-rex.tar.bz2
cd ..
rm -rf __repo
else
echo "Usage: generate.tarball.sh COMMIT_ID"
fi
(No newline at EOF)
