Merge branch 'maint-1.3'

Author: yuumasato

.travis.yml

@@ -26,12 +26,14 @@ matrix:
             - swig
             - librtmp-dev
             - xsltproc
+            - rpm-common
+            - lua50
       before_script:
         - cd build
       script:
         - cmake -DCMAKE_BUILD_TYPE=Debug ../
         - build-wrapper-linux-x86-64 --out-dir bw-output make all || make all  # build-wrapper won't work on forked repositories.
-        - ctest --output-on-failure || true  # Tests won't pass on Ubuntu.
+        - ctest --output-on-failure
         - (cd .. && sonar-scanner) || true  # Will always fail builds on forked repositories.
       after_success:
         - curl -s https://codecov.io/bash > cov.sh && bash cov.sh -x "$GCOV"

CMakeLists.txt

@@ -239,7 +239,7 @@ cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_XMLFILECONTENT "Independent xm
 # UNIX PROBES
 cmake_dependent_option(OPENSCAP_PROBE_UNIX_DNSCACHE "Unix dnscache probe" ON "ENABLE_PROBES_UNIX" OFF)
 cmake_dependent_option(OPENSCAP_PROBE_UNIX_FILE "Unix file probe" ON "ENABLE_PROBES_UNIX" OFF)
-cmake_dependent_option(OPENSCAP_PROBE_UNIX_FILEEXTENDEDATTRIBUTE "Unix fileextendedattribute probe" ON "ENABLE_PROBES_UNIX; (HAVE_SYS_XATTR_H OR HAVE_ATTR_XATTR_H)" OFF)
+cmake_dependent_option(OPENSCAP_PROBE_UNIX_FILEEXTENDEDATTRIBUTE "Unix fileextendedattribute probe" ON "ENABLE_PROBES_UNIX; HAVE_SYS_XATTR_H OR HAVE_ATTR_XATTR_H" OFF)
 cmake_dependent_option(OPENSCAP_PROBE_UNIX_GCONF "Unix gconf probe" ON "ENABLE_PROBES_UNIX; GCONF_FOUND" OFF)
 cmake_dependent_option(OPENSCAP_PROBE_UNIX_INTERFACE "Unix interface probe" ON "ENABLE_PROBES_UNIX" OFF)
 cmake_dependent_option(OPENSCAP_PROBE_UNIX_PASSWORD "Unix password probe" ON "ENABLE_PROBES_UNIX" OFF)

cmake/FindACL.cmake

@@ -8,11 +8,11 @@
 include(LibFindMacros)
 
 # Use pkg-config to get hints about paths
-libfind_pkg_check_modules(ACL_PKGCONF acl)
+libfind_pkg_check_modules(ACL_PKGCONF libacl)
 
 # Include dir
 find_path(ACL_INCLUDE_DIR
-	NAMES acl/libacl.h
+	NAMES "acl/libacl.h" "sys/libacl.h"
 	PATHS ${ACL_PKGCONF_INCLUDE_DIRS}
 )
 

compat/compat.h

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * Authors:
  *      Jan Černý <[email protected]>

compat/oscap_platforms.h

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  */
 

compat/strsep.c

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * Authors:
  *      Jan Černý <[email protected]>

docs/developer/developer.adoc

@@ -151,7 +151,13 @@ that you need to have these additional packages installed:
 wget lua which procps-ng initscripts chkconfig sendmail bzip2 rpm-build
 ----
 
-and it is also required to have `sendmail` service running on the system:
+On Ubuntu 18.04, also install:
+
+----
+rpm-common
+----
+
+It is also required to have `sendmail` service running on the system:
 
 ----
 $ systemctl start sendmail.service

release_tools/README.adoc

@@ -49,12 +49,22 @@ Update the `AUTHORS` file for missing authors and the `naming.sh` file if there
 +
 Use it to update the `NEWS` file and commit it.
 +
-The last commit before the release has to have the `openscap-<version>` message (e.g. `openscap-1.2.17`).
+The last commit before the release has to have the `openscap-<version>` message (e.g. `openscap-1.3.2`).
+
+. Create tarballs and GitHub release.
++
+In a clean copy of the release branch run `cmake .. && make package_source` in the `build` directory.
++
+Create new GitHub release with the name of the vesrion (e.g. 1.3.2) being released.
++
+Add relevant part of the NEWS file as a release description. 
++
+Attach `openscap-X.Y.Z.tar.gz` and `openscap-X.Y.Z.tag.gz.sha512` files to the GH release, created against the release tag.
 
 . Run `new-release.sh`.
 +
 This will create and push version tags, create new GitHub release and handle milestones swap.
-Finally, it will bump version numbers in `versions.sh` to be ready for the next upstream release.
+Finally, it will bump version numbers in `versions.sh` to be ready for the next (e.g. 1.3.3) upstream release.
 
 . Build OpenSCAP for Windows
 +

release_tools/release.sh

@@ -355,7 +355,7 @@ upload_to_git()
 # $3: The new version
 flip_milestones()
 {
-    "./$SCRIPT_DIR/move-milestones.py" --owner "$2" --api-token "$1" "$version" "$3"
+    "$SCRIPT_DIR/move-milestones.py" --owner "$2" --auth-token "$1" "$version" "$3"
 }
 
 
@@ -414,6 +414,6 @@ release_to_git_and_bump_release()
     check_release_is_ok
     release_to_git
     # upload_to_git  # to be done when https://github.com/PyGithub/PyGithub/pull/525 is merged.
-    flip_milestones --auth-token "$GITHUB_TOKEN" openscap "$_new_version"
+    flip_milestones "$GITHUB_TOKEN" openscap "$_new_version"
     bump_release "$_new_version"
 }