Adds changes for updated securedrop-log package #133

kushaldas · 2020-01-23T13:14:07Z

This will not pass till get freedomofpress/securedrop-log#8 and #132 merged.

How to test?

$ PKG_VERSION=0.0.4 PKG_DIR=/home/user/code/securedrop-log/dist/securedrop-log-0.0.4.tar.gz make securedrop-log

emkll · 2020-01-24T16:40:20Z

Now that #132 has been merged, this could use a rebase to ensure the built wheel and hashes can be used to build the package.

After rebasing on master locally, getting a build error against the 0.0.4 tarball (using freedomofpress/securedrop-log#8). Have you seen this error before? Am I doing something wrong

PKG_PATH=../securedrop-log/dist/securedrop-log-0.0.4.tar.gz PKG_VERSION=0.0.4 make securedrop-log
PKG_NAME="securedrop-log" ./scripts/build-debianpackage
gpg: key F08893B959CAB065: 6 signatures not checked due to missing keys
gpg: key F08893B959CAB065: public key "Conor Schaefer <[email protected]>" imported
gpg: key DA05B7C52ABAF334: 8 signatures not checked due to missing keys
gpg: key DA05B7C52ABAF334: public key "Jennifer Helsby <[email protected]>" imported
gpg: key D8219C8C43F6C5E1: 55 signatures not checked due to missing keys
gpg: key D8219C8C43F6C5E1: public key "Kushal Das <[email protected]>" imported
gpg: key AAFB3575FAC82745: 1 signature not checked due to a missing key
gpg: key AAFB3575FAC82745: public key "Mickael E. <[email protected]>" imported
gpg: Total number processed: 4
gpg:               imported: 4
gpg: no ultimately trusted keys found
gpg: Signature made Thu 23 Jan 2020 06:33:11 AM EST
gpg:                using RSA key 0BC135125EB2FF9A0F88EE1CC65FF007C75766ED
gpg: Good signature from "Kushal Das <[email protected]>" [unknown]
gpg:                 aka "Kushal Das <[email protected]>" [unknown]
gpg:                 aka "Kushal Das <[email protected]>" [unknown]
gpg:                 aka "Kushal Das <[email protected]>" [unknown]
gpg:                 aka "Kushal Das <[email protected]>" [unknown]
gpg:                 aka "Kushal Das <[email protected]>" [unknown]
gpg: WARNING: This key is not certified with a trusted signature!
gpg:          There is no indication that the signature belongs to the owner.
Primary key fingerprint: A85F F376 759C 994A 8A11  68D8 D821 9C8C 43F6 C5E1
     Subkey fingerprint: 0BC1 3512 5EB2 FF9A 0F88  EE1C C65F F007 C757 66ED
Checking that SHA256SUMs from mirror match signed file...  OK
securedrop-log is a Python package
securedrop-log-0.0.4/LICENSE
securedrop-log-0.0.4/MANIFEST.in
securedrop-log-0.0.4/PKG-INFO
securedrop-log-0.0.4/README.md
securedrop-log-0.0.4/VERSION
securedrop-log-0.0.4/build-requirements.txt
securedrop-log-0.0.4/changelog.md
securedrop-log-0.0.4/requirements.txt
securedrop-log-0.0.4/sd-rsyslog
securedrop-log-0.0.4/sd-rsyslog-example.conf
securedrop-log-0.0.4/sdlog.conf
securedrop-log-0.0.4/securedrop-log
securedrop-log-0.0.4/securedrop-log-saver
securedrop-log-0.0.4/securedrop-log.service
securedrop-log-0.0.4/securedrop-redis-log
securedrop-log-0.0.4/securedrop.Log
securedrop-log-0.0.4/securedrop_log.egg-info/
securedrop-log-0.0.4/securedrop_log.egg-info/PKG-INFO
securedrop-log-0.0.4/securedrop_log.egg-info/SOURCES.txt
securedrop-log-0.0.4/securedrop_log.egg-info/dependency_links.txt
securedrop-log-0.0.4/securedrop_log.egg-info/top_level.txt
securedrop-log-0.0.4/setup.cfg
securedrop-log-0.0.4/setup.py
All hashes verified.
Building package 'securedrop-log' from version '0.0.4'...
/home/user/debbuild/packaging/securedrop-log/
dpkg-buildpackage: info: source package securedrop-log
dpkg-buildpackage: info: source version 0.0.4+buster
dpkg-buildpackage: info: source distribution unstable
dpkg-buildpackage: info: source changed by Kushal Das <[email protected]>
dpkg-buildpackage: info: host architecture amd64
 dpkg-source --before-build .
 fakeroot debian/rules clean
make[1]: Entering directory '/home/user/debbuild/packaging/securedrop-log'
dh clean --with python-virtualenv --python /usr/bin/python3 --setuptools --index-url https://pypi.securedrop.org/simple --requirements build-requirements.txt
   dh_clean -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
make[1]: Leaving directory '/home/user/debbuild/packaging/securedrop-log'
 dpkg-source -b .
dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1)
dpkg-source: info: using source format '1.0'
dpkg-source: warning: source directory 'securedrop-log' is not <sourcepackage>-<upstreamversion> 'securedrop-log-0.0.4+buster'
dpkg-source: info: building securedrop-log in securedrop-log_0.0.4+buster.tar.gz
dpkg-source: info: building securedrop-log in securedrop-log_0.0.4+buster.dsc
 debian/rules build
