summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowi@redhat.com>2016-03-30 17:35:37 -0500
committerYaakov Selkowitz <yselkowi@redhat.com>2016-03-30 17:35:37 -0500
commitc9d40299226d4096a63382d58fbccc2e57f395f1 (patch)
tree3dba4957fc0a56ba57f678dc872d9929f07ca3ef
parentecdde67d95f79633a98da903700d611dd55d1557 (diff)
downloadcygwin-crypt-c9d40299226d4096a63382d58fbccc2e57f395f1.tar.gz
cygwin-crypt-c9d40299226d4096a63382d58fbccc2e57f395f1.tar.xz
cygwin-crypt-c9d40299226d4096a63382d58fbccc2e57f395f1.zip
cygwin-crypt 1.3
-rw-r--r--.gitignore1
-rw-r--r--crypt-1.1-AR.patch18
-rw-r--r--crypt-1.1-no-strip.patch15
-rw-r--r--cygwin-crypt.spec16
-rw-r--r--sources2
5 files changed, 10 insertions, 42 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8f29d2b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/crypt-1.3.tar.xz
diff --git a/crypt-1.1-AR.patch b/crypt-1.1-AR.patch
deleted file mode 100644
index 3f93630..0000000
--- a/crypt-1.1-AR.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Makefile 2011-03-14 00:39:38.337013003 -0500
-+++ b/Makefile 2011-03-14 00:39:52.603013003 -0500
-@@ -1,5 +1,6 @@
-
- CC:=gcc
-+AR:=ar
- CFLAGS=-g -O2
-
- prefix:=/usr
-@@ -23,7 +24,7 @@
- $(CC) -static -o $@ crypt.o -L. -lcrypt
-
- $(STATICLIB): encrypt.o
-- ar rv $@ encrypt.o
-+ $(AR) rv $@ encrypt.o
-
- $(SHAREDLIB): encrypt.o
- $(CC) -shared -Wl,--out-implib=$(IMPORTLIB) -Wl,--export-all \
diff --git a/crypt-1.1-no-strip.patch b/crypt-1.1-no-strip.patch
deleted file mode 100644
index 534b287..0000000
--- a/crypt-1.1-no-strip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- origsrc/crypt-1.1-1/Makefile 2013-02-17 16:14:57.817843500 -0600
-+++ src/crypt-1.1-1/Makefile 2013-02-17 16:17:14.142640800 -0600
-@@ -42,10 +42,10 @@ install: all
- install -d $(DESTDIR)$(libdir)
- install -d $(DESTDIR)$(incdir)
- install -d $(DESTDIR)$(docdir)
-- install -m 755 -s $(APPS) $(DESTDIR)$(bindir)
-+ install -m 755 $(APPS) $(DESTDIR)$(bindir)
- install -m 644 encrypt.h $(DESTDIR)$(incdir)/crypt.h
- install -m 644 $(STATICLIB) $(DESTDIR)$(libdir)
- install -m 644 $(IMPORTLIB) $(DESTDIR)$(libdir)
-- install -m 755 -s $(SHAREDLIB) $(DESTDIR)$(bindir)
-+ install -m 755 $(SHAREDLIB) $(DESTDIR)$(bindir)
- install -m 644 crypt.README $(DESTDIR)$(docdir)
-
diff --git a/cygwin-crypt.spec b/cygwin-crypt.spec
index e432e68..dbe8048 100644
--- a/cygwin-crypt.spec
+++ b/cygwin-crypt.spec
@@ -1,8 +1,8 @@
%{?cygwin_package_header}
Name: cygwin-crypt
-Version: 1.1
-Release: 2
+Version: 1.3
+Release: 1%{?dist}
Summary: Cygwin crypt library
License: GPLv2+
@@ -10,9 +10,8 @@ Group: Development/Libraries
URL: http://cygwin.com/
BuildArch: noarch
-Source0: ftp://sourceware.org/pub/cygwin/release/crypt/crypt-%{version}-1-src.tar.bz2
-Patch0: crypt-1.1-AR.patch
-Patch1: crypt-1.1-no-strip.patch
+# git archive of git://sourceware.org/git/cygwin-apps/crypt.git
+Source0: crypt-%{version}.tar.xz
BuildRequires: cygwin32-filesystem
BuildRequires: cygwin32-gcc
@@ -64,9 +63,7 @@ Static version of the Cygwin x86_64 crypt(3) library.
%prep
-%setup -q -n crypt-%{version}-1
-%patch0 -p1
-%patch1 -p2
+%setup -q -n crypt-%{version}
%build
@@ -126,6 +123,9 @@ rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/*.exe
%changelog
+* Wed Mar 30 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 1.3-1
+- new version
+
* Mon Jul 01 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.1-2
- Rebuild for new Cygwin packaging scheme.
- Add cygwin64 package.
diff --git a/sources b/sources
index 685cb99..c93c04e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c0fb83c8929fffd8b1bbfd1e5b2af6d crypt-1.1-1-src.tar.bz2
+cac9afa2dd6fdff8d6caf089cd7ec95a crypt-1.3.tar.xz