diff --git a/.gitignore b/.gitignore index e69de29..c54f15f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/hxtools-20110721.tar.xz diff --git a/0001-newns.c-Add-missing-_GNU_SOURCE-definition.patch b/0001-newns.c-Add-missing-_GNU_SOURCE-definition.patch new file mode 100644 index 0000000..5695856 --- /dev/null +++ b/0001-newns.c-Add-missing-_GNU_SOURCE-definition.patch @@ -0,0 +1,24 @@ +From 45f63de1d61cd54fb9595c33e2b8fd1687c06334 Mon Sep 17 00:00:00 2001 +From: Till Maas +Date: Sat, 23 Jul 2011 11:06:52 +0200 +Subject: [PATCH] newns.c: Add missing _GNU_SOURCE definition + +--- + sadmin/newns.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/sadmin/newns.c b/sadmin/newns.c +index e048470..7c86077 100644 +--- a/sadmin/newns.c ++++ b/sadmin/newns.c +@@ -2,6 +2,7 @@ + * newns - start a new mount namespace + * released in the Public Domain + */ ++#define _GNU_SOURCE 1 + #include + #include + #include +-- +1.7.4.4 + diff --git a/hxtools-20110721.tar.xz.asc b/hxtools-20110721.tar.xz.asc new file mode 100644 index 0000000..06b51bb --- /dev/null +++ b/hxtools-20110721.tar.xz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iF4EABEIAAYFAk4oO80ACgkQkb3j62iiDkWNpgD/SK7lXN3/J7oV+qiQ8JI2z6Uu ++OjJQ6jD53NoLWqomUIA/3vGRX/4nNomEPyFMKmwPFCIBh1kiNYDCpWAEYNzixWl +=Zf96 +-----END PGP SIGNATURE----- diff --git a/hxtools.spec b/hxtools.spec new file mode 100644 index 0000000..270e714 --- /dev/null +++ b/hxtools.spec @@ -0,0 +1,218 @@ +Name: hxtools +Version: 20110721 +Release: 2%{?dist} +Summary: A collection of several tools + +Group: Applications/System +# fd0ssh: LGPLv2 or LGPLv3 +# ofl: Public Domain, but LGPVv2 or LPGLv3 because of linking with libHX +License: LGPLv2 or LGPLv3 +URL: http://jengelh.medozas.de/projects/hxtools/ +Source0: http://jftp.medozas.de/hxtools/hxtools-%{version}.tar.xz +Source1: http://jftp.medozas.de/hxtools/hxtools-%{version}.tar.xz.asc +# 2011-07-23: Upstream notified of this bug +Patch0: 0001-newns.c-Add-missing-_GNU_SOURCE-definition.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libHX-devel +# for ./autogen.sh / autoreconf +BuildRequires: automake +# for sys/capability.h in printcaps.c +BuildRequires: libcap-devel + +%description +hxtools contains several tools for different tasks written by Jan Engelhardt. + +Currently only tools needed for pam_mount are included in this package. + + +%prep +%setup -q +%patch0 -p1 -b .GNU_SOURCE + + +%build +./autogen.sh +%configure +make %{?_smp_mflags} V=1 + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# remove unwanted files +# Using %%exclude in %%files pollutes the debuginfo package :-/ +# This seems to be only build if some dependency is present +#rm "$RPM_BUILD_ROOT%%{_libexecdir}/hxtools/printcaps" +#rm "$RPM_BUILD_ROOT%%{_libexecdir}/hxtools/proc_iomem_count" +#rm "$RPM_BUILD_ROOT%%{_datadir}/rfc2307bis-utf8.schema" +#rm "$RPM_BUILD_ROOT%%{_mandir}/man8/xfs_irecover.8"* +rm "$RPM_BUILD_ROOT/%{_sysconfdir}/hxloginpref.conf" +rm "$RPM_BUILD_ROOT/%{_bindir}/checkbrack" +rm "$RPM_BUILD_ROOT/%{_bindir}/cwdiff" +rm "$RPM_BUILD_ROOT/%{_bindir}/declone" +rm "$RPM_BUILD_ROOT/%{_bindir}/fduphl" +rm "$RPM_BUILD_ROOT/%{_bindir}/fxterm" +rm "$RPM_BUILD_ROOT/%{_bindir}/git-author-stat" +rm "$RPM_BUILD_ROOT/%{_bindir}/git-export-patch" +rm "$RPM_BUILD_ROOT/%{_bindir}/git-forest" +rm "$RPM_BUILD_ROOT/%{_bindir}/git-track" +rm "$RPM_BUILD_ROOT/%{_bindir}/gpsh" +rm "$RPM_BUILD_ROOT/%{_bindir}/man2html" +rm "$RPM_BUILD_ROOT/%{_bindir}/newns" +rm "$RPM_BUILD_ROOT/%{_bindir}/omixer" +rm "$RPM_BUILD_ROOT/%{_bindir}/oplay" +rm "$RPM_BUILD_ROOT/%{_bindir}/orec" +rm "$RPM_BUILD_ROOT/%{_bindir}/pesubst" +rm "$RPM_BUILD_ROOT/%{_bindir}/pmap_dirty" +rm "$RPM_BUILD_ROOT/%{_bindir}/qtar" +rm "$RPM_BUILD_ROOT/%{_bindir}/spec-beautifier" +rm "$RPM_BUILD_ROOT/%{_bindir}/su1" +rm "$RPM_BUILD_ROOT/%{_bindir}/sysinfo" +rm "$RPM_BUILD_ROOT/%{_bindir}/tailhex" +rm "$RPM_BUILD_ROOT/%{_bindir}/wktimer" +rm "$RPM_BUILD_ROOT/%{_bindir}/xcp" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/bsvplay" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/cctypeinfo" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/diff2php" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/doxygen-kerneldoc-filter" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/extract_d3pkg" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/extract_dxhog" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/extract_f3pod" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/extract_qupak" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/fnt2bdf" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/git-blame-stats" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/git-new-root" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/git-revert-stats" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/logontime" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/mailsplit" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/mod2ogg" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/mpg2ogg" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/netload" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/paddrspacesize" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/png2wx.pl" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/png2wx.py" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/printcaps" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/proc_iomem_count" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/proc_stat_signal_decode" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/psthreads" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/qplay" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/recursive_lower" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/shared.pm" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/sourcefuncsize" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/stxdb" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/utmp_register" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/vcsaview" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/vfontas" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/wavdiff" +rm "$RPM_BUILD_ROOT/%{_datadir}/gitconfig" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxloginpref.conf" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ahnv.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ati.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ega437_8x14.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ega437_8x16.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ega437_8x8.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/gotik-textura.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/i386/qwerty/us_jng.map" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/i386/qwerty/us_jng_vaiou3.map" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/i386/qwertz/de_jng.map" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ital.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/misc/ahnv.pcf.gz" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/misc/mux.pcf.gz" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/misc/rhx.pcf.gz" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/misc/tosh.pcf.gz" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/mux.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/neuropol.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/nvidia.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/rhx.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/tosh.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools_bashrc.bash" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools_dircolors" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools_profile.bash" +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/bsvplay.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/cctypeinfo.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/checkbrack.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/cwdiff.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/declone.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/diff2php.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/extract_d3pkg.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/extract_dxhog.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/extract_f3pod.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/extract_qupak.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/fduphl.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/fnt2bdf.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/fxterm.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/git-author-stat.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/git-export-patch.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/git-forest.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/git-revert-stats.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/git-track.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/mailsplit.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/man2html.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/mod2ogg.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/mpg2ogg.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/omixer.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/oplay.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/orec.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/pesubst.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/png2wx.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/psthreads.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/qplay.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/recursive_lower.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/sourcefuncsize.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/spec-beautifier.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/stxdb.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/sysinfo.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/tailhex.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/vfontas.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/wavdiff.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/wktimer.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/xcp.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man7/hxtools.7"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man8/logontime.8"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man8/netload.8"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man8/newns.8"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man8/utmp_register.8"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man8/vcsaview.8"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man8/xfs_irecover.8"* +rm "$RPM_BUILD_ROOT/%{_datadir}/rfc2307bis-utf8.schema" + + +%clean +rm -rf $RPM_BUILD_ROOT + + +# Only include tools needed for pam_mount +%files +%defattr(-,root,root,-) +%doc LICENSE.GPL2 LICENSE.GPL3 +%{_bindir}/ofl +%{_libexecdir}/hxtools/fd0ssh +%{_mandir}/man1/fd0ssh.1* +%{_mandir}/man1/ofl.1* + + +%changelog +* Thu Nov 24 2011 Till Maas - 20110721-2 +- Update BR: use automake instead of autoconf +- Use %% for rpm macros in comments + +* Fri Jul 22 2011 Till Maas - 20110721-1 +- Update to new release +- Add patch to make newns build (missing _GNU_SOURCE) + +* Thu May 19 2011 Till Maas - 20110509-1 +- Update to new release +- cleanup spec +- add BR: autoconf +- add BR: libcaps-devel + +* Wed Mar 09 2011 Till Maas - 20110308-2 +- Include license files + +* Wed Mar 09 2011 Till Maas - 20110308-1 +- Update to new release + +* Mon Dec 27 2010 Till Maas - 20101227-1 +- Initial spec with only the programs needed by pam_mount diff --git a/sources b/sources index e69de29..972d628 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +48ddb0aa36a33cf6505db4787ccd38fc hxtools-20110721.tar.xz