Debian packaging with a small fix.

Co-authored-by: Michał Sidor <[email protected]>

Author: b-chmiel

.gitignore

@@ -21,3 +21,10 @@ pin.log
 .idea
 .cache
 __pycache__
+
+debian/.debhelper/
+debian/debhelper-build-stamp
+debian/files
+debian/*.substvars
+debian/sio2jail/
+obj-*/

CMakeLists.txt

@@ -13,8 +13,8 @@ ENDIF()
 IF(NOT DEFINED ARCH)
     SET(ARCH "NATIVE")
 ENDIF()
-IF(NOT ARCH MATCHES "i386|x86_64|NATIVE")
-    MESSAGE(FATAL_ERROR "ARCH should be one of i386, x86_64, NATIVE")
+IF(NOT ARCH MATCHES "i386|x86_64|amd64|NATIVE")
+    MESSAGE(FATAL_ERROR "ARCH should be one of i386, amd64, NATIVE")
 ENDIF()
 
 IF(NOT DEFINED WITH_CLANG_TIDY)
@@ -43,7 +43,7 @@ ENDIF()
 IF(ARCH STREQUAL "i386")
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-ELSEIF(ARCH STREQUAL "x86_64")
+ELSEIF(ARCH MATCHES "amd64|x86_64")
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
 ENDIF()

README.md

@@ -55,7 +55,7 @@ option (STATIC by default):
 There is also a possibility to control whether output binary should run on other
 architecture than the default one (or force given architecture):
 
-    -DARCH=i386|x86_64
+    -DARCH=i386|amd64
 
 Note, that when using ARCH other than build host architecture it may be necessary
 (depending on libraries installation) to build sio2jail with custom libseccomp (more

debian/README

@@ -0,0 +1 @@
+../README.md

debian/changelog

@@ -0,0 +1,5 @@
+sio2jail (1.3.1) UNRELEASED; urgency=medium
+
+  * Initial Release.
+
+ -- Michał Sidor <[email protected]>  Sun, 12 Jan 2020 15:24:25 +0100

debian/compat

@@ -0,0 +1 @@
+11

debian/control

@@ -0,0 +1,14 @@
+Source: sio2jail
+Section: utils
+Priority: optional
+Maintainer: Michał Sidor <[email protected]>
+Build-Depends: debhelper (>= 11), cmake
+Standards-Version: 4.1.3
+Homepage: https://github.com/sio2project/sio2jail
+Vcs-Browser: https://github.com/sio2project/sio2jail
+Vcs-Git: https://github.com/sio2project/sio2jail.git
+
+Package: sio2jail
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A tool for supervising execution of programs submitted in algorithmic competitions

debian/rules

@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+%:
+	dh $@ --buildsystem=cmake
+
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DARCH=$(DEB_TARGET_ARCH)
+
+override_dh_auto_test:
+	echo Tests skipped
+

debian/sio2jail-docs.docs

@@ -0,0 +1 @@
+README

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

doc/CMakeLists.txt

@@ -4,4 +4,4 @@ ADD_CUSTOM_COMMAND(OUTPUT sio2jail.1
 
 ADD_CUSTOM_TARGET(doc ALL DEPENDS sio2jail.1 scdoc)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/sio2jail.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}")
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/sio2jail.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")