build in docker successful

9 years ago · a45ad12fd1
parent d1dd0b9d0a
commit a45ad12fd1
8 changed files with 68 additions and 42 deletions
--- a/17
+++ b/17
@ -1,3 +1,20 @@
+2015-11-05 12:53  marc
+
+	* bootstrap.sh, debian, debian/changelog.in, debian/compat,
+	  debian/control.in, debian/docs, debian/rules: updated build
+	  system
+
+2015-11-05 09:58  marc
+
+	* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
+	  bootstrap.sh, build-in-docker.sh, resolve-debbuilddeps.sh:
+	  updated build system
+
+2015-11-04 15:48  marc
+
+	* html/messagetable.php, html/safechat.js, html/usertable.php:
+	  added foreign key to database
+
 2015-11-03 22:02  marc

 	* AUTHORS, ax_check_qt.m4, ax_init_standard_project.m4,
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -120,7 +120,7 @@ GENERATED FILES
    * src/version.hxx - if you enabled AX_USE_CXX
    * src/version.cxx - if you enabled AX_USE_CXX
    * html/makefile.am - if you enabled AX_BUILD_HTML
-    * scripts/makefile.am - if you enabled AX_USE_SCRIPTS
+    * scripts/makefile.in - if you enabled AX_USE_SCRIPTS
    * doc/makefile.am - if you enabled AX_USE_DOXYGEN
    * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
    * test/makefile.am - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
@ -332,7 +332,7 @@ to() {
        case "$1" in
            (--condition) shift # test for a tag, abort if not set
                if ! testtag "$1"; then
-                    return 0
+                    return
                fi;;
            (--mode) shift # test for a tag, abort if not set
                mode="$1";;
@ -427,7 +427,8 @@ ${DEFAULT_PROJECT_NAME}

 add description for ${DEFAULT_PROJECT_NAME}
 EOF
-to configure.ac <<EOF && notice "please edit configure.ac, then rerun $0" && exit 0
+to configure.ac <<EOF && \
+    ( notice "please edit configure.ac, then rerun $0"; exit 0 )
 ${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
 m4_define(x_major, 0) # project's major version
 m4_define(x_minor, 0) # project's minor version
@ -699,11 +700,7 @@ namespace NAMESPACE {
  const std::string IDENT("\$Id: " PACKAGE_STRING);
 }
 EOF
-to --condition AX_USE_SCRIPTS scripts/makefile.am <<EOF
-${HEADER}dist_bin_SCRIPTS =
-
-MAINTAINERCLEANFILES = makefile.in
-EOF
+echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_SCRIPTS scripts/makefile.am
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
 to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
 ${HEADER}$(if testtag AX_USE_CXX; then
@ -827,7 +824,7 @@ EOF
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @AUTHOR@
-Build-Depends: ${BUILD_DEPENDS}
+Build-Depends: ${BUILD-DEPENDS}

 Package: @PACKAGE_NAME@
 Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi)
@ -841,7 +838,7 @@ $(      if testtag AX_USE_LIBTOOL; then
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}
+Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD-DEPENDS}
 Description: @DESCRIPTION@ - Development Package
@README_DEB@
 EOF2
@ -986,28 +983,8 @@ fi)

 EOF
 SUBDIRS=""
-if testtag AX_USE_CXX; then
-    SUBDIRS="${SUBDIRS} src"
-fi
-if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
-    SUBDIRS="${SUBDIRS} test"
-fi
-if testtag AX_USE_SCRIPTS; then
-    SUBDIRS="${SUBDIRS} scripts"
-fi
-if testtag AX_USE_DOXYGEN; then
-    SUBDIRS="${SUBDIRS} doc"
-fi
-if testtag AX_BUILD_EXAMPLES; then
-    SUBDIRS="${SUBDIRS} examples"
-fi
-if testtag AX_BUILD_HTML; then
-    SUBDIRS="${SUBDIRS} html"
-fi
 for d in src test scripts doc examples html; do