make[1]: Entering directory '/home/user/debbuild/packaging/securedrop-log'
dh build --with python-virtualenv --python /usr/bin/python3 --setuptools --index-url https://pypi.securedrop.org/simple --requirements build-requirements.txt
   dh_update_autotools_config -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_auto_configure -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
dh_auto_configure: Please use the third-party "pybuild" build system instead of python-distutils
dh_auto_configure: This feature will be removed in compat 12.
make[1]: Leaving directory '/home/user/debbuild/packaging/securedrop-log'
 fakeroot debian/rules binary
make[1]: Entering directory '/home/user/debbuild/packaging/securedrop-log'
dh binary --with python-virtualenv --python /usr/bin/python3 --setuptools --index-url https://pypi.securedrop.org/simple --requirements build-requirements.txt
   dh_testroot -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_prep -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_install -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_installdocs -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_installchangelogs -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_virtualenv -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
Already using interpreter /usr/bin/python3
Using base prefix '/usr'
New python executable in /home/user/debbuild/packaging/securedrop-log/debian/securedrop-log/opt/venvs/securedrop-log/bin/python3
Also creating executable in /home/user/debbuild/packaging/securedrop-log/debian/securedrop-log/opt/venvs/securedrop-log/bin/python
Installing setuptools, pkg_resources, pip, wheel...done.
Looking in indexes: https://pypi.securedrop.org/simple
Collecting redis==3.3.11
  Downloading https://pypi.securedrop.org/localwheels/redis-3.3.11-py2.py3-none-any.whl (66 kB)
     || 66 kB 1.1 MB/s 
Installing collected packages: redis
Successfully installed redis-3.3.11
Looking in indexes: https://pypi.securedrop.org/simple
Processing /home/user/debbuild/packaging/securedrop-log
Building wheels for collected packages: securedrop-log
  Building wheel for securedrop-log (setup.py) ... done
  Created wheel for securedrop-log: filename=securedrop_log-0.0.4-py3-none-any.whl size=17167 sha256=3931cc26dd35307ab957ec093fc674395efd35b8f2ff249a67dad9238f320a13
  Stored in directory: /home/user/.cache/pip/wheels/ac/0e/e0/0d43086c70c853aff31a61eba63bf5d7fe4c1e1ae470a85dcc
Successfully built securedrop-log
Installing collected packages: securedrop-log
Successfully installed securedrop-log-0.0.4
   dh_installinit -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_perl -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_link -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   debian/rules override_dh_strip_nondeterminism
make[2]: Entering directory '/home/user/debbuild/packaging/securedrop-log'
find ./debian/ -type f -name '*.pyc' -delete
find ./debian/ -type f -name 'pip-selfcheck.json' -delete
find -type f -name RECORD -exec sed -i -e '/.*\.pyc.*/d' {} +
dh_strip_nondeterminism override_dh_strip_nondeterminism
Use of uninitialized value $inode in concatenation (.) or string at /usr/bin/dh_strip_nondeterminism line 63.
Use of uninitialized value $dev in concatenation (.) or string at /usr/bin/dh_strip_nondeterminism line 63.
make[2]: Leaving directory '/home/user/debbuild/packaging/securedrop-log'
   dh_compress -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_fixperms -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_missing -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_installdeb -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_gencontrol -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
