> On Mar 19, 2019, at 10:18 AM, Richard Laager <rlaa...@wiktel.com> wrote:
>
> Attached is an untested debdiff. This is the upstream change refreshed
> to apply to the package. You should be able to apply it and build a
> package locally like this:
>
> sudo apt update
> sudo apt install build-essential devscripts
> sudo apt build-dep ntpsec
> apt source ntpsec
> cd ntpsec-1.1.3+dfsg1
> patch -p1 < ~/ntpsec_1.1.3+dfsg1-3~1.gbpdde9c0.debdiff
> debuild -uc -us
>
> Can you try that and see if it fixes the issue for you?
>
> I'm sorry I'm short on time today and couldn't do further testing
> myself. I hope this helps.
>
> --
> Richard
> <ntpsec_1.1.3+dfsg1-3~1.gbpdde9c0.debdiff>
Thanks for the simple and very clear instructions!
Unfortunately, here’s what I get when I do the above steps…
Did I miss a something?
Rick
> rbthomas@cube:~/make-ntpsec/ntpsec-1.1.3+dfsg1$ debuild -uc -us
> dpkg-buildpackage -us -uc -ui
> dpkg-buildpackage: info: source package ntpsec
> dpkg-buildpackage: info: source version 1.1.3+dfsg1-3~1.gbpdde9c0
> dpkg-buildpackage: info: source distribution UNRELEASED
> dpkg-buildpackage: info: source changed by Richard Laager <rlaa...@wiktel.com>
> dpkg-source --before-build .
> dpkg-buildpackage: info: host architecture armhf
> debian/rules clean
> dh clean --with apache2,python3
> debian/rules override_dh_auto_clean
> make[1]: Entering directory '/home/rbthomas/make-ntpsec/ntpsec-1.1.3+dfsg1'
> python3 waf clean || true
> --- cleaning host ---
> The project was not configured: run "waf configure" first!
> rm -rf \
> build \
> .lock-waf_*_build \
> ntpclients/ntp \
> ntpd/version.h \
> pylib/control.py \
> pylib/magic.py \
> pylib/version.py \
> .waf* \
> wafhelpers/autorevision.sh
> find -name "*.pyc" -delete
> make[1]: Leaving directory '/home/rbthomas/make-ntpsec/ntpsec-1.1.3+dfsg1'
> dh_clean
> dpkg-source -b .
> dpkg-source: info: using source format '3.0 (quilt)'
> dpkg-source: info: building ntpsec using existing
> ./ntpsec_1.1.3+dfsg1.orig.tar.gz
> dpkg-source: info: using patch list from debian/patches/series
> dpkg-source: warning: ignoring deletion of directory build
> dpkg-source: warning: ignoring deletion of directory build/main
> dpkg-source: warning: ignoring deletion of directory build/main/ntpd
> dpkg-source: warning: ignoring deletion of file build/main/ntpd/ntpd.8, use
> --include-removal to override
> dpkg-source: warning: ignoring deletion of file build/main/ntpd/ntp.keys.5,
> use --include-removal to override
> dpkg-source: warning: ignoring deletion of file build/main/ntpd/ntp.conf.5,
> use --include-removal to override
> dpkg-source: warning: ignoring deletion of directory build/main/ntptime
> dpkg-source: warning: ignoring deletion of file build/main/ntptime/ntptime.8,
> use --include-removal to override
> dpkg-source: warning: ignoring deletion of directory build/main/ntpfrob
> dpkg-source: warning: ignoring deletion of file build/main/ntpfrob/ntpfrob.8,
> use --include-removal to override
> dpkg-source: warning: ignoring deletion of directory build/main/ntpclients
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntpviz.1, use --include-removal to override
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntpdig.1, use --include-removal to override
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntpleapfetch.8, use --include-removal to override
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntpmon.1, use --include-removal to override
> dpkg-source: warning: ignoring deletion of file build/main/ntpclients/ntpq.1,
> use --include-removal to override
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntptrace.1, use --include-removal to override
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntpwait.8, use --include-removal to override
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntpkeygen.8, use --include-removal to override
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntploggps.1, use --include-removal to override
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntpsnmpd.8, use --include-removal to override
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntpsweep.1, use --include-removal to override
> dpkg-source: warning: ignoring deletion of file
> build/main/ntpclients/ntplogtemp.1, use --include-removal to override
> dpkg-source: info: local changes detected, the modified files are:
> ntpsec-1.1.3+dfsg1/ntpd/ntp_proto.c
> dpkg-source: error: aborting due to unexpected upstream changes, see
> /tmp/ntpsec_1.1.3+dfsg1-3~1.gbpdde9c0.diff.6WnYJh
> dpkg-source: info: you can integrate the local changes with dpkg-source
> --commit
> dpkg-buildpackage: error: dpkg-source -b . subprocess returned exit status 2
> debuild: fatal error at line 1182:
> dpkg-buildpackage -us -uc -ui failed
>
