diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..42334a5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,59 @@ +*.o +*.lo +*.a +*.la +*.dirstamp +*.pc +*.log +*.trs +TAGS +tags +core* + +# autoconf output +autom4te.cache +*.in +!/src/libemsha-1.pc.in +config.* +compile +*.m4 +configure +depcomp +*.info +mdate-sh +stamp-* +texinfo.tex +version.texi +install-sh +missing +Makefile +.deps +.libs +libtool +ltmain.sh + +RELEASE_NOTES +debian/files +debian/libemsha-1.postinst.debhelper +debian/libemsha-1.postrm.debhelper +debian/libemsha-1.substvars +debian/libemsha-1/ +debian/libemsha-dev.substvars +debian/libemsha-dev/ +debian/shlibs.local +debian/source/ +debian/tmp/ +doc/source/header.dated.rst +doc/source/header.rst +src/cov-int/ +src/emsha_core_test +src/emsha_hmac_test +src/emsha_mem_test +src/emsha_sha256_test +src/emsha_static_hmac_test +src/emsha_static_mem_test +src/emsha_static_sha_test +src/libemsha.tgz +doc/source/conf.py +/test-driver +do-release diff --git a/.travis.yml b/.travis.yml index 8f5f3a3..2f55b4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ addons: - clang - python-sphinx - python-sphinx-rtd-theme + - pkg-config install: - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi script: "./autobuild && ./do-release" diff --git a/CHANGELOG b/CHANGELOG index 78ab27b..4572473 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,13 @@ LIBEMSHA CHANGELOG ================== +1.0.2 (2015-01-28): + +Added: + + Build now includes pkg-config. + + Debian packaging source files added. + +------------------ 1.0.1 (2015-12-22): Fixed: diff --git a/configure.ac b/configure.ac index 511cc6e..c637299 100644 --- a/configure.ac +++ b/configure.ac @@ -2,17 +2,18 @@ # versions that can be used with Travis right now. AC_PREREQ([2.68]) AC_INIT([libemsha], - [1.0.1], + [1.0.2], [coder@kyleisom.net], [libemsha], [https://kyleisom.net/projects/libemsha/]) AM_INIT_AUTOMAKE([1.11 foreign]) AC_CONFIG_SRCDIR([src/emsha/sha256.hh]) -AC_CONFIG_FILES([Makefile src/Makefile doc/source/conf.py doc/source/header.rst]) +AC_CONFIG_FILES([Makefile src/Makefile doc/source/conf.py doc/source/header.rst src/libemsha-1.pc]) AC_CONFIG_FILES([do-release], [chmod +x do-release]) AC_CONFIG_MACRO_DIR([m4]) +PKG_PROG_PKG_CONFIG AC_CHECK_HEADERS LT_INIT diff --git a/debian/changelog b/debian/changelog index e3846e5..741fc40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libemsha (1.0.2-2) stable; urgency=medium + + * Package bump to fix dependency issues. + + -- Kyle Isom Thu, 28 Jan 2016 00:49:45 -0800 + +libemsha (1.0.2-1) stable; urgency=medium + + * Add pkg-config to build. + + -- Kyle Isom Thu, 28 Jan 2016 00:27:31 -0800 + libemsha (1.0.1-1) unstable; urgency=low * Initial release for packaging. diff --git a/debian/copyright b/debian/copyright index d385587..49eb2c7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,12 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libemsha -Source: +Source: https://git.kyleisom.net/lib/libemsha Files: * Copyright: -License: 2015 K. Isom +License: MIT + 2015 K. Isom Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation diff --git a/debian/docs b/debian/libemsha-1.docs similarity index 100% rename from debian/docs rename to debian/libemsha-1.docs diff --git a/debian/libemsha-dev.dirs b/debian/libemsha-dev.dirs index 4418816..e43b95c 100644 --- a/debian/libemsha-dev.dirs +++ b/debian/libemsha-dev.dirs @@ -1,2 +1 @@ -usr/lib usr/include diff --git a/debian/libemsha-dev.install b/debian/libemsha-dev.install index a3c8f6c..5abf78d 100644 --- a/debian/libemsha-dev.install +++ b/debian/libemsha-dev.install @@ -1,3 +1,2 @@ usr/include/* -usr/lib/*/lib*.a -usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3243b57 --- /dev/null +++ b/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#DH_VERBOSE = 1 + +# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk + +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + + +# main packaging script based on dh7 syntax +%: + dh $@ --with autotools-dev + +# debmake generated override targets +# This is example for Cmake (See http://bugs.debian.org/641051 ) +#override_dh_auto_configure: +# dh_auto_configure -- \ +# -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) + + + + diff --git a/doc/libemsha.rst b/doc/libemsha.rst index aadd78e..7134fad 100644 --- a/doc/libemsha.rst +++ b/doc/libemsha.rst @@ -2,9 +2,9 @@ libemsha ======== -Version: 1.0.1 +Version: 1.0.2 -Date: 2015-12-22 +Date: 2016-01-28 ----------------- diff --git a/src/Makefile.am b/src/Makefile.am index c1232a8..0e87322 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,8 @@ CLOC_PSOURCES = emsha.cc sha256.cc hmac.cc internal.hh \ emsha/emsha.hh emsha/hmac.hh emsha/sha256.hh CLOC_TSOURCES = test_emsha.cc test_hmac.cc test_mem.cc test_sha256.cc \ test_utils.cc test_utils.hh +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libemsha-1.pc lib_LTLIBRARIES = libemsha.la nobase_include_HEADERS = emsha/sha256.hh emsha/hmac.hh emsha/emsha.hh diff --git a/src/libemsha-1.pc.in b/src/libemsha-1.pc.in new file mode 100644 index 0000000..a713c3e --- /dev/null +++ b/src/libemsha-1.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @PACKAGE_NAME@ +Description: C++11 HMAC-SHA256 library +URL: @PACKAGE_URL@ +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -Wl,-rpath,${libdir} -lemsha