From 005c2a31d1cbe779cdf5ffde92c38284b6163074 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 11:55:03 +0000 Subject: [PATCH 1/5] Initialize branch F-9 for afflib --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From fd7117280af2dd66bad34b57d4cdacc8110daaac Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 25 Jun 2008 09:56:33 +0000 Subject: [PATCH 2/5] - backport Fix redefinition of typedef AFFILE --- afflib-3.2.1-fix_namespace.patch | 12 ++++++++++++ afflib.spec | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 afflib-3.2.1-fix_namespace.patch diff --git a/afflib-3.2.1-fix_namespace.patch b/afflib-3.2.1-fix_namespace.patch new file mode 100644 index 0000000..9af1354 --- /dev/null +++ b/afflib-3.2.1-fix_namespace.patch @@ -0,0 +1,12 @@ +diff -up afflib-3.2.1/lib/afflib_i.h.fix_namespace afflib-3.2.1/lib/afflib_i.h +--- afflib-3.2.1/lib/afflib_i.h.fix_namespace 2008-06-25 11:01:34.000000000 +0200 ++++ afflib-3.2.1/lib/afflib_i.h 2008-06-25 11:01:51.000000000 +0200 +@@ -340,7 +340,7 @@ typedef struct _AFFILE { + void *vnodeprivate; // private storage for the vnode + void (*error_reporter)(const char *fmt, ...); + struct af_crypto *crypto; +-} AFFILE; ++}; + + + diff --git a/afflib.spec b/afflib.spec index 57a6cc2..2c5923b 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -10,6 +10,7 @@ Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz Patch0: afflib-3.0.1-WCtype.patch Patch1: afflib-3.1.3-gcc43.patch Patch3: afflib-3.1.3-ldconfig.patch +Patch4: afflib-3.2.1-fix_namespace.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -126,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 25 2008 kwizart < kwizart at gmail.com > - 3.1.6-2 +- backport Fix redefinition of typedef AFFILE + * Tue Apr 15 2008 kwizart < kwizart at gmail.com > - 3.1.6-1 - Update to 3.1.6 From 6319f420e21ee115b674ada109c99d1398b5715e Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 26 Jun 2008 13:57:13 +0000 Subject: [PATCH 3/5] - bump --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 2c5923b..3fc7c29 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 26 2008 kwizart < kwizart at gmail.com > - 3.1.6-3 +- bump + * Wed Jun 25 2008 kwizart < kwizart at gmail.com > - 3.1.6-2 - backport Fix redefinition of typedef AFFILE From d68cd5c34906b26da669528dcb7f59274f946399 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:24 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index df512e7..ae76bc3 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: afflib -# $Id$ +# $Id: Makefile,v 1.1 2008/03/20 22:59:37 kevin Exp $ NAME := afflib SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 7dbc26d5d6e86155e453dee17722824b8ef1ccbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:37:23 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ae76bc3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: afflib -# $Id: Makefile,v 1.1 2008/03/20 22:59:37 kevin Exp $ -NAME := afflib -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9