-    if test -d "$d" -a "${SUBDIRS//$d/}" = "${SUBDIRS}"; then
-        SUBDIRS="${SUBDIRS} $d"
-    fi
+    test -d $d && SUBDIRS="${SUBDIRS} $d"
 done
 to makefile.am<<EOF
 ${HEADER}SUBDIRS =${SUBDIRS}
--- a/cordova/platforms/android/AndroidManifest.xml
+++ b/cordova/platforms/android/AndroidManifest.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="333" android:versionName="0.3.33" package="ch.safechat" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="337" android:versionName="0.3.37" package="ch.safechat" xmlns:android="http://schemas.android.com/apk/res/android">
    <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
--- a/cordova/platforms/android/res/xml/config.xml
+++ b/cordova/platforms/android/res/xml/config.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="ch.safechat" version="0.3.33" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="ch.safechat" version="0.3.37" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
    <preference name="loglevel" value="DEBUG" />
    <feature name="Whitelist">
        <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
--- a/debian/control.in
+++ b/debian/control.in
@ -1,10 +1,10 @@
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @AUTHOR@
-Build-Depends: debhelper, subversion, svn2cl, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen
+Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release, doxygen, graphviz, mscgen

 Package: @PACKAGE_NAME@
-Section: 
+Section: web
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: @DESCRIPTION@
--- a/debian/rules
+++ b/debian/rules
@ -1,10 +1,8 @@
 ## @id $Id$
-##
-## This file has been added:
-##  - by bootstrap.sh
-##  -  on Thu, 05 November 2015 13:53:02 +0100
-## Feel free to change it or even remove and rebuild it, up to your needs
-##
+#
+# This file has been added by bootstrap.sh on Sun, 28 June 2015 22:06:16 +0200
+# Feel free to change it or even remove and rebuild it, up to your needs
+#
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890

--- a/makefile.am
+++ b/makefile.am
@ -6,7 +6,7 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890

-SUBDIRS = scripts doc html
+SUBDIRS = scripts doc html cordova

 doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog

--- a/scripts/safechat-install.sh
+++ b/scripts/safechat-install.sh
@ -0,0 +1,34 @@
+#! /bin/bash
+
+APACHE_USER=${1:-www-data}
+KEYLENGTH=${2:-4096}
+SAFECHAT_NAME=${3:-Safe Chat}
+SAFECHAT_COMMENT=${4:-https://safechat.ch}
+SAFECHAT_EMAIL=${5:-server@safechat.ch}
+PASSWORD=${PASSWORD:-${6:-$(pwgen 80 1)}}
+
+if sudo -u ${APACHE_USER} gpg2 -K "${SAFECHAT_NAME}"; then
+    FINGERPRINT=$(LANG= sudo -u ${APACHE_USER} gpg2 --fingerprint "${SAFECHAT_NAME}" \
+                  | sed -n 's, ,,g;s,.*Keyfingerprint=,,p')
+    echo "deleting key ${SAFECHAT_NAME} with fingerprint ${FINGERPRINT}"
+    sudo -u ${APACHE_USER} gpg2 --batch --delete-secret-and-public-key "${FINGERPRINT}"
+fi
+if sudo -u ${APACHE_USER} gpg2 -K "${SAFECHAT_NAME}"; then
+    echo "**** error: key exists and cannot be deleted" 1>&2
+    exit 1
+fi
+
+sudo -u ${APACHE_USER} gpg -v -v --gen-key --batch <<EOF
+Key-Type: RSA
+Key-Length: ${KEYLENGTH}
+Subkey-Type: RSA
+Subkey-Length: ${KEYLENGTH}
+Name-Real: ${SAFECHAT_NAME}
+Name-Comment: ${SAFECHAT_COMMENT}
+Name-Email: ${SAFECHAT_EMAIL}
+Expire-Date: 0
+Passphrase: ${PASSWORD}
+%echo generating key for ${SAFECHAT_NAME} ...
+%commit
+%echo done.
+EOF