dpkg-gencontrol: warning: Depends field of package securedrop-log: substitution variable ${python3:Depends} used, but is not defined
   dh_md5sums -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
   dh_builddeb -O--python=/usr/bin/python3 -O--setuptools -O--index-url=https://pypi.securedrop.org/simple -O--requirements=build-requirements.txt
dpkg-deb: building package 'securedrop-log' in '../securedrop-log_0.0.4+buster_all.deb'.
tar: ./usr/sbin/securedrop-redis-log: Cannot open: Too many levels of symbolic links
tar: Exiting with failure status due to previous errors
dpkg-deb: error: tar -cf subprocess returned error exit status 2
dh_builddeb: dpkg-deb --build debian/securedrop-log .. returned exit code 2
dh_builddeb: Aborting due to earlier error
make[1]: *** [debian/rules:4: binary] Error 2
make[1]: Leaving directory '/home/user/debbuild/packaging/securedrop-log'
dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2
make: *** [Makefile:32: securedrop-log] Error 2

kushaldas · 2020-01-27T05:48:49Z

@emkll I could not reproduce this error. I have also rebased the PR branch.

emkll · 2020-01-27T16:11:38Z

Based on freedomofpress/securedrop-log#8 (comment) , should this PR also be rebased to use the latest wheels before review?

kushaldas · 2020-01-27T16:19:14Z

Based on freedomofpress/securedrop-log#8 (comment) , should this PR also be rebased to use the latest wheels before review?

I already did that here.

redshiftzero · 2020-02-03T15:27:53Z

(CI will pass here for proxy- and client- jobs once rebased on the very latest master that includes #136, log CI failure is expected due to lack of sd-rsyslog on master, will pass when freedomofpress/securedrop-log#8 is merged)

kushaldas · 2020-02-04T06:38:11Z

Updated and rebased against master.

Now also adds the securedrop-log systemd service file.

emkll

Diff looks good to me, and CI is passing on 0.0.4 securedrop-log tag

kushaldas added the blocked label Jan 23, 2020

kushaldas force-pushed the cook_a_logging_package branch from ac6905f to 7bf28b6 Compare January 27, 2020 05:48

kushaldas force-pushed the cook_a_logging_package branch from 7bf28b6 to 749b771 Compare January 27, 2020 16:36

kushaldas force-pushed the cook_a_logging_package branch 2 times, most recently from 934c139 to d31cb54 Compare February 4, 2020 06:37

Adds changes for updated securedrop-log package

dc10baa

Now also adds the securedrop-log systemd service file.

kushaldas force-pushed the cook_a_logging_package branch from d31cb54 to dc10baa Compare February 6, 2020 06:44

kushaldas mentioned this pull request Feb 6, 2020

Adds initial scripts to use rsyslog for logging in workstation freedomofpress/securedrop-log#8

Merged

8 tasks

emkll removed the blocked label Feb 6, 2020

emkll approved these changes Feb 6, 2020

View reviewed changes

emkll merged commit f45b228 into master Feb 6, 2020

emkll deleted the cook_a_logging_package branch February 6, 2020 15:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds changes for updated securedrop-log package #133

Adds changes for updated securedrop-log package #133

kushaldas commented Jan 23, 2020

emkll commented Jan 24, 2020 •

edited

Loading

kushaldas commented Jan 27, 2020

emkll commented Jan 27, 2020

kushaldas commented Jan 27, 2020

redshiftzero commented Feb 3, 2020

kushaldas commented Feb 4, 2020

emkll left a comment

Adds changes for updated securedrop-log package #133

Adds changes for updated securedrop-log package #133

Conversation

kushaldas commented Jan 23, 2020

How to test?

emkll commented Jan 24, 2020 • edited Loading

kushaldas commented Jan 27, 2020

emkll commented Jan 27, 2020

kushaldas commented Jan 27, 2020

redshiftzero commented Feb 3, 2020

kushaldas commented Feb 4, 2020

emkll left a comment

Choose a reason for hiding this comment

emkll commented Jan 24, 2020 •

edited

Loading