networkupstools · jimklimov · Oct 26, 2025 · Aug 18, 2016 · Aug 18, 2016 · Aug 18, 2016
diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -0,0 +1,23 @@
+# See https://openbuildservice.org/help/manuals/obs-user-guide/cha-obs-scm-ci-workflow-integration#sec.obs.obs_scm_ci_workflow_integration.setup.token_authentication.how_to_authenticate_scm_with_obs
+
+main_workflow:
+  steps:
+    - branch_package:
+        source_project: home:jimklimov
+        source_package: nut
+        target_project: networkupstools
+  filters:
+    event: pull_request
+
+rebuild_master:
+  steps:
+    - trigger_services:
+        project: networkupstools
+        package: nut
+  filters:
+    event:
+      - push
+      - tag_push
+    branches:
+      only:
+        - master
diff --git a/Makefile.am b/Makefile.am
@@ -650,6 +650,7 @@ SPELLCHECK_DIRS_MOST = \
 	spellcheck/scripts/external_apis \
 	spellcheck/scripts/hotplug \
 	spellcheck/scripts/installer \
+	spellcheck/scripts/obs \
 	spellcheck/scripts/python \
 	spellcheck/scripts/systemd \
 	spellcheck/scripts/udev \

diff --git a/NEWS.adoc b/NEWS.adoc
@@ -232,6 +232,11 @@ several `FSD` notifications into one executed action. [PR #3097]
  - Updated `docs/*.txt`: add asciidoc comments with links to nut-website
    rendered contents of most interesting pages. [#3095]
 
+ - Source directory `data/html` was renamed to `data/htmlcgi` in order to
+   better reflect its contents and purpose, compared to documentation-oriented
+   `html*` directories (and recipe variable names). This may impact some
+   packaging recipes which do not rely on `make install` alone. [#3049]
+
  - Dropped the `compile` script from Git sources. It originates from automake
    and is added to work area (if missing) during `autogen.sh` rituals anyway.
    It is still distributed as part of `make dist` tarball. [#1209]
@@ -265,6 +270,13 @@ several `FSD` notifications into one executed action. [PR #3097]
  - The `configure` script should now try harder to report specifically
    the "purelib" location as `PYTHON*_SITE_PACKAGES`. [#1209]
 
+ - Upstreamed reference packaging recipes (DEB, RPM) from the 42ITy project
+   which can be used with OBS (Open Build Service by SUSE), both to support
+   end-user testing of NUT development, and to have a yet another NUT CI farm
+   player with a distinct opinion on code quality. Many of the changes listed
+   above happened thanks to this effort, and due to concerns raised by OBS
+   build agents with various Linux distributions. [#1209, #1316, #3144]
+
  - Revised use of NUT macros for USB Vendor IDs listed in different drivers,
    so the names would be better exposed in generated `udev.rules` and similar
    files. [PR #3139]

diff --git a/UPGRADING.adoc b/UPGRADING.adoc
@@ -40,6 +40,11 @@ Changes from 2.8.4 to 2.8.5
   help distributions that place `*.conf.sample` files into docs or other
   locations. [#3131]
 
+- Source directory `data/html` was renamed to `data/htmlcgi` in order to better
+  reflect its contents and purpose, compared to documentation-oriented `html*`
+  directories (and recipe variable names). This may impact some packaging
+  recipes which do not rely on `make install` alone. [#3049]
+
 - Dropped the `compile` script from Git sources. It originates from automake
   and is added to work area (if missing) during `autogen.sh` rituals anyway
   (as `make` says, `'automake --add-missing' can install 'compile'` when you

diff --git a/ci_build.sh b/ci_build.sh
@@ -1478,6 +1478,8 @@ if [ -z "$BUILD_TYPE" ] ; then
 
         win|windows|cross-windows-mingw) BUILD_TYPE="cross-windows-mingw" ; shift ;;
 
+        pkg*) BUILD_TYPE="$1" ; shift ;;
+
         spellcheck|spellcheck-interactive|spellcheck-quick|spellcheck-interactive-quick)
             # Note: this is a little hack to reduce typing
             # and scrolling in (docs) developer iterations.
@@ -2869,6 +2871,42 @@ cross-windows-mingw*)
     ./build-mingw-nut.sh $cmd
     ;;
 
+pkg-rpm|pkg-spec)
+    echo "WARNING: package build recipes manipulate directly your current workspace" >&2
+    echo "         and would remove any git-ignored files, might leave trash afterwards!" >&2
+    echo "         Press Ctrl+C to abort if this is a problem" >&2
+    sleep 5
+
+    rm -f nut.spec nut.changes || true
+    git clean -fdX || true
+    cp -f scripts/obs/nut.spec scripts/obs/nut.changes .
+    sed -e 's,^(Version:).*$,\1 '"`NUT_VERSION_QUERY=VER50 ./tools/gitlog2version.sh`," \
+        -i nut.spec
+    rpmbuild -ba nut.spec \
+    && find . -name '*rpm'
+    ;;
+
+pkg-deb|pkg-dsc)
+    echo "WARNING: package build recipes manipulate directly your current workspace" >&2
+    echo "         and would remove any git-ignored files, might leave trash afterwards!" >&2
+    echo "         Press Ctrl+C to abort if this is a problem" >&2
+    sleep 5
+
+    rm -rf debian config.*cdbs* nut.dsc || true
+    git clean -fdX || true
+    mkdir -p debian
+    (cd scripts/obs || exit
+    for F in debian.* ; do
+        ln -s "../scripts/obs/$F" "../../debian/`echo "$F" | sed 's/debian.//'`" || exit
+    done) || exit
+    cp -f scripts/obs/nut.dsc .
+    sed -e 's,^\(Version:\).*$,\1 '"`NUT_VERSION_QUERY=VER50 ./tools/gitlog2version.sh`," \
+        -i nut.dsc
+    dpkg-checkbuilddeps || sudo mk-build-debs -i
+    yes | debuild \
+    && find . -name '*deb'
+    ;;
+
 *)
     pushd "./builds/${BUILD_TYPE}" && REPO_DIR="$(dirs -l +1)" ./ci_build.sh
     ;;

diff --git a/configure.ac b/configure.ac
@@ -6808,6 +6808,7 @@ AC_CONFIG_FILES([
  scripts/HP-UX/nut.psf
  scripts/installer/Makefile
  scripts/misc/nut.bash_completion
+ scripts/obs/Makefile
  scripts/python/Makefile
  scripts/python/module/Makefile
  scripts/python/module/PyNUT.py

diff --git a/docs/nut.dict b/docs/nut.dict
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 3566 utf-8
+personal_ws-1.1 en 3576 utf-8
 AAC
 AAS
 ABI
@@ -148,6 +148,7 @@ Breiland
 Brownell
 Bs
 BuildBot
+BuildRequires
 Buildbot
 Bxx
 ByPass
@@ -1412,6 +1413,7 @@ Uncomment
 Unices
 Unitek
 Upsonic
+Upstreamed
 Ut
 V'ger
 VALIGN
@@ -2764,6 +2766,7 @@ optimizations
 optiups
 oq
 os
+osc
 ostream
 other's
 otheruser
@@ -2876,6 +2879,7 @@ prio
 priv
 privPassword
 privProtocol
+prjconf
 problemMatcher
 probu
 proc

diff --git a/docs/qa-guide.adoc b/docs/qa-guide.adoc
@@ -520,6 +520,21 @@ gcc and clang, C standards, and requiring to pass builds at least in a
 mode without warnings (and checking the other cases where any warnings
 are made fatal).
 
+Open Build Service (OBS)
+~~~~~~~~~~~~~~~~~~~~~~~~
+[[NUT_CI_OBS]]
+
+The SuSE-backed software suite and on-line instance of the Open Build
+Service (OBS) allows building packages for a wide range of Linux (and
+potentially non-Linux) operating system distributions.
+
+This can be seen as an additional CI test for multi-platform portability,
+but mainly allows NUT users to get recent development builds as "proper"
+packages.
+
+* https://build.opensuse.org/
+* https://openbuildservice.org/
+
 Continuous Integration (NUT CI farm) build agent preparation
 ------------------------------------------------------------
 [[NUTCI_farm_agents]]

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -30,9 +30,9 @@ EXTRA_DIST = \
     valgrind/valgrind.sh.in \
     Windows/halt.c
 
-SUBDIRS = augeas devd hotplug installer python systemd udev ufw Solaris Windows upsdrvsvcctl external_apis
+SUBDIRS = augeas devd hotplug installer obs python systemd udev ufw Solaris Windows upsdrvsvcctl external_apis
 
-SPELLCHECK_SRC = README.adoc RedHat/README.adoc usb_resetter/README.adoc valgrind/README.adoc
+SPELLCHECK_SRC = README.adoc RedHat/README.adoc usb_resetter/README.adoc valgrind/README.adoc obs/README.adoc
 
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative

diff --git a/scripts/obs/Makefile.am b/scripts/obs/Makefile.am
@@ -0,0 +1,121 @@
+# Network UPS Tools: obs (root)
+
+EXTRA_DIST = README.adoc _service _config
+
+# Also EXTRA_DIST the recipe-related files (so OBS can use tarballs if they like)
+
+# Debian/Ubuntu recipes:
+EXTRA_DIST += \
+	debian.Makefile.am \
+	debian.NEWS \
+	debian.changelog \
+	debian.compat \
+	debian.control \
+	debian.copyright \
+	debian.description.subst \
+	debian.gbp.conf \
+	debian.hotplug \
+	debian.libnutclient-dev.install \
+	debian.libnutclient-dev.manpages \
+	debian.libnutclient1.install \
+	debian.libnutclient1.lintian-overrides \
+	debian.libnutclientstub-dev.install \
+	debian.libnutclientstub1.install \
+	debian.libnutclientstub1.lintian-overrides \
+	debian.libnutscan-dev.install \
+	debian.libnutscan1.install \
+	debian.libups-nut-perl.install \
+	debian.libupsclient-dev.install \
+	debian.libupsclient-dev.manpages \
+	debian.libupsclient4.install \
+	nut.changes \
+	debian.nut-cgi.README.Debian \
+	debian.nut-cgi.docs \
+	debian.nut-cgi.install \
+	debian.nut-cgi.manpages \
+	debian.nut-cgi.postinst \
+	debian.nut-cgi.postrm \
+	debian.nut-client.init.in \
+	debian.nut-client.install \
+	debian.nut-client.links \
+	debian.nut-client.lintian-overrides \
+	debian.nut-client.maintscript \
+	debian.nut-client.manpages \
+	debian.nut-client.postinst \
+	debian.nut-client.preinst \
+	debian.nut-client.prerm \
+	debian.nut-common.install \
+	debian.nut-common.postinst.in \
+	debian.nut-common.prerm.in \
+	debian.nut-common.tmpfiles.in \
+	debian.nut-doc.doc-base.nut-developer-guide \
+	debian.nut-doc.doc-base.nut-faq \
+	debian.nut-doc.doc-base.nut-packager-guide \
+	debian.nut-doc.doc-base.nut-user-manual \
+	debian.nut-doc.install \
+	debian.nut-ipmi.install \
+	debian.nut-ipmi.manpages \
+	debian.nut-linux-i2c.install \
+	debian.nut-linux-i2c.manpages \
+	debian.nut-modbus.install \
+	debian.nut-modbus.manpages \
+	debian.nut-monitor.install \
+	debian.nut-monitor.menu \
+	debian.nut-monitor.xpm \
+	debian.nut-powerman-pdu.install \
+	debian.nut-powerman-pdu.manpages \
+	debian.nut-server.dirs \
+	debian.nut-server.init.in \
+	debian.nut-server.install \
+	debian.nut-server.manpages \
+	debian.nut-server.postinst \
+	debian.nut-server.postrm \
+	debian.nut-server.preinst \
+	debian.nut-server.prerm.in \
+	debian.nut-snmp.docs \
+	debian.nut-snmp.install \
+	debian.nut-snmp.manpages \
+	debian.nut-xml.install \
+	debian.nut-xml.manpages \
+	debian.nut.README.Debian \
+	debian.nut.TODO.Debian \
+	debian.nut.docs \
+	debian.python-nut.install \
+	debian.rules \
+	debian.series \
+	debian.watch \
+	nut.dsc
+
+# RedHAT/Fedora/CentOS/... recipes:
+EXTRA_DIST += \
+	nut.spec
+
+# PKGSRC recipes:
+EXTRA_DIST += \
+	pkgsrc.obs
+
+SPELLCHECK_SRC = README.adoc
+
+# NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
+# We also have to export some variables that may be tainted by relative
+# paths when parsing the other makefile (e.g. MKDIR_P that may be defined
+# via expanded $(top_builddir)/install-sh):
+#%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
+#	+$(MAKE) $(AM_MAKEFLAGS) -s -f $(top_builddir)/docs/Makefile MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
+
+# NOTE: Portable suffix rules do not allow prerequisites, so we shim them here
+# by a wildcard target in case the make implementation can put the two together.
+*-spellchecked: Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
+
+.sample.sample-spellchecked:
+	+$(MAKE) $(AM_MAKEFLAGS) -s -f $(top_builddir)/docs/Makefile MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
+
+.in.in-spellchecked:
+	+$(MAKE) $(AM_MAKEFLAGS) -s -f $(top_builddir)/docs/Makefile MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
+
+spellcheck spellcheck-interactive spellcheck-sortdict:
+	+$(MAKE) $(AM_MAKEFLAGS) -f $(top_builddir)/docs/Makefile MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC="$(SPELLCHECK_SRC)" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
+
+CLEANFILES = *-spellchecked
+
+MAINTAINERCLEANFILES = Makefile.in .dirstamp
diff --git a/scripts/obs/README.adoc b/scripts/obs/README.adoc
@@ -0,0 +1,66 @@
+= Packaging recipes for OBS
+
+== Overview
+
+This directory holds reference NUT packaging recipes for RPM, DEB and
+other formats, and is primarily aimed at automation of builds with the
+link:https://openbuildservice.org/[Open Build Service (OBS)].
+
+Note that beside the on-line service, the software is open-source and
+any project may install and run their own server instance. The `osc build`
+command can also be used on a workstation to iterate recipe nuances for
+different distributions. In theory, back-end scripts may be added to
+support more operating systems over time (even not necessarily Linux).
+
+NOTE: The layout of files and directories here is dictated by current
+expectations of the OBS software (if at some point it has to be a flat
+mess with no structure -- so be it).
+
+== Practical setup
+
+The copy of `_service` file represents the directly maintained OBS recipe
+in an OBS packaging project, and is the only file needed there (triggering
+service runs updates the temporary tarball from git).
+
+Beside that, a `_config` file in the OBS project repository or live settings
+in `osc meta prjconf --edit` can be used to specify unambiguous preferences
+for certain packages, when a distro actually offers a choice via conditional
+`BuildRequires` statements (and other options), e.g.:
+
+----
+Prefer: libusbx-devel
+Prefer: libusb-1.0-dev
+Prefer: neon-devel
+----
+
+* For more details on this, see
+  https://openbuildservice.org/help/manuals/obs-user-guide/cha-obs-prjconfig
+
+A parent project must be used to define OBS Repositories we build for, which
+should usually include a layer with `openSUSE:Tools` to have the OBS helper
+scripts needed for package and tarball transformations in the build area,
+for example: https://build.opensuse.org/projects/home:jimklimov/meta
+
+The list of known distros and repositories massaged with these tools can be
+seen at https://build.opensuse.org/repositories/openSUSE:Tools
+
+For some historical and/or practical details see:
+
+* https://github.com/networkupstools/nut/issues/1209
+
+== Other notes
+
+The recipe files themselves would likely cross-pollinate with popular
+distributions, to allow easier replacement of standard, supported and
+stale package builds with those of experimental development iterations.
+
+This should be in part facilitated by the NUT Semantic Versioning scheme (see
+linkdoc:developer-guide[NUT Semantic Versioning,versioning,docs/nut-versioning.adoc])
+which adds version number components to expose the "age" of each such
+iteration as a number of commits merged into the common development trunk
+since a preceding release, and a number of commits unique to a feature
+branch.
+
+Maybe some way of pre-making a dist tarball (with `VERSION_DEFAULT`, man
+pages pre-built, etc.) and using that would be better, to be explored
+(ideally if we can do this within OBS).