Commit 5d593103 authored by Stephane Glondu's avatar Stephane Glondu
Browse files

New upstream version 1.7.1+dfsg

parent c1fbdef3

.gitlab-ci.yml

0 → 100644
+47 −0
Original line number Diff line number Diff line 
stages:

  - build_and_test_with_preinstalled_image

  - build_and_test_with_debian_image



build_and_test_with_preinstalled_image:

  stage: build_and_test_with_preinstalled_image

  # Image swergas/beleniosbase:efa5df3049f736dd34eb8289da730dd709eb99939f6511fa93ae0080a61ce4fb is based on ocaml/opam2:debian-9 with all pre-installed apt packages and opam packages that are required by Belenios

  image: swergas/beleniosbase:efa5df3049f736dd34eb8289da730dd709eb99939f6511fa93ae0080a61ce4fb

  script:

    # Install required packages

    # - sudo apt-get update -qq && sudo apt-get install -y -qq build-essential libgmp-dev libpcre3-dev pkg-config m4 libssl-dev libsqlite3-dev wget ca-certificates unzip aspcud libncurses-dev uuid-runtime zlib1g-dev

    # Install the same Opam packages that opam-bootstrap.sh installs

    # - eval `grep "opam install" ./opam-bootstrap.sh`

    # Compile belenios

    - BELENIOS_DEBUG=1 make all

    # Create a bundled version of belenios (this produces a belenios.tar.gz file, which is needed by the web server)

    - make archive

    # Start belenios web server

    - ./demo/run-server.sh &

    # Access the localhost web page, print page output for debug purposes, and check validity of page output

    - first_access_index_page_output=$(wget --retry-connrefused --no-check-certificate -T 30 http://localhost:8001 -O-)

    - echo $first_access_index_page_output

    - if [ "$(echo \"$first_access_index_page_output\" | grep '>Belenios</a>' | wc -l)" != "1" ]; then echo "[First page access] First page access does not show a single '>Belenios</a>' text, but it should" && exit 1; else echo "[First page access] First page access shows a single '>Belenios</a>' text, as expected"; fi

    # Run a test of an election

    - BELENIOS_DEBUG=1 make check



build_and_test_with_debian_image:

  stage: build_and_test_with_debian_image

  # Image ocaml/opam2:debian-9-ocaml-4.06 currently has ocaml version 4.06.1 and opam version 2.0.0 (whereas image ocaml/opam2:debian-9 currently has ocaml version 4.07.0)

  image: ocaml/opam2:debian-9-ocaml-4.06

  script:

    # Install required packages

    - sudo apt-get update -qq && sudo apt-get install -y -qq build-essential libgmp-dev libpcre3-dev pkg-config m4 libssl-dev libsqlite3-dev wget ca-certificates unzip aspcud libncurses-dev uuid-runtime zlib1g-dev

    # Install the same Opam packages that opam-bootstrap.sh installs

    - eval `grep "opam install" ./opam-bootstrap.sh`

    # Compile belenios

    - BELENIOS_DEBUG=1 make all

    # Create a bundled version of belenios (this produces a belenios.tar.gz file, which is needed by the web server)

    - make archive

    # Start belenios web server

    - ./demo/run-server.sh &

    # Access the localhost web page, print page output for debug purposes, and check validity of page output

    - first_access_index_page_output=$(wget --retry-connrefused --no-check-certificate -T 30 http://localhost:8001 -O-)

    - echo $first_access_index_page_output

    - if [ "$(echo \"$first_access_index_page_output\" | grep '>Belenios</a>' | wc -l)" != "1" ]; then echo "[First page access] First page access does not show a single '>Belenios</a>' text, but it should" && exit 1; else echo "[First page access] First page access shows a single '>Belenios</a>' text, as expected"; fi

    # Run a test of an election

    # - BELENIOS_DEBUG=1 make check

CHANGES.md

+22 −0
Original line number Diff line number Diff line 
1.7.1 (2018-12-05)

==================



 * Do not output spurious empty lines in records file (bugfix: voting

   records and missing voters were not working)

 * More explicit checklist in election validation page

 * Avoid sending password/credential emails when name has not been

   edited

 * Avoid hidden parameters in some services that are meant to be usable

   from non-web clients



1.7 (2018-11-26)

================



 * Add automatic data archival/deletion policy

 * Do not allow election validation if some items have not been edited

 * Trustees can load their private key from a file

 * Do no longer rely on Ocsipersist

 * Port to OCaml 4.06.1 and Eliom 6.3.0

 * Re-seed LwtRandom prng every 30 minutes

 * Add a placeholder for warnings/announcements



1.6 (2018-06-13)

================

INSTALL.md

+5 −24
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ The non-OCaml prerequisites are: 
 * [SQLite3](https://www.sqlite.org/)

 * [OpenSSL](https://www.openssl.org/)

 * [Wget](https://www.gnu.org/software/wget/) or [curl](http://curl.haxx.se/)

 * [Zip](http://www.info-zip.org/Zip.html)

 * [Unzip](http://www.info-zip.org/UnZip.html)

 * [aspcud](http://www.cs.uni-potsdam.de/wv/aspcud/) (optional)

 * [ncurses](http://invisible-island.net/ncurses/)
@@ -29,7 +30,7 @@ These libraries and tools are pretty common, and might be directly part 
of your operating system. On [Debian](http://www.debian.org/) and its

derivatives, they can be installed with the following command:



    sudo apt install build-essential libgmp-dev libpcre3-dev pkg-config m4 libssl-dev libsqlite3-dev wget ca-certificates unzip aspcud libncurses-dev uuid-runtime zlib1g-dev

    sudo apt install build-essential libgmp-dev libpcre3-dev pkg-config m4 libssl-dev libsqlite3-dev wget ca-certificates zip unzip aspcud libncurses-dev uuid-runtime zlib1g-dev



If you are unfamiliar with OCaml or OPAM, we provide an

`opam-bootstrap.sh` shell script that creates a whole, hopefully
@@ -40,8 +41,8 @@ variable, or it will take `~/.belenios` by default. Just run: 


    ./opam-bootstrap.sh



On a modern desktop system, this needs approximately 10 minutes and 1

gigabyte of disk space.

On a modern desktop system, this needs approximately 11 minutes and 2

gigabytes of disk space.



If everything goes successfully, follow the given instructions to

update your shell environment, then run:
@@ -130,25 +131,13 @@ Additionnaly, you will need LaTeX to compile the specification. 
On Debian-based systems, you can install the dependencies needed to

compile the documentation with:



    sudo apt-get install markdown texlive

    sudo apt install markdown texlive



Once all the dependencies have been installed, the documentation can

be compiled with:



    make doc



Compilation using only official Debian packages

-----------------------------------------------



At the time of writing (07 Dec 2017), you need the stable version (stretch)

of Debian (or Ubuntu) to be able to compile Belenios using only

official Debian packages. On Ubuntu, you need to enable the "Universe"

repository. Instead of using OPAM, the dependencies of Belenios can

then be installed with:



    sudo apt install libatdgen-ocaml-dev libzarith-ocaml-dev libcryptokit-ocaml-dev libuuidm-ocaml-dev libcalendar-ocaml-dev libcmdliner-ocaml-dev

    sudo apt install ocsigenserver eliom libcsv-ocaml-dev



Compiling on Windows using Cygwin

---------------------------------
@@ -188,14 +177,6 @@ tool_ section above. 
Troubleshooting

---------------



### OCamlDuce incompatibility



OCamlDuce is an optional transitive dependency of Belenios, but

Belenios does not use it. If OCamlDuce was installed outside of OPAM

(e.g. via your system package manager), you may face issues. You can

work around them by uninstalling OCamlDuce and restarting the

installation procedure.



### Missing sources



The instructions outlined in this document and in the

RELEASE_NOTES.md

+11 −0
Original line number Diff line number Diff line 
1.7

===



 * To upgrade a web server running version 1.6, you need to delete the

   Ocsipersist store (by default the `ocsidb` file referred in the

   configuration file). This will archive all validated elections, and

   delete all draft elections. Additionally, you should clean up the

   data directory (the one referred in the `<spool>` directive in the

   configuration file) by removing all temporary files (run `rm *.*`

   in this directory) and private keys (`rm */private_key*.json*`).



1.1

===

VERSION

+1 −1
Original line number Diff line number Diff line 
1.6
 
1.7.1