Project import
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..cf76752
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,135 @@
+#
+# Copyright (c) 2010-2011 Nest, Inc.
+# All rights reserved.
+#
+# This document is the property of Nest. It is considered
+# confidential and proprietary information.
+#
+# This document may not be reproduced or transmitted in any form,
+# in whole or in part, without the express written permission of
+# Nest.
+#
+# Description:
+# This file is the make file for libgcrypt, GNU's basic
+# cryptographic library.
+#
+
+
+include pre.mak
+
+PackageName := libgcrypt
+
+PackageExtension := tar.bz2
+PackageSeparator := -
+
+PackagePatchArgs := -p1
+
+PackageArchive := $(PackageName).$(PackageExtension)
+PackageSourceDir := $(PackageName)$(PackageSeparator)$(PackageVersion)
+
+PackageBuildMakefile = $(call GenerateBuildPaths,Makefile)
+
+LicenseSourceFiles := COPYING COPYING.LIB
+LicenseSourcePaths := $(addprefix $(PackageSourceDir)/,$(LicenseSourceFiles))
+
+CleanPaths += $(PackageLicenseFile)
+
+SOURCEDIRS = $(PackageSourceDir)
+$(PackageSourceDir)_RULE_TARGET = $(BuildDirectory)/configure
+
+all: $(PackageDefaultGoal)
+
+# Generate the package license contents.
+
+$(LicenseSourcePaths): $(BuildDirectory)/source
+
+$(PackageLicenseFile): $(LicenseSourcePaths)
+ $(Verbose)touch $@
+ $(Verbose)for file in $(LicenseSourcePaths); do \
+ echo "Concatenating \"$${file}\"..."; \
+ cat $${file} >> $@; \
+ done
+
+# Extract the source from the archive and apply patches, if any.
+
+$(PackageSourceDir): $(PackageArchive) $(PackagePatchPaths)
+ $(expand-and-patch-package)
+
+# Prepare the sources.
+
+$(BuildDirectory)/source: | $(PackageSourceDir) $(BuildDirectory)
+ $(Verbose)touch $@
+
+# Patch the sources, if necessary.
+
+$(BuildDirectory)/patch: $(BuildDirectory)/source
+ $(Verbose)touch $@
+
+# Generate the package build makefile.
+
+# Configure the source for building.
+
+$(BuildDirectory)/configure: $(BuildDirectory)/source | $(PackageSourceDir) $(BuildDirectory) $(ResultDirectory)
+ $(Verbose)cd $(BuildDirectory) && \
+ $(CURDIR)/$(PackageSourceDir)/configure \
+ CC="$(CC) $(CPPOPTFLAGS) -std=gnu89" CXX="$(CXX) $(CPPOPTFLAGS)" AR=$(AR) NM=$(NM) RANLIB=$(RANLIB) STRIP=$(STRIP) \
+ CPPFLAGS="$(call ToolGenerateIncludeArgument,$(GpgErrorIncludePath)) \
+ $(call ToolGenerateIncludeArgument,$(LinuxIncludePath))" \
+ LDFLAGS="$(call GenerateLibraryArgument,$(GpgErrorLibraryPath)) -lgpg-error" \
+ INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
+ --build=$(HostTuple) \
+ --host=$(TargetTuple) \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-gpg-error-prefix=$(GpgErrorPrefixPath) \
+ --disable-static
+ $(Verbose)touch $@
+
+# Build the source.
+#
+# We have to unset MAKEFLAGS since they confuse the package build otherwise.
+
+$(BuildDirectory)/build: $(BuildDirectory)/configure
+ $(Verbose)unset MAKEFLAGS && \
+ $(MAKE) $(JOBSFLAG) -C $(BuildDirectory) \
+ all
+ $(Verbose)touch $@
+
+# Stage the build to a temporary installation area.
+#
+# We have to unset MAKEFLAGS since they confuse the package build otherwise.
+#
+# We explictly remove 'libfoo.la' because some packages that depend on
+# these libraries use libtool. If libtool finds a 'libfoo.la' file for
+# a library, it uses the value of 'libdir=<dir>' it finds. In our
+# case, since '--prefix=/usr' this value is '/usr/lib'. It then
+# resolves '-lfoo'. In a cross-compilation environment, this is likely
+# to be neither the right architecture nor the right version to link
+# against. In short, we lose.
+#
+# We could also handle this by removing DESTDIR and setting the prefix
+# to $(ResultDirectory); however, that results in libtool hard-coding
+# $(ResultDirectory) as the RPATH in the linked executables which is
+# NOT what we want either. We lose again.
+#
+# By removing the '*.la' file, we win by ensuring neither a misdirected
+# link nor an RPATH.
+
+$(BuildDirectory)/stage: $(BuildDirectory)/build | $(ResultDirectory)
+ $(Verbose)unset MAKEFLAGS && \
+ $(MAKE) $(JOBSFLAG) -C $(BuildDirectory) \
+ DESTDIR=$(ResultDirectory) \
+ install
+ $(Verbose)$(RM) $(RMFLAGS) $(call GenerateResultPaths,,usr/lib/libgcrypt.la)
+ $(Verbose)touch $@
+
+.PHONY: stage
+stage: $(BuildDirectory)/stage
+
+clean:
+ $(Verbose)$(RM) $(RMFLAGS) -r $(PackageSourceDir)
+ $(Verbose)$(RM) $(RMFLAGS) -r $(BuildDirectory)
+ $(Verbose)$(RM) $(RMFLAGS) -r $(ResultDirectory)
+
+include post.mak
diff --git a/libgcrypt.patches/libgcrypt-50.description b/libgcrypt.patches/libgcrypt-50.description
new file mode 100644
index 0000000..6fa62f0
--- /dev/null
+++ b/libgcrypt.patches/libgcrypt-50.description
@@ -0,0 +1 @@
+Prevent o_flag_munging from affecting directory paths.
diff --git a/libgcrypt.patches/libgcrypt-50.patch b/libgcrypt.patches/libgcrypt-50.patch
new file mode 100644
index 0000000..cf7581e
--- /dev/null
+++ b/libgcrypt.patches/libgcrypt-50.patch
@@ -0,0 +1,24 @@
+diff -ur a/cipher/Makefile.am b/cipher/Makefile.am
+--- a/cipher/Makefile.am 2009-12-11 07:31:38.000000000 -0800
++++ b/cipher/Makefile.am 2016-04-30 14:20:30.248224774 -0700
+@@ -68,7 +68,7 @@
+ camellia.c camellia.h camellia-glue.c
+
+ if ENABLE_O_FLAG_MUNGING
+-o_flag_munging = sed -e 's/-O[2-9s]*/-O1/g'
++o_flag_munging = sed -e 's/ -O[2-9s]* / -O1 /g'
+ else
+ o_flag_munging = cat
+ endif
+diff -ur a/cipher/Makefile.in b/cipher/Makefile.in
+--- a/cipher/Makefile.in 2010-07-13 08:42:20.000000000 -0700
++++ b/cipher/Makefile.in 2016-04-30 14:20:12.812002856 -0700
+@@ -274,7 +274,7 @@
+ camellia.c camellia.h camellia-glue.c
+
+ @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat
+-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O[2-9s]*/-O1/g'
++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/ -O[2-9s]* / -O1 /g'
+ all: all-am
+
+ .SUFFIXES:
diff --git a/libgcrypt.tar.bz2 b/libgcrypt.tar.bz2
new file mode 100644
index 0000000..49edb4e
--- /dev/null
+++ b/libgcrypt.tar.bz2
Binary files differ
diff --git a/libgcrypt.url b/libgcrypt.url
new file mode 100644
index 0000000..96c70be
--- /dev/null
+++ b/libgcrypt.url
@@ -0,0 +1 @@
+ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.bz2
diff --git a/libgcrypt.version b/libgcrypt.version
new file mode 100644
index 0000000..c514bd8
--- /dev/null
+++ b/libgcrypt.version
@@ -0,0 +1 @@
+1.4.6