[Pkg-bitcoin-devel] Merging updates from onlyjob-guest git repo

Dmitry Smirnov onlyjob at member.fsf.org
Sun Dec 23 01:12:02 UTC 2012


On Sun, 23 Dec 2012 06:24:02 Petter Reinholdtsen wrote:
> Also, the bitcoin.1 manual page claim to be generated from some info
> page, and suggest to look up bitcoin there.  But I fail to find any
> info page.  Where did this manual page come from?  I added it to the
> collab-maint git repository, but am unsure if it really make sense to
> have both bitcoin-qt.1 and bitcoind.1.  They are very similar.

Sorry for misunderstanding: bitcoin.1 was generated by "help2man"
(did you see a comment in the first line?). I don't know why help2man
added paragraph about info page. It is incorrect and shall be removed.
Sorry for overlooking it.

 
> I had a look at hardening the bitcoin-qt program, using the attached
> patch.  But it do not work.  The linker fail with this message:
> 
>   collect2: error: ld returned 1 exit status
> 
> Not quite sure how to debug that.  Anyone have any idea what is going
> wrong?

What you're doing with patch is completely different from how I implemented
hardening in bitcoin/qmake.
I tried your approach with other packages and ultimately fail.

My (working) approach is to patch qmake-generated makefiles, see below.


> BTW, what exactly was the hurd workaround?  I did not find anything
> relevant on first look. :)

debian/control fragment together with C_UPNP from debian/rules is 
workaround for FTBFS on Gnu Hurd. Hardening follows as commented.

### debian/control[Build-Depends]:

 ,libminiupnpc-dev [!hurd-any]

### debian/rules:

C_UPNP = $(if $(shell dpkg --status libminiupnpc-dev 2>/dev/null),1,-)
override_dh_auto_configure:
        ## update translations
        lupdate bitcoin-qt.pro -silent
        ## make GUI tests Makefile
        qmake bitcoin-qt.pro USE_QRCODE=1 USE_UPNP=$(C_UPNP) RELEASE=0 BITCOIN_QT_TEST=1
        mv Makefile Makefile_test
        ## make GUI Makefile
        qmake bitcoin-qt.pro USE_QRCODE=1 USE_UPNP=$(C_UPNP) RELEASE=0
        ## Hardening
        perl -0pi -e 's[(CXXFLAGS\s*=)][$$1 $$ENV{CFLAGS} $$ENV{CPPFLAGS}]; \
                      s[(LFLAGS\s*=)][$$1 -Wl,--as-needed $$ENV{LDFLAGS}]; \
                      s[(CFLAGS\s*=)][$$1 $$ENV{CFLAGS} $$ENV{CPPFLAGS}];' \
                     $$(find . -name 'Makefile*')

-- 
Regards,
Dmitry.



More information about the Pkg-bitcoin-devel mailing list