Architecture specific change in rpms/gsf-sharp.git
by githook-noreply@fedoraproject.org
The package rpms/gsf-sharp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gsf-sharp.git/commit/?id=576337ed....
Change:
-ExclusiveArch: %mono_arches
Thanks.
Full change:
============
commit 576337ed49ad060f35e3c4e09fc8490edfb8bc95
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:50:01 2019 +0000
gsf-sharp fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675061
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3d29a43..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gsf-sharp-0.8.1.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..a7a606f
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+gsf-sharp fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675061
diff --git a/gsf-sharp.spec b/gsf-sharp.spec
deleted file mode 100644
index d81b9a1..0000000
--- a/gsf-sharp.spec
+++ /dev/null
@@ -1,212 +0,0 @@
-Name: gsf-sharp
-Version: 0.8.1
-Release: 34%{?dist}
-Summary: Mono bindings for libgsf
-
-License: LGPLv2+
-URL: http://go-mono.com
-Source0: %{name}-%{version}.tar.gz
-
-BuildRequires: gcc
-BuildRequires: mono-devel libgsf-devel gtk-sharp2-gapi
-BuildRequires: gtk-sharp2-devel
-Requires: libgsf
-
-# Mono only available on these:
-ExclusiveArch: %mono_arches
-
-%description
-Mono bindings for libgsf
-
-%package devel
-Summary: pkgconfig file for gsf-sharp
-Requires: %{name} = %{version}-%{release} pkgconfig
-
-%description devel
-pkgconfig file for gsf-sharp
-
-%prep
-%setup -q
-sed -i -e 's!@libdir@!%{_prefix}/lib!' *.pc.in
-
-%build
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-%configure
-make %{?_smp_mflags}
-
-%install
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-
-make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp /gacdir %{_prefix}/lib /root ${RPM_BUILD_ROOT}%{_prefix}/lib"
-
-rm $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
-
-
-%files
-%doc AUTHORS NEWS README COPYING
-%{_libdir}/libgsfglue.*
-%{_prefix}/lib/mono/gac/gsf-sharp
-%{_prefix}/lib/mono/gtk-sharp/*
-%{_datadir}/gapi-2.0/gsf-api.xml
-
-%files devel
-%{_libdir}/pkgconfig/gsf-sharp.pc
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.1-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.1-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.1-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.1-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.1-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.1-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.1-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Oct 13 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-27
-- mono rebuild for aarch64 support
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.1-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon May 18 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.8.1-24
-- Rebuild (mono4)
-
-* Tue Mar 24 2015 Than Ngo <than(a)redhat.com> - 0.8.1-23
-- use %%mono_arches
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sat Nov 12 2011 Christian Krause <chkr(a)fedoraproject.org> - 0.8.1-16
-- Change paths for mono assemblies according to updated packaging
- guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jan 11 2011 Dan Hork <dan[at]danny.cz> - 0.8.1-14
-- updated the supported arch list
-
-* Thu Oct 28 2010 Christian Krause <chkr(a)fedoraproject.org> - 0.8.1-13
-- Rebuilt against Mono 2.8
-
-
-* Mon Oct 26 2009 Dennis Gilmore <denis(a)ausil.us> - 0.8.1-12
-- exclude sparc64
-
-* Thu Aug 20 2009 Toshio Kuratomi <toshio(a)fedoraproject.org> - 0.8.1-11
-- Rebuild ppc64 packages
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sat May 30 2009 Xavier Lamien <laxathom(a)fedoraproject.org> - 0.8.1-10
-- Build arch ppc64.
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Jul 25 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.8.1-8
-- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.1-7
-- Autorebuild for GCC 4.3
-
-* Sat Dec 15 2007 Christopher Aillon <caillon(a)redhat.com> - 0.8.1-6
-- Rebuild to pick up proper mono rpm provides
-
-* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.8.1-5
-- Rebuild for selinux ppc32 issue.
-
-* Thu Jul 26 2007 Matthias Clasen <mclasen(a)redhat.com> - 0.8.1-4
-- Add alpha to ExclusiveArch (#246203)
-
-* Sat Apr 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 0.8.1-3
-- Don't ship .la files and static libs
-
-* Sun Oct 01 2006 Jesse Keating <jkeating(a)redhat.com> - 0.8.1-2.fc6
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Wed Sep 20 2006 Alexander Larsson <alexl(a)redhat.com> - 0.8.1-1.fc6
-- Update to 0.8.1, fixes a leak that caused files to not be closed
-
-* Wed Sep 6 2006 Alexander Larsson <alexl(a)redhat.com> - 0.8-4
-- Add -devel package (#205052)
-
-* Sat Aug 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 0.8-3.fc6
-- Rebuild
-
-* Fri Aug 18 2006 Alexander Larsson <alexl(a)redhat.com> - 0.8-2
-- Rebuild with new mono libdir
-
-* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0.8-1.1
-- rebuild
-
-* Wed Jun 21 2006 Alexander Larsson <alexl(a)redhat.com> - 0.8-1
-- update to 0.8 which is for gsf 1.14.x
-
-* Fri Jun 9 2006 Alexander Larsson <alexl(a)redhat.com> - 0.6-10
-- Disable on s390* as mono doesn't build on s390 atm
-
-* Tue Mar 21 2006 Caolan McNamara <caolanm(a)redhat.com> 0.6-9
-- rebuild against new libgsf
-
-* Wed Mar 01 2006 Karsten Hopp <karsten(a)redhat.de> 0.6-8
-- Buildrequires: gtk-sharp2
-
-* Sun Feb 12 2006 Christopher Aillon <caillon(a)redhat.com> 0.6-7
-- Rebuild
-
-* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 0.6-6.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Tue Jan 31 2006 Christopher Aillon <caillon(a)redhat.com> 0.6-6
-- Rebuild
-
-* Sun Jan 22 2006 Alexander Larsson <alexl(a)redhat.com> 0.6-5
-- Build on s390x
-
-* Mon Jan 9 2006 Alexander Larsson <alexl(a)redhat.com> - 0.6-4
-- Add s390 target
-
-* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com>
-- rebuilt
-
-* Thu Dec 8 2005 Alexander Larsson <alexl(a)redhat.com> 0.6-3
-- Rebuild for new libgsf
-
-* Mon Nov 21 2005 Alexander Larsson <alexl(a)redhat.com> 0.6-2
-- Fix lib64 issue in pkgconfig file
-
-* Mon Nov 21 2005 Alexander Larsson <alexl(a)redhat.com> - 0.6-1
-- Initial version
diff --git a/sources b/sources
deleted file mode 100644
index 8532796..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-92bb68612bdcd8ca3c475b3fee097968 gsf-sharp-0.8.1.tar.gz
4 years, 9 months
Architecture specific change in rpms/gl3n.git
by githook-noreply@fedoraproject.org
The package rpms/gl3n.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gl3n.git/commit/?id=6a13026af5a28....
Change:
-ExclusiveArch: %{ldc_arches}
Thanks.
Full change:
============
commit 6a13026af5a28e9d691a93684e240861638ee7b3
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:47:26 2019 +0000
gl3n fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674976
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 269339c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/gl3n-20150625git20b3487.tar.xz
-/v1.2.0.tar.gz
-/v1.3.1.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..724c93c
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+gl3n fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674976
diff --git a/gl3n-fix-secondary-arches.patch b/gl3n-fix-secondary-arches.patch
deleted file mode 100644
index 7fe3790..0000000
--- a/gl3n-fix-secondary-arches.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- gl3n-1.3.1/command.make.orig 2016-11-30 12:18:54.942800817 +0100
-+++ gl3n-1.3.1/command.make 2016-11-30 12:19:51.511825881 +0100
-@@ -160,34 +160,6 @@
- LDCFLAGS += $(LINKERFLAG)-ldl
- endif
-
--# If model are not given take the same as current system
--ifndef ARCH
-- ifeq ($(OS),"Windows")
-- ifeq ($(PROCESSOR_ARCHITECTURE), x86)
-- ARCH = x86
-- else
-- ARCH = x86_64
-- endif
-- else
-- ARCH = $(shell arch 2>/dev/null || uname -m)
-- endif
--endif
--ifndef MODEL
-- ifeq ($(ARCH), x86_64)
-- MODEL = 64
-- else
-- MODEL = 32
-- endif
--endif
--
--ifeq ($(MODEL), 64)
-- DCFLAGS += -m64
-- LDCFLAGS += -m64
--else
-- DCFLAGS += -m32
-- LDCFLAGS += -m32
--endif
--
- ifndef DESTDIR
- DESTDIR =
- endif
-@@ -270,7 +242,6 @@
- RANLIB = ranlib
-
- export AR
--export ARCH
- export ARFLAGS
- export BIN_DIR
- export BUILD_PATH
-@@ -300,7 +271,6 @@
- export message
- export MAKE
- export MKDIR
--export MODEL
- export MV
- export OUTPUT
- export OS
diff --git a/gl3n.spec b/gl3n.spec
deleted file mode 100644
index afc6e4f..0000000
--- a/gl3n.spec
+++ /dev/null
@@ -1,199 +0,0 @@
-%global snapdate 20150625
-%global gl3n_revision 20b3487
-%global alphatag %{snapdate}git%{gl3n_revision}
-%global debug_package %{nil}
-
-# The source for this package was pulled from upstream's git.
-# Use the following commands to generate the tarball:
-# git clone https://github.com/Dav1dde/gl3n
-# cd gl3n
-# git rev-parse --short HEAD -> for gl3n_revision
-# git checkout %%gl3n_rev
-# git archive --prefix=gl3n-%%{alphatag}/ HEAD --format=tar | xz > ../gl3n-%%{alphatag}.tar.xz
-
-Name: gl3n
-Version: 1.3.1
-Release: 13%{?dist}
-Summary: An OpenGL Mathematics library for D
-Summary(fr): Une bibliothque Mathmatique utilisant OpenGL pour D
-License: MIT
-URL: http://dav1dde.github.io/gl3n/
-Source0: https://github.com/Dav1dde/%{name}/archive/v%{version}.tar.gz
-# Fix the build on secondary arches
-Patch0: gl3n-fix-secondary-arches.patch
-
-ExclusiveArch: %{ldc_arches}
-
-BuildRequires: ldc
-BuildRequires: ldc-phobos-devel
-
-%description
-gl3n provides all the math you need to work with OpenGL, DirectX.
-Currently gl3n supports:
-- linear algebra
-+ vectors
-+ matrices
-+ quaternions
-- interpolation
-+ linear interpolation (lerp)
-+ spherical linear interpolation (slerp)
-+ hermite interpolation
-+ catmull rom interpolation
-Nearly all GLSL defined functions (according to spec 4.1)
-The power of D, e.g. dynamic swizzling, templated types (vectors, matrices,
-quaternions), impressive constructors and more!
-
-%description -l fr
-gl3n fournit toutes les fonctions mathmatiques dont vous avez besoin pour
-travailler avec OpenGL, DirectX. Actuellement gl3n supporte:
-- Algbre linaire
-+ vecteurs
-+ matrices
-+ quaternions
-- interpolation
-+ Interpolation linaire (Lerp)
-+ Sphriques interpolation linaire (slerp)
-+ D'interpolation d'Hermite
-+ Catmull Rom d'interpolation
-Presque toutes les fonctions dfinies GLSL (conformment aux spcifications
-4.1) La puissance de D, par exemple dynamiques swizzling, types bass sur des
-modles (vecteurs, matrices, quaternions), des constructeurs impressionnant et
-plus encore!
-
-%package devel
-Summary: Support for developing D application
-Summary(fr): Appui pour le dveloppement d'application D
-Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: geany
-
-%description devel
-The gl3n-devel package contains header files for developing gl3n
-applications.
-
-%description devel -l fr_FR
-Le paquet gl3n-devel contient les fichiers d'enttes pour dvelopper
-des applications utilisant gl3n.
-
-%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
-
-%build
-make %{?_smp_mflags} all-shared geany-tag DFLAGS_IMPORT="-Igl3n" DCFLAGS="%{_d_optflags}"
-
-%install
-# build library
-make %{?_smp_mflags} install-shared install-geany-tag PREFIX=%{buildroot}%{_prefix} LIB_DIR=%{buildroot}%{_libdir} DATA_DIR=%{buildroot}%{_datadir}
-
-%ldconfig_scriptlets
-
-%files
-%license LICENSE
-%{_libdir}/lib%{name}-ldc.so.1.0.0
-%{_libdir}/lib%{name}-ldc.so.1
-
-%files devel
-%{_libdir}/lib%{name}-ldc.so
-%{_datadir}/geany/tags/gl3n.d.tags
-%{_d_includedir}/%{name}
-%{_datadir}/pkgconfig/%{name}.pc
-%{_datadir}/doc/%{name}
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 09 2018 Kalev Lember <klember(a)redhat.com> - 1.3.1-10
-- Rebuilt for ldc 1.11
-
-* Mon Feb 19 2018 Kalev Lember <klember(a)redhat.com> - 1.3.1-9
-- Rebuilt for ldc 1.8
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Sep 13 2017 Kalev Lember <klember(a)redhat.com> - 1.3.1-7
-- Rebuilt for ldc 1.4
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jun 13 2017 Kalev Lember <klember(a)redhat.com> - 1.3.1-4
-- Rebuilt for new ldc compiler
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Nov 30 2016 Kalev Lember <klember(a)redhat.com> - 1.3.1-2
-- Rebuilt for new ldc compiler
-
-* Mon Oct 31 2016 Kalev Lember <klember(a)redhat.com> - 1.3.1-1
-- Update to 1.3.1
-
-* Sun Oct 30 2016 Kalev Lember <klember(a)redhat.com> - 1.2.0-18
-- Use new ldc_arches macro
-
-* Mon Oct 24 2016 Kalev Lember <klember(a)redhat.com> - 1.2.0-17
-- Enable arm architecture now that ldc is available there
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sun Sep 20 2015 Jonathan MERCIER <bioinfornatics(a)gmail.com> - 1.2.0-15
-- fix version number to 1.2.0
-
-* Sat Sep 19 2015 Jonathan MERCIER <bioinfornatics(a)gmail.com> - 0.20150625-14
-- update to latest release
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.20140505-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.20140505-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Mar 09 2014 jonathan MERCIER <bioinfornatics(a)gmail.com> - 0.20140301-11
-- Update to latest rev
-
-* Sun Mar 09 2014 jonathan MERCIER <bioinfornatics(a)gmail.com> - 0.20140301-11
-- Update to latest rev
-
-* Wed Oct 30 2013 Jonathan MERCIER <bioinfornatics(a)gmail.com> - 0.20131013-10
-- rebuilt
-
-* Thu Oct 24 2013 Jonathan MERCIER <bioinfornatics(a)gmail.com> - 0.20131013-9
-- Update to rev 9095b9a
-
-* Sun Aug 04 2013 "Jonathan Mercier" <"Jonathan Mercier at gmail dot org"> - 0.20130707-8
-- Update to rev 9d5d3e4
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.20130626-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jun 26 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 0.20130626-6
-- update to rev c7d0020
-
-* Mon Jun 10 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 0.20130601-5
-- Update to rev 1fbec49
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.20120813-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Sep 21 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 0.20120813-3
-- chaane version format
-
-* Mon Aug 13 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 1-2.20120813git1fb5a4a
-- update gl3n to latest rev
-
-* Fri Dec 9 2011 Jonathan MERCIER <bioinfornatics at gmail.com> 1-1.20111207hg189
-- Add doc for devhelp
-- Add tag for geany
-- Init spec
diff --git a/sources b/sources
deleted file mode 100644
index 74056cd..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-1c27cdc3ff4dc982e3530fd3ffa848e7 v1.3.1.tar.gz
4 years, 9 months
Architecture specific change in rpms/gettext.git
by githook-noreply@fedoraproject.org
The package rpms/gettext.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gettext.git/commit/?id=2b1ba2ed02....
Change:
-%ifarch ppc ppc64 ppc64le
Thanks.
Full change:
============
commit 2b1ba2ed02436ebf1ea7976a791b8714e18cd3a5
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:46:07 2019 +0000
gettext fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674958
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 664f03a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/gettext-0.*.tar.xz
diff --git a/STAGE2-gettext b/STAGE2-gettext
deleted file mode 100644
index dd61b05..0000000
--- a/STAGE2-gettext
+++ /dev/null
@@ -1,9 +0,0 @@
-#requires bison
-#requires libtool
-
-mcd $BUILDDIR/gettext
-
-$SRC/gettext-*/configure $TCONFIGARGS --disable-static --enable-shared --with-pic-=yes --disable-csharp --disable-rpath
-
-make $J
-make $J install
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..f331555
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+gettext fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674958
diff --git a/disable-gettext-runtime-test-lock.patch b/disable-gettext-runtime-test-lock.patch
deleted file mode 100644
index ec3a59b..0000000
--- a/disable-gettext-runtime-test-lock.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit bd2c6ca2b7ae0be02d4bb85db79def454f3153fb
-Author: rpm-build <rpm-build>
-AuthorDate: Wed Dec 21 12:50:54 2016 +0100
-Commit: rpm-build <rpm-build>
-CommitDate: Wed Dec 21 12:52:36 2016 +0100
-
- disable-gettext-runtime-test-lock.patch
-
-diff --git a/gettext-runtime/tests/Makefile.am b/gettext-runtime/tests/Makefile.am
-index 88a0684..3a27b79 100644
---- a/gettext-runtime/tests/Makefile.am
-+++ b/gettext-runtime/tests/Makefile.am
-@@ -19,7 +19,7 @@
- AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests subdir-objects
- EXTRA_DIST =
-
--TESTS = test-lock
-+TESTS =
-
- AM_CPPFLAGS = \
- -I.. \
-diff --git a/gettext-runtime/tests/Makefile.in b/gettext-runtime/tests/Makefile.in
-index 4327733..5879146 100644
---- a/gettext-runtime/tests/Makefile.in
-+++ b/gettext-runtime/tests/Makefile.in
-@@ -86,7 +86,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--TESTS = test-lock$(EXEEXT)
-+TESTS =
- check_PROGRAMS = test-lock$(EXEEXT)
- subdir = tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-diff --git a/gettext-tools/gnulib-tests/Makefile.in b/gettext-tools/gnulib-tests/Makefile.in
-index 26becd9..4b9d0e4 100644
---- a/gettext-tools/gnulib-tests/Makefile.in
-+++ b/gettext-tools/gnulib-tests/Makefile.in
-@@ -143,7 +143,7 @@ TESTS = test-set-mode-acl.sh test-set-mode-acl-1.sh \
- test-isnanl-nolibm$(EXEEXT) test-isnanl$(EXEEXT) \
- test-iswblank$(EXEEXT) test-langinfo$(EXEEXT) \
- test-linkedhash_list$(EXEEXT) test-locale$(EXEEXT) \
-- test-localename$(EXEEXT) test-lock$(EXEEXT) \
-+ test-localename$(EXEEXT) \
- test-log10$(EXEEXT) test-lseek.sh test-lstat$(EXEEXT) \
- test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \
- test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
diff --git a/gettext-0.19.8-its-segfault.patch b/gettext-0.19.8-its-segfault.patch
deleted file mode 100644
index 430719f..0000000
--- a/gettext-0.19.8-its-segfault.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a0cab23332a254e3500cac2a3a984472d02180e5 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno(a)clisp.org>
-Date: Fri, 9 Dec 2016 21:04:31 +0100
-Subject: [PATCH] Fix crash of xgettext with --its option.
-
-* gettext-tools/src/xgettext.c (main): Free contents of its_dirs only when it
-was initialized. Fixes bug introduced on 2016-05-16.
----
- gettext-tools/src/xgettext.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
-index f848d76d1..a80ee51ac 100644
---- a/gettext-tools/src/xgettext.c
-+++ b/gettext-tools/src/xgettext.c
-@@ -330,7 +330,7 @@ main (int argc, char *argv[])
- bool sort_by_msgid = false;
- bool sort_by_filepos = false;
- char **dirs;
-- char **its_dirs;
-+ char **its_dirs = NULL;
- char *explicit_its_filename = NULL;
- const char *file_name;
- const char *files_from = NULL;
-@@ -1016,9 +1016,12 @@ warning: file '%s' extension '%s' is unknown; will try C"), filename, extension)
- if (its_locating_rules)
- locating_rule_list_free (its_locating_rules);
-
-- for (i = 0; its_dirs[i] != NULL; i++)
-- free (its_dirs[i]);
-- free (its_dirs);
-+ if (its_dirs != NULL)
-+ {
-+ for (i = 0; its_dirs[i] != NULL; i++)
-+ free (its_dirs[i]);
-+ free (its_dirs);
-+ }
-
- exit (EXIT_SUCCESS);
- }
---
-2.14.3
-
diff --git a/gettext-0.19.8.1-CVE-2018-18751.patch b/gettext-0.19.8.1-CVE-2018-18751.patch
deleted file mode 100644
index a857738..0000000
--- a/gettext-0.19.8.1-CVE-2018-18751.patch
+++ /dev/null
@@ -1,445 +0,0 @@
-From dce3a16e5e9368245735e29bf498dcd5e3e474a4 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno(a)gnu.org>
-Date: Thu, 15 Sep 2016 13:57:24 +0200
-Subject: [PATCH] xgettext: Fix crash with *.po file input
-
-When xgettext was given two *.po files with the same msgid_plural, it
-crashed with double-free. Problem reported by Davlet Panech in:
-http://lists.gnu.org/archive/html/bug-gettext/2016-09/msg00001.html
-
-praiskup:
-- I dropped the testsuite part, otherwise we'd have to 'autoreconf -vif' the
- sources
-- I'm patching manually the po-gram-gen.c file to avoid 'bison' BR
-
-diff --git a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y
-index becf5e607..4428e7725 100644
---- a/gettext-tools/src/po-gram-gen.y
-+++ b/gettext-tools/src/po-gram-gen.y
-@@ -221,14 +221,11 @@ message
- check_obsolete ($1, $3);
- check_obsolete ($1, $4);
- if (!$1.obsolete || pass_obsolete_entries)
-- {
-- do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
-- $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
-- $1.prev_ctxt,
-- $1.prev_id, $1.prev_id_plural,
-- $1.obsolete);
-- free ($3.string);
-- }
-+ do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
-+ $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
-+ $1.prev_ctxt,
-+ $1.prev_id, $1.prev_id_plural,
-+ $1.obsolete);
- else
- {
- free_message_intro ($1);
-diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c
-index 571d18e1b..6af6d2025 100644
---- a/gettext-tools/src/read-catalog.c
-+++ b/gettext-tools/src/read-catalog.c
-@@ -397,6 +397,8 @@ default_add_message (default_catalog_reader_ty *this,
- appropriate. */
- mp = message_alloc (msgctxt, msgid, msgid_plural, msgstr, msgstr_len,
- msgstr_pos);
-+ if (msgid_plural != NULL)
-+ free (msgid_plural);
- mp->prev_msgctxt = prev_msgctxt;
- mp->prev_msgid = prev_msgid;
- mp->prev_msgid_plural = prev_msgid_plural;
-diff --git a/gettext-tools/src/po-gram-gen.c b/gettext-tools/src/po-gram-gen.c
---- a/gettext-tools/src/po-gram-gen.c
-+++ b/gettext-tools/src/po-gram-gen.c
-@@ -1,8 +1,8 @@
--/* A Bison parser, made by GNU Bison 3.0.4. */
-+/* A Bison parser, made by GNU Bison 3.0.5. */
-
- /* Bison implementation for Yacc-like parsers in C
-
-- Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
-+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -44,7 +44,7 @@
- #define YYBISON 1
-
- /* Bison version. */
--#define YYBISON_VERSION "3.0.4"
-+#define YYBISON_VERSION "3.0.5"
-
- /* Skeleton name. */
- #define YYSKELETON_NAME "yacc.c"
-@@ -568,9 +568,9 @@
- static const yytype_uint16 yyrline[] =
- {
- 0, 169, 169, 171, 172, 173, 174, 179, 187, 195,
-- 216, 240, 249, 258, 269, 278, 292, 301, 315, 321,
-- 332, 338, 350, 361, 372, 376, 391, 414, 422, 434,
-- 442
-+ 216, 237, 246, 255, 266, 275, 289, 298, 312, 318,
-+ 329, 335, 347, 358, 369, 373, 388, 411, 419, 431,
-+ 439
- };
- #endif
-
-@@ -1054,6 +1054,7 @@
- case N: \
- yyformat = S; \
- break
-+ default: /* Avoid compiler warnings. */
- YYCASE_(0, YY_("syntax error"));
- YYCASE_(1, YY_("syntax error, unexpected %s"));
- YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-@@ -1370,23 +1371,23 @@
- switch (yyn)
- {
- case 7:
--#line 180 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 180 "po-gram-gen.y" /* yacc.c:1648 */
- {
- po_callback_comment_dispatcher ((yyvsp[0].string).string);
- }
--#line 1378 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1379 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 8:
--#line 188 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 188 "po-gram-gen.y" /* yacc.c:1648 */
- {
- po_callback_domain ((yyvsp[0].string).string);
- }
--#line 1386 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1387 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 9:
--#line 196 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 196 "po-gram-gen.y" /* yacc.c:1648 */
- {
- char *string2 = string_list_concat_destroy (&(yyvsp[-2].stringlist).stringlist);
- char *string4 = string_list_concat_destroy (&(yyvsp[0].stringlist).stringlist);
-@@ -1407,11 +1408,11 @@
- free (string4);
- }
- }
--#line 1411 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1412 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 10:
--#line 217 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 217 "po-gram-gen.y" /* yacc.c:1648 */
- {
- char *string2 = string_list_concat_destroy (&(yyvsp[-2].stringlist).stringlist);
-
-@@ -1419,14 +1420,11 @@
- check_obsolete ((yyvsp[-3].message_intro), (yyvsp[-1].string));
- check_obsolete ((yyvsp[-3].message_intro), (yyvsp[0].rhs));
- if (!(yyvsp[-3].message_intro).obsolete || pass_obsolete_entries)
-- {
-- do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string,
-- (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos,
-- (yyvsp[-3].message_intro).prev_ctxt,
-- (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural,
-- (yyvsp[-3].message_intro).obsolete);
-- free ((yyvsp[-1].string).string);
-- }
-+ do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string,
-+ (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos,
-+ (yyvsp[-3].message_intro).prev_ctxt,
-+ (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural,
-+ (yyvsp[-3].message_intro).obsolete);
- else
- {
- free_message_intro ((yyvsp[-3].message_intro));
-@@ -1435,11 +1433,11 @@
- free ((yyvsp[0].rhs).rhs.msgstr);
- }
- }
--#line 1439 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1437 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 11:
--#line 241 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 238 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist));
- check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].string));
-@@ -1448,11 +1446,11 @@
- string_list_destroy (&(yyvsp[-1].stringlist).stringlist);
- free ((yyvsp[0].string).string);
- }
--#line 1452 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1450 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 12:
--#line 250 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 247 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist));
- check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].rhs));
-@@ -1461,22 +1459,22 @@
- string_list_destroy (&(yyvsp[-1].stringlist).stringlist);
- free ((yyvsp[0].rhs).rhs.msgstr);
- }
--#line 1465 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1463 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 13:
--#line 259 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 256 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-1].message_intro), (yyvsp[0].stringlist));
- po_gram_error_at_line (&(yyvsp[-1].message_intro).pos, _("missing 'msgstr' section"));
- free_message_intro ((yyvsp[-1].message_intro));
- string_list_destroy (&(yyvsp[0].stringlist).stringlist);
- }
--#line 1476 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1474 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 14:
--#line 270 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 267 "po-gram-gen.y" /* yacc.c:1648 */
- {
- (yyval.message_intro).prev_ctxt = NULL;
- (yyval.message_intro).prev_id = NULL;
-@@ -1485,11 +1483,11 @@
- (yyval.message_intro).pos = (yyvsp[0].string).pos;
- (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete;
- }
--#line 1489 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1487 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 15:
--#line 279 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 276 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-1].prev), (yyvsp[0].string));
- (yyval.message_intro).prev_ctxt = (yyvsp[-1].prev).ctxt;
-@@ -1499,11 +1497,11 @@
- (yyval.message_intro).pos = (yyvsp[0].string).pos;
- (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete;
- }
--#line 1503 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1501 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 16:
--#line 293 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 290 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-1].string), (yyvsp[0].stringlist));
- (yyval.prev).ctxt = (yyvsp[-1].string).string;
-@@ -1512,11 +1510,11 @@
- (yyval.prev).pos = (yyvsp[-1].string).pos;
- (yyval.prev).obsolete = (yyvsp[-1].string).obsolete;
- }
--#line 1516 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1514 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 17:
--#line 302 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 299 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-2].string), (yyvsp[-1].stringlist));
- check_obsolete ((yyvsp[-2].string), (yyvsp[0].string));
-@@ -1526,21 +1524,21 @@
- (yyval.prev).pos = (yyvsp[-2].string).pos;
- (yyval.prev).obsolete = (yyvsp[-2].string).obsolete;
- }
--#line 1530 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1528 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 18:
--#line 316 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 313 "po-gram-gen.y" /* yacc.c:1648 */
- {
- (yyval.string).string = NULL;
- (yyval.string).pos = (yyvsp[0].pos).pos;
- (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
- }
--#line 1540 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1538 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 19:
--#line 322 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 319 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist));
- check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos));
-@@ -1548,21 +1546,21 @@
- (yyval.string).pos = (yyvsp[0].pos).pos;
- (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
- }
--#line 1552 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1550 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 20:
--#line 333 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 330 "po-gram-gen.y" /* yacc.c:1648 */
- {
- (yyval.string).string = NULL;
- (yyval.string).pos = (yyvsp[0].pos).pos;
- (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
- }
--#line 1562 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1560 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 21:
--#line 339 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 336 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist));
- check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos));
-@@ -1570,11 +1568,11 @@
- (yyval.string).pos = (yyvsp[0].pos).pos;
- (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
- }
--#line 1574 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1572 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 22:
--#line 351 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 348 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist));
- plural_counter = 0;
-@@ -1582,30 +1580,30 @@
- (yyval.string).pos = (yyvsp[-1].pos).pos;
- (yyval.string).obsolete = (yyvsp[-1].pos).obsolete;
- }
--#line 1586 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1584 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 23:
--#line 362 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 359 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist));
- (yyval.string).string = string_list_concat_destroy (&(yyvsp[0].stringlist).stringlist);
- (yyval.string).pos = (yyvsp[-1].pos).pos;
- (yyval.string).obsolete = (yyvsp[-1].pos).obsolete;
- }
--#line 1597 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1595 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 24:
--#line 373 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 370 "po-gram-gen.y" /* yacc.c:1648 */
- {
- (yyval.rhs) = (yyvsp[0].rhs);
- }
--#line 1605 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1603 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 25:
--#line 377 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 374 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-1].rhs), (yyvsp[0].rhs));
- (yyval.rhs).rhs.msgstr = XNMALLOC ((yyvsp[-1].rhs).rhs.msgstr_len + (yyvsp[0].rhs).rhs.msgstr_len, char);
-@@ -1617,11 +1615,11 @@
- (yyval.rhs).pos = (yyvsp[-1].rhs).pos;
- (yyval.rhs).obsolete = (yyvsp[-1].rhs).obsolete;
- }
--#line 1621 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1619 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 26:
--#line 392 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 389 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-4].pos), (yyvsp[-3].pos));
- check_obsolete ((yyvsp[-4].pos), (yyvsp[-2].number));
-@@ -1640,11 +1638,11 @@
- (yyval.rhs).pos = (yyvsp[-4].pos).pos;
- (yyval.rhs).obsolete = (yyvsp[-4].pos).obsolete;
- }
--#line 1644 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1642 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 27:
--#line 415 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 412 "po-gram-gen.y" /* yacc.c:1648 */
- {
- string_list_init (&(yyval.stringlist).stringlist);
- string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string);
-@@ -1652,11 +1650,11 @@
- (yyval.stringlist).pos = (yyvsp[0].string).pos;
- (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete;
- }
--#line 1656 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1654 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 28:
--#line 423 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 420 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string));
- (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist;
-@@ -1665,11 +1663,11 @@
- (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos;
- (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete;
- }
--#line 1669 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1667 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 29:
--#line 435 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 432 "po-gram-gen.y" /* yacc.c:1648 */
- {
- string_list_init (&(yyval.stringlist).stringlist);
- string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string);
-@@ -1677,11 +1675,11 @@
- (yyval.stringlist).pos = (yyvsp[0].string).pos;
- (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete;
- }
--#line 1681 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1679 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
- case 30:
--#line 443 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 440 "po-gram-gen.y" /* yacc.c:1648 */
- {
- check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string));
- (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist;
-@@ -1690,11 +1688,11 @@
- (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos;
- (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete;
- }
--#line 1694 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1692 "po-gram-gen.c" /* yacc.c:1648 */
- break;
-
-
--#line 1698 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1696 "po-gram-gen.c" /* yacc.c:1648 */
- default: break;
- }
- /* User semantic actions sometimes alter yychar, and that requires
---
-2.19.1
-
diff --git a/gettext-po-send-mail.patch b/gettext-po-send-mail.patch
deleted file mode 100644
index 2602e1d..0000000
--- a/gettext-po-send-mail.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: gettext-0.19.8.1/gettext-tools/misc/po-mode.el
-===================================================================
---- gettext-0.19.8.1.orig/gettext-tools/misc/po-mode.el
-+++ gettext-0.19.8.1/gettext-tools/misc/po-mode.el
-@@ -3518,10 +3518,12 @@ Write to your team? ('n' if writing to
- (re-search-forward
- (concat "^" (regexp-quote mail-header-separator) "\n"))
- (save-excursion
-- (insert-buffer-substring buffer)
-- (shell-command-on-region
-- (region-beginning) (region-end)
-- (concat po-gzip-uuencode-command " " name ".gz") t t))))))
-+ (save-restriction
-+ (narrow-to-region (point) (point))
-+ (insert-buffer-substring buffer)
-+ (shell-command-on-region
-+ (point-min) (point-max)
-+ (concat po-gzip-uuencode-command " " name ".gz") t t)))))))
- (message ""))
-
- (defun po-confirm-and-quit ()
diff --git a/gettext.spec b/gettext.spec
deleted file mode 100644
index 5b1ede0..0000000
--- a/gettext.spec
+++ /dev/null
@@ -1,1040 +0,0 @@
-%bcond_with jar
-%bcond_with java
-%bcond_without check
-
-%global tarversion 0.19.8.1
-%global archiveversion 0.19.8
-
-Summary: GNU libraries and utilities for producing multi-lingual messages
-Name: gettext
-Version: 0.19.8.1
-Release: 21%{?dist}
-License: GPLv3+ and LGPLv2+
-URL: http://www.gnu.org/software/gettext/
-Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{tarversion}.tar.xz
-# Disable the test_lock test as it often hangs on a number of arches
-# https://bugzilla.redhat.com/show_bug.cgi?id=1155291
-# http://savannah.gnu.org/bugs/?43487
-Patch0: disable-gettext-runtime-test-lock.patch
-# Upstreamed patch:
-# http://lists.gnu.org/archive/html/bug-gettext/2016-08/msg00006.html
-Patch1: gettext-po-send-mail.patch
-# Rhbz#1531476, upstream a0cab23332a254e3500cac2a3a984472d02180e5
-Patch2: gettext-0.19.8-its-segfault.patch
-# rhbz#1647044
-Patch3: gettext-0.19.8.1-CVE-2018-18751.patch
-
-Source2: msghack.py
-Source3: msghack.1
-# for bootstrapping
-# BuildRequires: autoconf >= 2.62
-# BuildRequires: automake
-# BuildRequires: libtool
-# BuildRequires: bison
-
-BuildRequires: gcc-c++
-%if %{with java}
-# libintl.jar requires gcj >= 4.3 to build
-BuildRequires: gcc-java, libgcj
-# For javadoc
-BuildRequires: java-1.6.0-openjdk-devel
-%if %{with jar}
-BuildRequires: %{_bindir}/fastjar
-# require zip and unzip for brp-java-repack-jars
-BuildRequires: zip, unzip
-%endif
-%endif
-# for po-mode.el
-BuildRequires: emacs
-# for autosetup
-BuildRequires: git
-# ensure 'ARCHIVE_FORMAT=dirxz'
-BuildRequires: xz
-BuildRequires: chrpath
-# following suggested by DEPENDENCIES:
-BuildRequires: ncurses-devel
-BuildRequires: libxml2-devel
-BuildRequires: glib2-devel
-BuildRequires: libcroco-devel
-BuildRequires: libunistring-devel
-# Depend on the exact version of the library sub package
-Requires: %{name}-libs%{_isa} = %{version}-%{release}
-# for F17 UsrMove
-Conflicts: filesystem < 3
-Provides: /bin/gettext
-# exception for bundled gnulib copylib
-Provides: bundled(gnulib)
-
-%description
-The GNU gettext package provides a set of tools and documentation for
-producing multi-lingual messages in programs. Tools include a set of
-conventions about how programs should be written to support message
-catalogs, a directory and file naming organization for the message
-catalogs, a runtime library which supports the retrieval of translated
-messages, and stand-alone programs for handling the translatable and
-the already translated strings. Gettext provides an easy to use
-library and tools for creating, using, and modifying natural language
-catalogs and is a powerful and simple method for internationalizing
-programs.
-
-
-%package common-devel
-Summary: Common development files for %{name}
-# autopoint archive
-License: GPLv3+
-BuildArch: noarch
-
-%description common-devel
-This package contains common architecture independent gettext development files.
-
-
-%package devel
-Summary: Development files for %{name}
-# autopoint is GPLv3+
-# libasprintf is LGPLv2+
-# libgettextpo is GPLv3+
-License: LGPLv2+ and GPLv3+
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common-devel = %{version}-%{release}
-Requires: xz
-Obsoletes: gettext-autopoint < 0.18.1.1-3
-Provides: gettext-autopoint = %{version}-%{release}
-
-%description devel
-This package contains all development related files necessary for
-developing or compiling applications/libraries that needs
-internationalization capability. You also need this package if you
-want to add gettext support for your project.
-
-
-%package libs
-Summary: Libraries for %{name}
-# libasprintf is LGPLv2+
-# libgettextpo is GPLv3+
-License: LGPLv2+ and GPLv3+
-
-%description libs
-This package contains libraries used internationalization support.
-
-
-%package -n emacs-%{name}
-Summary: Support for editing po files within GNU Emacs
-BuildArch: noarch
-# help users find po-mode.el
-Provides: emacs-po-mode
-Requires: emacs(bin) >= %{_emacs_version}
-Provides: emacs-%{name}-el = %{version}-%{release}
-Obsoletes: emacs-%{name}-el < %{version}-%{release}
-
-%description -n emacs-%{name}
-This package provides a major mode for editing po files within GNU Emacs.
-
-%package -n msghack
-Summary: Alter PO files in ways
-BuildArch: noarch
-
-%description -n msghack
-This program can be used to alter .po files in ways no sane mind would
-think about.
-
-
-%prep
-%autosetup -n %{name}-%{tarversion} -S git
-
-
-%build
-%if %{with java}
-export JAVAC=gcj
-%if %{with jar}
-export JAR=fastjar
-%endif
-%endif
-%ifarch ppc ppc64 ppc64le
-# prevent test-isinf from failing with gcc-5.3.1 on ppc64le (#1294016)
-export CFLAGS="$RPM_OPT_FLAGS -D__SUPPORT_SNAN__"
-%endif
-# --disable-rpath doesn't work properly on lib64
-%configure --without-included-gettext --enable-nls --disable-static \
- --enable-shared --with-pic --disable-csharp --disable-rpath \
-%if %{with java}
- --enable-java \
-%else
- --disable-java --disable-native-java \
-%endif
- --with-xz
-
-make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"}
-
-
-%install
-make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="%{__install} -p" \
- lispdir=%{_datadir}/emacs/site-lisp/gettext \
- aclocaldir=%{_datadir}/aclocal EXAMPLESFILES=""
-
-
-install -pm 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
-install -pm 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_mandir}/man1/msghack.1
-
-
-# make preloadable_libintl.so executable
-chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/preloadable_libintl.so
-
-rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
-
-# doc relocations
-for i in gettext-runtime/man/*.html; do
- rm ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/`basename $i`
-done
-rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/javadoc*
-
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/examples
-
-rm -rf htmldoc
-mkdir htmldoc
-mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/* ${RPM_BUILD_ROOT}/%{_datadir}/doc/libasprintf/* htmldoc
-rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf
-rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
-
-## note libintl.jar does not build with gcj < 4.3
-## since it would not be fully portable
-%if %{with jar}
-### this is no longer needed since examples not packaged
-## set timestamp of examples ChangeLog timestamp for brp-java-repack-jars
-#for i in `find ${RPM_BUILD_ROOT} examples -newer ChangeLog -type f -name ChangeLog`; do
-# touch -r ChangeLog $i
-#done
-%else
-# in case another java compiler is installed
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/libintl.jar
-%endif
-
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/gettext.jar
-
-# own this directory for third-party *.its files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/its
-
-# remove .la files
-rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
-
-# remove internal .so lib files
-rm ${RPM_BUILD_ROOT}%{_libdir}/libgettext{src,lib}.so
-
-# move po-mode initialization elisp file to the right place, and remove byte
-# compiled file
-install -d ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
-mv ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.el ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
-rm ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.elc
-
-%find_lang %{name}-runtime
-%find_lang %{name}-tools
-cat %{name}-*.lang > %{name}.lang
-
-# cleanup rpaths
-for i in $RPM_BUILD_ROOT%{_bindir}/* `find $RPM_BUILD_ROOT%{_libdir} -type f`; do
- if file $i | grep "ELF 64-bit" >/dev/null; then
- chrpath -l $i && chrpath --delete $i
- fi
-done
-
-
-%if %{with check}
-%check
-# this takes quite a lot of time to run
-
-# override LIBUNISTRING to prevent reordering of lib objects
-make check LIBUNISTRING=-lunistring
-%endif
-
-%ldconfig_scriptlets libs
-
-%files -f %{name}.lang
-%doc AUTHORS gettext-runtime/BUGS
-%doc COPYING gettext-tools/misc/DISCLAIM README
-%doc NEWS THANKS
-%doc gettext-runtime/man/*.1.html
-%doc gettext-runtime/intl/COPYING*
-%{_bindir}/*
-%exclude %{_bindir}/autopoint
-%exclude %{_bindir}/gettextize
-%exclude %{_bindir}/msghack
-%{_infodir}/gettext*
-%exclude %{_mandir}/man1/autopoint.1*
-%exclude %{_mandir}/man1/gettextize.1*
-%exclude %{_mandir}/man1/msghack.1*
-%{_mandir}/man1/*
-%{_libdir}/%{name}
-%if %{with java}
-%exclude %{_libdir}/%{name}/gnu.gettext.*
-%endif
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/its
-%{_datadir}/%{name}/ABOUT-NLS
-%{_datadir}/%{name}/po
-%{_datadir}/%{name}/styles
-%dir %{_datadir}/%{name}-%{archiveversion}
-%{_datadir}/%{name}-%{archiveversion}/its
-
-%files common-devel
-%{_datadir}/%{name}/archive.*.tar.xz
-
-%files devel
-%doc gettext-runtime/man/*.3.html ChangeLog
-%{_bindir}/autopoint
-%{_bindir}/gettextize
-%{_datadir}/%{name}/projects/
-%{_datadir}/%{name}/config.rpath
-%{_datadir}/%{name}/*.h
-%{_datadir}/%{name}/msgunfmt.tcl
-%{_datadir}/aclocal/*
-%{_includedir}/*
-%{_infodir}/autosprintf*
-%{_libdir}/libasprintf.so
-%{_libdir}/libgettextpo.so
-%{_libdir}/preloadable_libintl.so
-%{_mandir}/man1/autopoint.1*
-%{_mandir}/man1/gettextize.1*
-%{_mandir}/man3/*
-%{_datadir}/%{name}/intl
-%{_datadir}/%{name}/javaversion.class
-%doc gettext-runtime/intl-java/javadoc*
-%if %{with java}
-%{_libdir}/%{name}/gnu.gettext.*
-%endif
-
-%files libs
-%{_libdir}/libasprintf.so.0*
-%{_libdir}/libgettextpo.so.0*
-%{_libdir}/libgettextlib-0.*.so
-%{_libdir}/libgettextsrc-0.*.so
-%if %{with jar}
-%{_datadir}/%{name}/libintl.jar
-%endif
-
-%files -n emacs-%{name}
-%dir %{_emacs_sitelispdir}/%{name}
-%{_emacs_sitelispdir}/%{name}/*.elc
-%{_emacs_sitelispdir}/%{name}/*.el
-%{_emacs_sitestartdir}/*.el
-
-%files -n msghack
-%license COPYING
-%{_bindir}/msghack
-%{_mandir}/man1/msghack.1*
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.19.8.1-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Mar 7 2019 Tim Landscheidt <tim(a)tim-landscheidt.de> - 0.19.8.1-20
-- Remove obsolete requirements for %%post/%%preun scriptlets
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.19.8.1-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Nov 08 2018 Pavel Raiskup <praiskup(a)redhat.com> - 0.19.8.1-18
-- fix CVE-2018-18751 (rhbz#1647044)
-- put gettextize man page into gettext-devel (man page scan, rhbz#1611303)
-
-* Tue Jul 31 2018 Florian Weimer <fweimer(a)redhat.com> - 0.19.8.1-17
-- Rebuild with fixed binutils
-
-* Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.19.8.1-16
-- Replace obsolete scriptlets
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.19.8.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.19.8.1-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.19.8.1-13
-- Switch to %%ldconfig_scriptlets
-
-* Fri Jan 05 2018 Pavel Raiskup <praiskup(a)redhat.com> - 0.19.8.1-12
-- xgettext --its segfault fix (rhbz#1531476)
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.19.8.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.19.8.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Mar 15 2017 Kalev Lember <klember(a)redhat.com> - 0.19.8.1-9
-- Depend on the exact version of the library sub package
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.19.8.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Jan 26 2017 Pavel Raiskup <praiskup(a)redhat.com> - 0.19.8.1-7
-- really remove Requires: git from gettext-devel (rhbz#1161284)
-- make the BuildRequires unconditional (rhbz#1416691)
-
-* Wed Dec 21 2016 Pavel Raiskup <praiskup(a)redhat.com> - 0.19.8.1-6
-- disable test-lock for 'gettext-tool' subdir too (rhbz#1406031)
-
-* Mon Dec 19 2016 Miro Hronok <mhroncok(a)redhat.com> - 0.19.8.1-5
-- Rebuild for Python 3.6
-
-* Fri Dec 16 2016 Petr abata <contyk(a)redhat.com> - 0.19.8.1-4
-- Subpackage msghack so that gettext doesn't depend on python
-- name the new sub-package 'msghack'
-
-* Tue Nov 29 2016 Pavel Raiskup <praiskup(a)redhat.com> - 0.19.8.1-3
-- devel subpackage to Require 'xz' (rhbz#1399270)
-
-* Wed Aug 10 2016 Daiki Ueno <dueno(a)redhat.com> - 0.19.8.1-2
-- utilize %%autosetup
-- apply patch to fix po-send-mail when used with Emacs 25 (#1356642)
-
-* Sat Jun 11 2016 Daiki Ueno <dueno(a)redhat.com> - 0.19.8.1-1
-- update to 0.19.8.1 release
-
-* Thu Jun 9 2016 Daiki Ueno <dueno(a)redhat.com> - 0.19.8-1
-- update to 0.19.8 release
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.19.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jan 12 2016 Daiki Ueno <dueno(a)redhat.com> - 0.19.7-3
-- own .../gettext/its for third-party *.its files
-- add a work around for test-isinf failure on ppc64le (#1297387)
-
-* Fri Jan 8 2016 Daiki Ueno <dueno(a)redhat.com> - 0.19.7-2
-- apply patch to recognize .glade extension for GtkBuilder files (#1296653)
-
-* Thu Dec 10 2015 Daiki Ueno <dueno(a)redhat.com> - 0.19.7-1
-- update to 0.19.7 release
-
-* Thu Sep 24 2015 Daiki Ueno <dueno(a)redhat.com> - 0.19.6-1
-- update to 0.19.6 release
-
-* Wed Jul 22 2015 Daiki Ueno <dueno(a)redhat.com> - 0.19.5.1-2
-- work around version conflict between gettextize and autopoint
-
-* Thu Jul 16 2015 Daiki Ueno <dueno(a)redhat.com> - 0.19.5.1-1
-- update to 0.19.5.1 release
-
-* Fri Jun 26 2015 Daiki Ueno <dueno(a)redhat.com> - 0.19.4-7
-- drop -el subpackage (#1234583)
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.19.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 0.19.4-5
-- Rebuilt for GCC 5 C++11 ABI change
-
-* Sat Feb 21 2015 Till Maas <opensource(a)till.name> - 0.19.4-4
-- Rebuilt for Fedora 23 Change
- https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-...
-
-* Thu Feb 19 2015 Daiki Ueno <dueno(a)redhat.com> - 0.19.4-3
-- port msghack.py to Python 3 (#1192086)
-
-* Wed Dec 31 2014 Daiki Ueno <dueno(a)redhat.com> - 0.19.4-2
-- remove git dependency from -devel subpackage (#1161284)
-
-* Fri Dec 26 2014 Daiki Ueno <dueno(a)redhat.com> - 0.19.4-1
-- update to 0.19.4 release
-
-* Tue Oct 28 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.19.3-2
-- Disable the test_lock test as it often hangs on a number of arches
-
-* Thu Oct 16 2014 Daiki Ueno <dueno(a)redhat.com> - 0.19.3-1
-- update to 0.19.3 release
-- remove patches included in 0.19.3
-- remove autoconf/automake/libtool/bison from BR, as we don't do bootstrap
-
-* Wed Oct 15 2014 Daiki Ueno <dueno(a)redhat.com> - 0.19.2-5
-- apply patch to fix infloop in autopoint (Closes: #1151238)
-- apply patch to support newer ncurses in F-22
-
-* Fri Oct 3 2014 Daiki Ueno <dueno(a)redhat.com> - 0.19.2-4
-- apply patch to fix C octal character escape handling (Closes: #1147535)
-
-* Tue Sep 02 2014 Dennis Gilmore <dennis(a)ausil.us> - 0.19.2-3
-- rebuild for libunistring soname bump
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.19.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Mon Jul 14 2014 Daiki Ueno <dueno(a)redhat.com> - 0.19.2-1
-- update to 0.19.2 release
-
-* Mon Jul 7 2014 Daiki Ueno <dueno(a)redhat.com> - 0.19.1-2
-- apply patch to msghack.py, for Python 3 compatibility (Closes: #1113425,
- thanks to Bohuslav "Slavek" Kabrda)
-
-* Tue Jun 10 2014 Daiki Ueno <dueno(a)redhat.com> - 0.19.1-1
-- update to 0.19.1 release
-- switch to xz-compressed archive
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.19-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon Jun 2 2014 Daiki Ueno <dueno(a)redhat.com> - 0.19-2
-- apply patch to workaround msgfmt bug that counts warnings as errors
-
-* Mon Jun 2 2014 Daiki Ueno <dueno(a)redhat.com> - 0.19-1
-- update to 0.19 release
-- remove upstreamed -Wformat-security patch
-
-* Tue Jan 7 2014 Daiki Ueno <dueno(a)redhat.com> - 0.18.3.2-1
-- update to 0.18.3.2 release
-- apply patch to suppress -Wformat-security warnings in gnulib-tests
-
-* Sun Aug 25 2013 Daiki Ueno <dueno(a)redhat.com> - 0.18.3.1-1
-- update to 0.18.3.1 release
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.18.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 10 2013 Daiki Ueno <dueno(a)redhat.com> - 0.18.3-1
-- update to 0.18.3 release
-
-* Wed Jun 26 2013 Daiki Ueno <dueno(a)redhat.com> - 0.18.2.1-2
-- add a man page for msghack
-- fix bogus date in %%changelog
-
-* Tue Mar 12 2013 Daiki Ueno <dueno(a)redhat.com> - 0.18.2.1-1
-- update to 0.18.2.1 release (not really necessary though)
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.18.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Dec 26 2012 Daiki Ueno <dueno(a)redhat.com> - 0.18.2-1
-- update to 0.18.2 release (based on the spec patch by Jens Petersen)
-
-* Tue Oct 2 2012 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-17
-- move gettextize to the devel subpackage with its source data files
-- update msghack to GPL v3
-
-* Fri Jul 27 2012 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-16
-- patch gnulib since glibc and C11 dropped gets
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.18.1.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue May 29 2012 Remi Collet <remi(a)fedoraproject.org> - 0.18.1.1-14
-- add upstream patch from debian to fix xgettext segfault in
- remember_a_message_plural (#826138)
-
-* Thu May 17 2012 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-13
-- base package now provides bundled(gnulib) to make it clear that
- gettext is built with bundled gnulib (#821757)
-
-* Wed Jan 25 2012 Harald Hoyer <harald(a)redhat.com> 0.18.1.1-12
-- add filesystem guard
-
-* Wed Jan 25 2012 Harald Hoyer <harald(a)redhat.com> 0.18.1.1-11
-- install everything in /usr
- https://fedoraproject.org/wiki/Features/UsrMove
-
-* Tue Jan 10 2012 Nils Philippsen <nils(a)redhat.com> - 0.18.1.1-10
-- rebuild for gcc 4.7
-
-* Tue Oct 4 2011 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-9
-- correct the configure --with-pic option syntax (Gilles Espinasse)
-
-* Wed Sep 28 2011 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-8
-- add gettext-readlink-einval.patch to fix build on kernel >= 2.6.39 (#739188)
-- add optional buildrequires suggested in the DEPENDENCIES file
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.18.1.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Feb 7 2011 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-6
-- remove internal libgettextlib.so and libgettextsrc.so (#650471)
-
-* Mon Feb 7 2011 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-5
-- fix license field of gettext-libs since libgettextpo is GPLv3+ (#640158)
-
-* Thu Sep 9 2010 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-4
-- subpackage archive.git.tar.gz to avoid multilib conflicts (#631733)
-- update msghack.py header
-
-* Mon Aug 23 2010 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-3
-- merge autopoint subpackage into devel to simplify deps (#625325)
-- have ABOUT-NLS only in the base package datadir
-
-* Wed Jun 23 2010 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-2
-- correct license tag from GPLv3 to GPLv3+
-- subpackage autopoint which requires git (#574031)
-- no longer require cvs (#606746)
-- add bcond for git
-
-* Fri May 21 2010 Jens Petersen <petersen(a)redhat.com> - 0.18.1.1-1
-- update to 0.18.1.1 release (#591044)
-- gettext-0.17-autopoint-CVS-441481.patch, gettext-0.17-long-long-int-m4.patch
- gettext-0.17-open-args.patch, and
- gettext-xgettext-python-unicode-surrogate-473946.patch are upstream
-- move libintl.jar to lib subpackage to avoid multilib problems
- (reported by Jim Radford in #595922)
-- disable java for now
-- use chrpath to get us out of rpath hell instead of complicated libtool hacks
-- enable git support
-
-* Fri Apr 23 2010 Jens Petersen <petersen(a)redhat.com> - 0.17-17
-- create emacs subpackages for po-mode.el (thanks for patch from
- Jonathan Underwood, #579452)
-- provide emacs-po-mode
-- move libgettextlib and libgettextsrc from base to libs subpackage
- (requested by Peter Robinson for blender, #579388)
-
-* Fri Nov 27 2009 Jens Petersen <petersen(a)redhat.com> - 0.17-16
-- fix FTBFS by removing openmp.m4 which conflicts with recent autoconf (#539211)
-- cleanup gettext-0.17-rpathFix.patch
- - separate gl_AC_TYPE_LONG_LONG replacement to another patch
- - use trailing ':' for tests LD_LIBRARY_PATH
-- run autogen.sh with --quick and --skip-gnulib
-
-* Tue Sep 1 2009 Jens Petersen <petersen(a)redhat.com> - 0.17-15
-- bring back autopoint requires cvs (#517361)
-- requires info rather than /sbin/install-info
-- drop install_info and remove_install_info macros
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.17-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jun 24 2009 Jens Petersen <petersen(a)redhat.com> - 0.17-13
-- buildrequire automake (#507275)
-- run autogen
-
-* Mon Jun 22 2009 Jens Petersen <petersen(a)redhat.com> - 0.17-12
-- move intl/ and po/ to base package for gettextize
- (reported by Serge Pavlovsky, #496902)
-
-* Fri May 22 2009 Jens Petersen <petersen(a)redhat.com> - 0.17-11
-- use bcond's for build switches
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.17-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Feb 12 2009 Jens Petersen <petersen(a)redhat.com> - 0.17-9
-- add buildjava switch to allow turning off the java bits completely
-- add buildcheck to allow turning off make check
-- drop cvs requires for autopoint (Karl Lattimer, #469555)
-- add upstream gettext-xgettext-python-unicode-surrogate-473946.patch by
- Bruno Haible to fix xgettext handling of utf16 surrogates in python (#473946)
-
-* Fri Aug 29 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.17-8
-- Fix the build failure with koji.
-
-* Fri Aug 29 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.17-7
-- Remove the gettext-libs docs, as they are talking about autoconf, libtool,
- which are not directly related to the gettext-libs.
-- Remove unused definition and trailing space.
-- Fix the build failure with mock .
-
-* Tue Aug 19 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.17-6
-- Fixed Bug 456666 msghack doesn't check for mandatory cmd line params
- by adding checking statements and display usage (msghack.py modified)
-- rpath patch for binary-or-shlib-defines-rpath in x86_64.
-
-* Thu Apr 24 2008 Jens Petersen <petersen(a)redhat.com> - 0.17-5
-- fix autopoint messing up CVS files with upstream patch (#441481)
-
-* Mon Feb 18 2008 Jens Petersen <petersen(a)redhat.com> - 0.17-4
-- if %%buildjar is off make sure libintl.jar does not get installed (#433210)
-
-* Mon Feb 18 2008 Jens Petersen <petersen(a)redhat.com> - 0.17-3
-- turn on building of libintl.jar now that we have gcc43
-
-* Thu Feb 14 2008 Jens Petersen <petersen(a)redhat.com> - 0.17-2
-- rebuild with gcc43
-
-* Thu Jan 24 2008 Jens Petersen <petersen(a)redhat.com> - 0.17-1
-- update to 0.17 release
- - update License field to GPLv3
- - add gettext-0.17-open-args.patch to fix build from upstream
- - gettext-tools-tests-lang-gawk-fail.patch, gettext-php-headers.patch,
- gettext-php-prinf-output-237241.patch, and
- gettext-xglade-define-xml-major-version-285701.patch are no longer needed
-- drop superfluous po-mode-init.el source
-- no need to run autoconf and autoheader when building
-- pass -findirect-dispatch to gcj to make java binaries ABI independent
- (jakub,#427796)
-- move autopoint, gettextize, and {_datadir}/{name}/ to main package
-- force removal of emacs/ so install does not fail when no emacs
-
-* Fri Sep 21 2007 Jens Petersen <petersen(a)redhat.com> - 0.16.1-12
-- add a libs subpackage (suggested by Dwayne Bailey, #294891)
-- move preloadable_libintl.so to the devel subpackage
-
-* Fri Sep 14 2007 Nils Philippsen <nphilipp(a)redhat.com> - 0.16.1-11
-- remove gettext-xglade-include-expat-285701.patch, add
- gettext-xglade-define-xml-major-version-285701.patch to determine
- XML_MAJOR_VERSION from expat.h and define it in config.h (#285701)
-
-* Wed Sep 12 2007 Jens Petersen <petersen(a)redhat.com> - 0.16.1-10
-- buildrequire expat-devel
-- add gettext-xglade-include-expat-285701.patch to include expat.h
- to get xgettext to dl the right libexpat (Nils Philippsen, #285701)
-
-* Thu Aug 16 2007 Jens Petersen <petersen(a)redhat.com>
-- specify license is GPL and LGPL version 2 or later
-
-* Wed Aug 1 2007 Jens Petersen <petersen(a)redhat.com> - 0.16.1-9
-- fix encoding of msghack script (Dwayne Bailey, #250248)
-
-* Mon Apr 30 2007 Jens Petersen <petersen(a)redhat.com> - 0.16.1-8
-- add gettext-php-prinf-output-237241.patch to workaround php test failure
- (#237241)
-- add gettext-php-headers.patch to correct php test headers
- (Robert Scheck, #232832)
-
-* Thu Mar 15 2007 Jens Petersen <petersen(a)redhat.com> - 0.16.1-7
-- set preloadable_libintl.so executable in %%install so it gets stripped
-- force removal of infodir/dir since it is not there when /sbin is not in path
-
-* Tue Mar 13 2007 Jens Petersen <petersen(a)redhat.com> - 0.16.1-6
-- add buildjar switch for building of libintl.jar
-- lots of spec file cleanup (Mamoru Tasaka, #225791):
-- preserve timestamps of installed files
-- disable building of static library
-- use %%find_lang for .mo files
-- remove examples from -devel package
-- do not own en@*quot locale dirs
-- set preloadable_libintl.so executable
-- add ChangeLog to -devel package
-- add %%check to run make check
-- add gettext-tools-tests-lang-gawk-fail.patch to work around gawk test failure
-
-* Fri Feb 23 2007 Karsten Hopp <karsten(a)redhat.com> 0.16.1-5
-- rebuild to pick up dependency on libgcj.so.8rh instead libgcj.so.7rh
-
-* Thu Feb 1 2007 Jens Petersen <petersen(a)redhat.com> - 0.16.1-4
-- protect install-info in devel %%post and %%preun too (Ville Skytt, #223689)
-- forward port fix to reset of timestamp of examples ChangeLog for
- brp-java-repack-jars libintl.jar multilib conflict (#205207)
-
-* Mon Jan 22 2007 Jens Petersen <petersen(a)redhat.com> - 0.16.1-3
-- protect install-info in %%post and %%preun (Ville Skytt, #223689)
-
-* Fri Dec 22 2006 Jens Petersen <petersen(a)redhat.com> - 0.16.1-1
-- update to 0.16.1
-
-* Mon Nov 27 2006 Jens Petersen <petersen(a)redhat.com> - 0.16-2
-- re-enable openmp on ia64
-
-* Thu Nov 23 2006 Jens Petersen <petersen(a)redhat.com> - 0.16-1
-- update to 0.16 release
-- disable openmp on ia64 (#216988)
-
-* Fri Oct 27 2006 Jens Petersen <petersen(a)redhat.com> - 0.15-1
-- update to 0.15 release
-- mkinstalldirs and libintl.jar are gone
-- javaversion.class added
-
-* Mon Oct 2 2006 Jens Petersen <petersen(a)redhat.com> - 0.14.6-3
-- buildrequire zip and unzip to fix libintl.jar multilib conflict (#205207)
-
-* Fri Aug 25 2006 Jens Petersen <petersen(a)redhat.com> - 0.14.6-2
-- move libgettext*.so devel files to devel package (Patrice Dumas, #203622)
-
-* Mon Aug 7 2006 Jens Petersen <petersen(a)redhat.com> - 0.14.6-1
-- update to 0.14.6
-- include preloadable_libintl.so again (Roozbeh Pournader, #149809)
-- remove .la files (Kjartan Maraas, #172624)
-- cleanup spec file
-
-* Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim(a)redhat.com> - 0.14.5-4
-- Bump release number.
-
-* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0.14.5-3.1
-- rebuild
-
-* Wed Feb 22 2006 Karsten Hopp <karsten(a)redhat.de> 0.14.5-3
-- --disable-csharp, otherwise it'll build a dll when mono is
- installed in the buildroot.
-
-* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 0.14.5-2.2.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 0.14.5-2.2.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Tue Jan 3 2006 Jesse Keating <jkeating(a)redhat.com> 0.14.5-2.2
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com>
-- rebuilt
-
-* Wed Sep 28 2005 Jindrich Novy <jnovy(a)redhat.com> 0.14.5-2
-- convert spec to UTF-8
-- remove old tarballs from sources
-
-* Thu Aug 11 2005 Leon Ho <llch(a)redhat.com>
-- updated to 0.14.5
-- Add cvs as Requires for gettext-devel
-
-* Mon Mar 21 2005 Leon Ho <llch(a)redhat.com>
-- updated to 0.14.3
-- fixed compiling problem on gcc4 (#150992)
-- fixed Group for -devel (#138303)
-- moved gettextize and autopoint to -devel (#137542, #145768)
-- moved some of the man pages
-
-* Tue Mar 01 2005 Jakub Jelinek <jakub(a)redhat.com>
-- rebuilt with gcc 4.0
-
-* Wed Dec 01 2004 Leon Ho <llch(a)redhat.com>
-- Add env var to redirect use fastjar instead of jar
-- BuildRequires fastjar and libgcj
-
-* Mon Nov 01 2004 Leon Ho <llch(a)redhat.com>
-- fix call on phase0_getc()
-- fix temp file issue (#136323 - CAN-2004-0966 - mjc)
-
-* Sun Oct 03 2004 Leon Ho <llch(a)redhat.com>
-- fixed typo on %%preun on -devel
-
-* Fri Oct 01 2004 Leon Ho <llch(a)redhat.com>
-- fix install_info
-- add gcc-java build requirement
-
-* Mon Sep 13 2004 Leon Ho <llch(a)redhat.com>
-- move java stuff to gettext-devel (#132239)
-- add BuildRequires: gcc-c++ (#132518)
-- add some missing install-info and ldconfig (#131272)
-- fix dir ownership (#133696)
-- run autotools for 1.9
-
-* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Tue Jun 08 2004 Leon Ho <llch(a)redhat.com>
-- use --without-included-gettext to avoid the need of libintl.so (#125497)
-- remove preloadable_libintl.so
-
-* Sun Jun 06 2004 Leon Ho <llch(a)redhat.com>
-- moved some of the shared lib to main pkg
-- added more build requires
-
-* Thu Jun 03 2004 Leon Ho <llch(a)redhat.com>
-- add conditionals for patch and requires auto* (#125216)
-
-* Wed Jun 02 2004 Leon Ho <llch(a)redhat.com>
-- packaged lib files for devel
-- moved some of the files to different sub-pkg
-- fix problem on x86_64 build
-
-* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Mon Feb 02 2004 Leon Ho <llch(a)redhat.com>
-- rebuilt to 0.14.1
-
-* Fri Sep 19 2003 Leon Ho <llch(a)redhat.com>
-- rebuilt 0.12.1
-- fix including files and excludes some patches
-
-* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Wed May 14 2003 Leon Ho <llch(a)redhat.com>
-- 0.11.5
-
-* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com>
-- rebuilt
-
-* Thu Jan 16 2003 Leon Ho <llch(a)redhat.com> 0.11.4-6
-- add online help for msghack replacement
-
-* Thu Dec 5 2002 Leon Ho <llch(a)redhat.com> 0.11.4-5
-- add patch to fix gettextize (#78720)
-
-* Wed Nov 27 2002 Tim Powers <timp(a)redhat.com> 0.11.4-4
-- remove unpackaged files from the buildroot
-
-* Wed Aug 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 0.11.4-3
-- Use %%{_libdir} instead of /usr/lib (#72524)
-
-* Fri Aug 2 2002 Nalin Dahyabhai <nalin(a)redhat.com> 0.11.4-2
-- install ulonglong.m4, which is required by uintmax_t.m4, which is already
- being installed
-
-* Sun Jul 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 0.11.4-1
-- 0.11.4
-
-* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Thu May 23 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Tue May 14 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 0.11.2-1
-- 0.11.2
-- include some new files
-
-* Fri Apr 5 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 0.11.1-2
-- Add patch to make it compile with C99 compilers (#62313)
-
-* Wed Mar 13 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 0.11.1-1
-- 0.11.1
-
-* Sun Feb 17 2002 Florian La Roche <Florian.LaRoche(a)redhat.de>
-- update gettext to 0.11
-- disable patch4
-
-* Wed Jan 09 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Wed Dec 5 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 0.10.40-3
-- improve automake handling
-
-* Wed Nov 14 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 0.10.40-2
-- Add URL
-- Add automake workaround (#56081)
-
-* Sun Sep 16 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 0.10.40-1
-- 0.10.40 - libintl is now LGPLed (it was GPLed). Note that RHL
- uses the glibc version, and don't include libintl from gettext.
-- include new man pages
-- don't include the elisp mode - bundle it into the main emacs package,
- like we do for XEmacs.
-- README-alpha no longer exists, so don't list it as a doc file
-
-* Fri Aug 24 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 0.10.38-7
-- Rebuild - this should fix #52463
-
-* Wed Aug 22 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 0.10.38-6
-- Fix handling of multiline entries (rest of #50065)
-- don't use the references of the last entry in a po file
-- remove duplicates when inverting
-- Own the en@quot and en@boldquot locale dirs (#52164)
-- Handle entries with a first line of "" as identical to those
- without
-
-* Thu Aug 9 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Added "--append" and "-o" to msghack, which should address
- initial concerns in #50065
-
-* Thu Jul 19 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- New msghack - from scratch, in python
-
-* Tue Jul 17 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- msghack is back
-
-* Mon Jun 4 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Include some docfiles
-
-* Sun Jun 03 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
-- 0.10.38
-- do not include charset.alias
-
-* Wed May 2 2001 Nalin Dahyabhai <nalin(a)redhat.com>
-- Build statically.
-
-* Mon Apr 30 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- 0.10.37
-- Disable all but two patches
-
-* Sun Feb 25 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Initialize proper fonts when entering po-mode (#29152)
-
-* Mon Feb 12 2001 Yukihiro Nakai <ynakai(a)redhat.com>
-- More fix about msgmerge.
-
-* Mon Feb 12 2001 Yukihiro Nakai <ynakai(a)redhat.com>
-- Fix for msgmerge not to break multibyte strings
- at Japanese locale.
-
-* Wed Jan 24 2001 Matt Wilson <msw(a)redhat.com>
-- fixed the %%lang generator to not have "./" in the lang
-
-* Sun Jan 14 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- add an init file for the emacs po-mode
-- update source URL
-
-* Thu Jan 11 2001 Bill Nottingham <notting(a)redhat.com>
-- put gettext in /bin for initscripts use
-- %%langify
-
-* Fri Dec 29 2000 Bill Nottingham <notting(a)redhat.com>
-- prereq /sbin/install-info
-
-* Wed Aug 23 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Added patch from Ulrich Drepper
-
-* Fri Aug 04 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- update DESTDIR patch (#12072)
-
-* Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com>
-- automatic rebuild
-
-* Mon Jul 10 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- fix problems wrt to DESTDIR (#12072)
-
-* Thu Jun 22 2000 Preston Brown <pbrown(a)redhat.com>
-- use FHS paths
-- add buildroot patch for .../intl/Makefile.in, was using abs. install path
-
-* Fri Apr 28 2000 Bill Nottingham <notting(a)redhat.com>
-- minor configure tweaks for ia64
-
-* Sun Feb 27 2000 Cristian Gafton <gafton(a)redhat.com>
-- add --comments to msghack
-
-* Thu Feb 10 2000 Cristian Gafton <gafton(a)redhat.com>
-- fix bug #9240 - gettextize has the right aclocal patch
-
-* Wed Jan 12 2000 Cristian Gafton <gafton(a)redhat.com>
-- add the --diff and --dummy options
-
-* Wed Oct 06 1999 Cristian Gafton <gafton(a)redhat.com>
-- add the --missing option to msghack
-
-* Wed Sep 22 1999 Cristian Gafton <gafton(a)redhat.com>
-- updated msghack not to merge in fuzzies in the master catalogs
-
-* Thu Aug 26 1999 Cristian Gafton <gafton(a)redhat.com>
-- updated msghack to understand --append
-
-* Wed Aug 11 1999 Cristian Gafton <gafton(a)redhat.com>
-- updated msghack to correctly deal with sorting files
-
-* Thu May 06 1999 Cristian Gafton <gafton(a)redhat.com>
-- msghack updates
-
-* Sun Mar 21 1999 Cristian Gafton <gafton(a)redhat.com>
-- auto rebuild in the new build environment (release 8)
-
-* Mon Mar 08 1999 Cristian Gafton <gafton(a)redhat.com>
-- added patch for misc hacks to facilitate rpm translations
-
-* Thu Dec 03 1998 Cristian Gafton <gafton(a)redhat.com>
-- patch to allow to build on ARM
-
-* Wed Sep 30 1998 Jeff Johnson <jbj(a)redhat.com>
-- add Emacs po-mode.el files.
-
-* Sun Sep 13 1998 Cristian Gafton <gafton(a)redhat.com>
-- include the aclocal support files
-
-* Thu Sep 3 1998 Bill Nottingham <notting(a)redhat.com>
-- remove devel package (functionality is in glibc)
-
-* Tue Sep 1 1998 Jeff Johnson <jbj(a)redhat.com>
-- update to 0.10.35.
-
-* Mon Jun 29 1998 Jeff Johnson <jbj(a)redhat.com>
-- add gettextize.
-- create devel package for libintl.a and libgettext.h.
-
-* Mon Apr 27 1998 Prospector System <bugs(a)redhat.com>
-- translations modified for de, fr, tr
-
-* Sun Nov 02 1997 Cristian Gafton <gafton(a)redhat.com>
-- added info handling
-- added misc-patch (skip emacs-lisp modofications)
-
-* Sat Nov 01 1997 Erik Troan <ewt(a)redhat.com>
-- removed locale.aliases as we get it from glibc now
-- uses a buildroot
-
-* Mon Jun 02 1997 Erik Troan <ewt(a)redhat.com>
-- Built against glibc
diff --git a/msghack.1 b/msghack.1
deleted file mode 100644
index 42fcc5b..0000000
--- a/msghack.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.TH MSGHACK "1" "June 2013" "msghack" "User Commands"
-.SH NAME
-msghack \- alter PO files in ways
-.SH SYNOPSIS
-.B msghack
-[\fIOPTION\fR] \fIfile.po \fR[\fIref.po\fR]
-.SH DESCRIPTION
-.PP
-This program can be used to alter .po files in ways no sane mind would think about.
-.TP
-\fB\-o\fR
-result will be written to FILE
-.TP
-\fB\-\-invert\fR
-invert a po file by switching msgid and msgstr
-.TP
-\fB\-\-master\fR
-join any number of files in a master\-formatted catalog
-.TP
-\fB\-\-empty\fR
-empty the contents of the .po file, creating a .pot
-.TP
-\fB\-\-append\fR
-append entries from ref.po that don't exist in file.po
-.PP
-Note: It is just a replacement of msghack for backward support.
-.PP
-This program can be used to alter .po files in ways no sane mind would think about.
-.TP
-\fB\-o\fR
-result will be written to FILE
-.TP
-\fB\-\-invert\fR
-invert a po file by switching msgid and msgstr
-.TP
-\fB\-\-master\fR
-join any number of files in a master\-formatted catalog
-.TP
-\fB\-\-empty\fR
-empty the contents of the .po file, creating a .pot
-.TP
-\fB\-\-append\fR
-append entries from ref.po that don't exist in file.po
-.PP
-Note: It is just a replacement of msghack for backward support.
diff --git a/msghack.py b/msghack.py
deleted file mode 100755
index 358552c..0000000
--- a/msghack.py
+++ /dev/null
@@ -1,417 +0,0 @@
-#!/usr/bin/python3
-## -*- coding: utf-8 -*-
-## Copyright (C) 2001, 2004, 2008, 2012 Red Hat, Inc.
-## Copyright (C) 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-"""
-A msghack replacement
-"""
-
-import sys
-
-class GTMessage:
- """
- A class containing a message, its msgid and various references pointing at it
- """
-
- def __init__(self,id=None,message=None,refs=[]):
- """
- The constructor for the GTMessage class
- @self The object instance
- @message The message
- @id The messageid associated with the object
- """
- self._message=message.strip()
- self._id=id.strip()
- self._refs=[]
- for ref in refs:
- self._refs.append(ref)
-
- def __str__(self):
- """
- Return a string representation of the object
- @self The object instance
- """
- res=""
- for ref in self._refs:
- res=res+ref+"\n"
- res=res+"msgid %s\nmsgstr %s\n" % (self._id,self._message)
- return res
-
- def invertedStrings(self):
- """
- Returns a string representation, but with msgid and msgstr inverted.
- Note: Don't invert the "" string
- @self The object instance
- """
- res=""
- for ref in self._refs:
- res=res+ref+"\n"
- if not self._id=="\"\"":
- res=res+"msgid %s\nmsgstr %s\n" % (self._message,self._id)
- else:
- res=res+"msgid %s\nmsgstr %s\n" % (self._id,self._message)
- return res
-
- def emptyMsgStrings(self):
- """
- Return a string representation of the object, but leave the msgstr
- empty - create a pot file from a po file
- Note: Won't remove the "" string
- @self The object instance
- """
- res=""
- for ref in self._refs:
- res=res+ref+"\n"
- if not self._id=="\"\"":
- res=res+"msgid %s\nmsgstr \"\"\n" % (self._id)
- else:
- res=res+"msgid %s\nmsgstr %s\n" % (self._id,self._message)
- return res
-
- def compareMessage(self,msg):
- """
- Return if the messages have identical msgids, 0 otherwise
- @self The object instance
- @msg The message to compare to
- """
-
- if self._id == msg._id:
- return 1
- return 0
-
-
-class GTMasterMessage:
- """
- A class containing a message, its msgid and various references pointing at it
- The difference between GTMessage and GTMasterMessage is that this class
- can do less operations, but is able to store multiple msgstrs with identifiers
- (usually language, like 'msgst(no)'
- """
-
- def __init__(self,id=None,refs=[]):
- """
- The constructor for the GTMessage class
- @self The object instance
- @id The messageid associated with the object
- """
- self._id=id
- self._refs=[]
- self._messages=[]
- for ref in refs:
- self._refs.append(ref)
-
- def addMessage(self,message,identifier):
- """
- Add a new message and identifier to the GTMasterMessage object
- @self The object instance
- @message The message to append
- @identifier The identifier of the message
- """
- self._messages.append((identifier,message))
-
- def __str__(self):
- """
- Return a string representation of the object
- @self The object instance
- """
- res=""
- for ref in self._refs:
- res=res+ref+"\n"
- res=res+"msgid %s\n" % self._id
- for message in self._messages:
- res=res+"msgstr(%s) %s\n" %(message[0],message[1])
- res=res+"\n"
- return res
-
-class GTFile:
- """
- A class containing the GTMessages contained in a file
- """
-
- def __init__(self,filename):
- """
- The constructor of the GTMFile class
- @self The object instance
- @filename The file to initialize from
- """
- self._filename=filename
- self._messages=[]
- self.readFile(filename)
-
- def __str__(self):
- """
- Return a string representation of the object
- @self The object instance
- """
- res=""
- for message in self._messages:
- res=res+str(message)+"\n"
- return res
-
- def invertedStrings(self):
- """
- Return a string representation of the object, with msgid and msgstr
- swapped. Will remove duplicates...
- @self The object instance
- """
-
- msght={}
- msgar=[]
-
- for message in self._messages:
- if message._id=='""' and len(msgar)==0:
- msgar.append(GTMessage(message._id,message._message,message._refs))
- continue
- msg=GTMessage(message._message,message._id,message._refs)
- if msg._id not in msght:
- msght[msg._id]=msg
- msgar.append(msg)
- else:
- msg2=msght[msg._id]
- for ref in msg._refs:
- msg2._refs.append(ref)
- res=""
- for message in msgar:
- res=res+str(message)+"\n"
- return res
-
- def msgidDupes(self):
- """
- Search for duplicates in the msgids.
- @self The object instance
- """
- msgids={}
- res=""
- for message in self._messages:
- msgid=message._id
- if msgid in msgids:
- res=res+"Duplicate: %s\n" % (msgid)
- else:
- msgids[msgid]=1
- return res
-
- def getMsgstr(self,msgid):
- """
- Return the msgstr matching the given id. 'None' if missing
- @self The object instance
- @msgid The msgid key
- """
-
- for message in self._messages:
- if msgid == message._id:
- return message._message
- return None
-
- def emptyMsgStrings(self):
- """
- Return a string representation of the object, but leave the msgstr
- empty - create a pot file from a po file
- @self The object instance
- """
-
- res=""
- for message in self._messages:
- res=res+message.emptyMsgStrings()+"\n"
- return res
-
-
- def append(self,B):
- """
- Append entries from dictionary B which aren't
- already present in this dictionary
- @self The object instance
- @B the dictionary to append messages from
- """
-
- for message in B._messages:
- if not self.getMsgstr(message._id):
- self._messages.append(message)
-
-
- def readFile(self,filename):
- """
- Read the contents of a file into the GTFile object
- @self The object instance
- @filename The name of the file to read
- """
-
- file=open(filename,"r")
- msgid=""
- msgstr=""
- refs=[]
- lines=[]
- inmsgid=0
- inmsgstr=0
- templines=file.readlines()
- for line in templines:
- lines.append(line.strip())
- for line in lines:
- pos=line.find('"')
- pos2=line.rfind('"')
- if line and line[0]=="#":
- refs.append(line.strip())
- if inmsgstr==0 and line[:6]=="msgstr":
- msgstr=""
- inmsgstr=1
- inmsgid=0
- if inmsgstr==1:
- if pos==-1:
- inmsgstr=0
- #Handle entries with and without "" consistently
- if msgid[:2]=='""' and len(msgid)>4:
- msgid=msgid[2:]
- if msgstr[:2]=='""' and len(msgstr)>4:
- msgstr=msgstr[2:]
- message=GTMessage(msgid,msgstr,refs)
- self._messages.append(message)
- msgstr=""
- msgid=""
- refs=[]
- else:
- msgstr=msgstr+line[pos:pos2+1]+"\n"
- if inmsgid==0 and line[:5]=="msgid":
- msgid=""
- inmsgid=1
- if inmsgid==1:
- if pos==-1:
- inmsgid=0
- else:
- msgid=msgid+line[pos:pos2+1]+"\n"
- if msgstr and msgid:
- message=GTMessage(msgid,msgstr,refs)
- self._messages.append(message)
-
-
-class GTMaster:
- """
- A class containing a master catalogue of gettext dictionaries
- """
-
- def __init__(self,dicts):
- """
- The constructor for the GTMaster class
- @self The object instance
- @dicts An array of dictionaries to merge
- """
- self._messages=[]
- self.createMaster(dicts)
-
- def createMaster(self,dicts):
- """
- Create the master catalogue
- @self The object instance
- @dicts An array of dictionaries to merge
- """
-
- self._master=dicts[0]
- self._dicts=dicts[1:]
-
- for message in self._master._messages:
- gtm=GTMasterMessage(message._id,message._refs)
- gtm.addMessage(message._message,self._master._filename[:-3])
- for dict in self._dicts:
- res=dict.getMsgstr(message._id)
- if(res):
- gtm.addMessage(res,dict._filename[:-3])
- self._messages.append(gtm)
-
- def __str__(self):
- """
- Return a string representation of the object
- @self The object instance
- """
- res=""
- for message in self._messages:
- res=res+str(message)+"\n"
- return res
-
-def printUsage():
- "Print the usage messages"
- print("Usage: " + str(sys.argv[0]) + " [OPTION] file.po [ref.po]\n\
-This program can be used to alter .po files in ways no sane mind would think about.\n\
- -o result will be written to FILE\n\
- --invert invert a po file by switching msgid and msgstr\n\
- --master join any number of files in a master-formatted catalog\n\
- --empty empty the contents of the .po file, creating a .pot\n\
- --append append entries from ref.po that don't exist in file.po\n\
-\n\
-Note: It is just a replacement of msghack for backward support.\n")
-
-
-if __name__=="__main__":
- output=None
- res=None
- if("-o") in sys.argv:
- if (len(sys.argv)<=sys.argv.index("-o")+1):
- print("file.po and ref.po are not specified!\n")
- printUsage()
- exit(1)
- output=sys.argv[sys.argv.index("-o")+1]
- sys.argv.remove("-o")
- sys.argv.remove(output)
- if("--invert") in sys.argv:
- if (len(sys.argv)<=sys.argv.index("--invert")+1):
- print("file.po is not specified!\n")
- printUsage()
- exit(1)
- file=sys.argv[sys.argv.index("--invert")+1]
- gtf=GTFile(file)
- res1=gtf.msgidDupes()
- if res1:
- sys.stderr.write(res1)
- sys.exit(1)
- res=str(gtf.invertedStrings())
- elif("--empty") in sys.argv:
- if (len(sys.argv)<=sys.argv.index("--empty")+1):
- print("file.po is not specified!\n")
- printUsage()
- exit(1)
- file=sys.argv[sys.argv.index("--empty")+1]
- gtf=GTFile(file)
- res=str(gtf.emptyMsgStrings())
- elif("--master") in sys.argv:
- if (len(sys.argv)<=sys.argv.index("--master")+1):
- print("file.po is not specified!\n")
- printUsage()
- exit(1)
- loc=sys.argv.index("--master")+1
- gtfs=[]
- for file in sys.argv[loc:]:
- gtfs.append(GTFile(file))
- master=GTMaster(gtfs)
- res=str(master)
- elif("--append") in sys.argv:
- if (len(sys.argv)<=sys.argv.index("--append")+2):
- print("file.po and/or ref.po are not specified!\n")
- printUsage()
- exit(1)
- file=sys.argv[sys.argv.index("--append")+1]
- file2=sys.argv[sys.argv.index("--append")+2]
- gtf=GTFile(file)
- gtf2=GTFile(file2)
- gtf.append(gtf2)
- res=str(gtf)
- else:
- #print("Not implemented: "+str(sys.argv))
- printUsage()
- sys.exit(1)
- if not output:
- print(res)
- else:
- file=open(output,"w")
- file.write(res)
- sys.exit(0)
diff --git a/sources b/sources
deleted file mode 100644
index 5cf8953..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 54627ef..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# Tests run on Atomic, Classic and Container
-- hosts: localhost
- roles:
- - role: standard-test-beakerlib
- tags:
- - atomic
- - classic
- - container
- repositories:
- - repo: "https://src.fedoraproject.org/tests/gettext.git"
- dest: "gettext"
- tests:
- - gettext/gettext-tests
- required_packages:
- - gettext
4 years, 9 months
Architecture specific change in rpms/fwupdate.git
by githook-noreply@fedoraproject.org
The package rpms/fwupdate.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/fwupdate.git/commit/?id=059b38331....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit 059b38331a5e8d6d0b4ab1045bbc317bed48f82c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:45:15 2019 +0000
fwupdate fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674914
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e327dcf..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/fwupdate-*.tar.*
-/clog
-/*.rpm
-/.build*.log
-/*/
diff --git a/0001-Update-arch-names-for-gnu-efi-3.0.8-3.fc29.patch b/0001-Update-arch-names-for-gnu-efi-3.0.8-3.fc29.patch
deleted file mode 100644
index 0ad2c34..0000000
--- a/0001-Update-arch-names-for-gnu-efi-3.0.8-3.fc29.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From aeee5fbf54423a516780f06106f78ee28760bda8 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones(a)redhat.com>
-Date: Wed, 2 May 2018 10:33:10 -0400
-Subject: [PATCH] Update arch names for gnu-efi-3.0.8-3.fc29
-
-Signed-off-by: Peter Jones <pjones(a)redhat.com>
----
- Make.defaults | 16 +++++++++++++---
- efi/.syntastic_c_config | 4 ++--
- efi/Makefile | 8 ++++----
- efi/{elf_aarch64_efi.lds => elf_aa64_efi.lds} | 0
- efi/{elf_x86_64_efi.lds => elf_x64_efi.lds} | 2 +-
- 5 files changed, 20 insertions(+), 10 deletions(-)
- rename efi/{elf_aarch64_efi.lds => elf_aa64_efi.lds} (100%)
- rename efi/{elf_x86_64_efi.lds => elf_x64_efi.lds} (93%)
-
-diff --git a/Make.defaults b/Make.defaults
-index 18b37955def..be0e1f2d890 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -20,8 +20,18 @@ ABIDW := abidw
- prefix ?= /usr/
- prefix := $(abspath $(prefix))
- exec_prefix ?= $(prefix)
--ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
--ifeq ($(ARCH),x86_64)
-+ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed \
-+ -e s,i[3456789]86,ia32, \
-+ -e s,amd64,x64, -e s,x86_64,x64, \
-+ -e s,aarch64,aa64, \
-+ -e 's,armv7.*,arm,' \
-+ )
-+BFD_ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed \
-+ -e s,i[3456789]86,ia32, \
-+ -e s,amd64,x86_64, \
-+ -e 's,armv7.*,arm,' \
-+ )
-+ifeq ($(ARCH),x64)
- LIBDIR ?= $(exec_prefix)/lib64
- ifeq "$(wildcard $(LIBDIR) )" ""
- LIBDIR = $(exec_prefix)/lib/x86_64-linux-gnu
-@@ -30,7 +40,7 @@ endif
- ifeq ($(ARCH),ia32)
- LIBDIR ?= $(exec_prefix)/lib
- endif
--ifeq ($(ARCH),aarch64)
-+ifeq ($(ARCH),aa64)
- LIBDIR ?= $(exec_prefix)/lib64
- endif
- ifeq ($(ARCH),arm)
-diff --git a/efi/.syntastic_c_config b/efi/.syntastic_c_config
-index c212237ee10..25172a51780 100644
---- a/efi/.syntastic_c_config
-+++ b/efi/.syntastic_c_config
-@@ -16,9 +16,9 @@
- -fno-stack-protector
- -fno-stack-check
- --std=gnu11
---DCONFIG_x86_64
-+-DCONFIG_x64
- -I/usr/include/efi/
---I/usr/include/efi/x86_64/
-+-I/usr/include/efi/x64/
- -iquote/home/pjones/devel/github.com/fwupdate/ux-capsule/include
- -mno-mmx
- -mno-sse
-diff --git a/efi/Makefile b/efi/Makefile
-index 635c4571e6a..f92b1aa2b6e 100644
---- a/efi/Makefile
-+++ b/efi/Makefile
-@@ -35,22 +35,22 @@ OBJCOPY_GTE224 := $(shell expr `$(objcopy_version)` \>= 2.24)
-
- FWUP = fwupdate
-
--ifeq ($(ARCH),x86_64)
-- FORMAT = --target efi-app-$(ARCH)
-+ifeq ($(ARCH),x64)
-+ FORMAT = --target efi-app-$(BFD_ARCH)
- BUILDFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc \
- $(CLANG_BUGS) -DEFI_FUNCTION_WRAPPER \
- -DGNU_EFI_USE_MS_ABI -I$(shell $(CC) -print-file-name=include)
- FWUP = fwupx64
- endif
- ifeq ($(ARCH),ia32)
-- FORMAT = --target efi-app-$(ARCH)
-+ FORMAT = --target efi-app-$(BFD_ARCH)
- BUILDFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc \
- $(CLANG_BUGS) -m32 \
- -I$(shell $(CC) -print-file-name=include)
- FWUP = fwupia32
- endif
-
--ifeq ($(ARCH),aarch64)
-+ifeq ($(ARCH),aa64)
- FORMAT = -O binary
- CCLDFLAGS += -Wl,--defsym=EFI_SUBSYSTEM=0xa
- BUILDFLAGS += -ffreestanding -I$(shell $(CC) -print-file-name=include)
-diff --git a/efi/elf_aarch64_efi.lds b/efi/elf_aa64_efi.lds
-similarity index 100%
-rename from efi/elf_aarch64_efi.lds
-rename to efi/elf_aa64_efi.lds
-diff --git a/efi/elf_x86_64_efi.lds b/efi/elf_x64_efi.lds
-similarity index 93%
-rename from efi/elf_x86_64_efi.lds
-rename to efi/elf_x64_efi.lds
-index 73a79e7d8b0..9b254b0085f 100644
---- a/efi/elf_x86_64_efi.lds
-+++ b/efi/elf_x64_efi.lds
-@@ -1,4 +1,4 @@
--/* Same as elf_x86_64_fbsd_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */
-+/* Same as elf_x64_fbsd_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */
- OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
- OUTPUT_ARCH(i386:x86-64)
- ENTRY(_start)
---
-2.14.3
-
diff --git a/README.md b/README.md
deleted file mode 100644
index 8bb4830..0000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Please direct issues and pull requests to [upstream](https://github.com/rhboot/fwupdate).
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..53fb124
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+fwupdate fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674914
diff --git a/find-debuginfo-efi.sh b/find-debuginfo-efi.sh
deleted file mode 100755
index b6198f5..0000000
--- a/find-debuginfo-efi.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# find-debuginfo-efi.sh
-# Copyright 2017 Peter Jones <pjones(a)redhat.com>
-#
-# Distributed under terms of the GPLv3 license.
-#
-
-# trillian:~/build/BUILDROOT/fwupdate-8-5.fc27.x86_64$ ls -l usr/lib/debug/.build-id/fe/2390c7807b312e5fd9789af339b09a8317da96 usr/lib/debug/.build-id/fe/2390c7807b312e5fd9789af339b09a8317da96.debug usr/lib/debug/boot/efi/EFI/fedora/fwupx64.efi.debug
-# lrwxrwxrwx. 1 pjones pjones 46 Jul 26 16:57 usr/lib/debug/.build-id/fe/2390c7807b312e5fd9789af339b09a8317da96 -> ../../../../../boot/efi/EFI/fedora/fwupx64.efi
-# lrwxrwxrwx. 1 pjones pjones 43 Jul 26 16:57 usr/lib/debug/.build-id/fe/2390c7807b312e5fd9789af339b09a8317da96.debug -> ../../boot/efi/EFI/fedora/fwupx64.efi.debug
-# -rwxr-xr-x. 1 pjones pjones 2.2M Jul 26 16:57 usr/lib/debug/boot/efi/EFI/fedora/fwupx64.efi.debug
-
-set -u
-set -e
-
-for x in ${RPM_BUILD_ROOT}/usr/lib/debug/.build-id/*/* \
- $(find "${RPM_BUILD_ROOT}/usr/lib/debug" -iname '*.efi.debug')
-do
- link=$(readlink "${x}") || :
- dn=$(dirname "${x}")
- if [[ ${link} =~ .*/fwup[[:alnum:]]+\.efi(\.debug)*$ ]] || \
- [[ ${x} =~ .*/fwup[[:alnum:]]+\.efi(\.debug)*$ ]] ; then
- echo "%dir ${dn}" | sed "s,${RPM_BUILD_ROOT},,g"
- echo "${x}" | sed "s,${RPM_BUILD_ROOT},,g"
- fi
-done | sort | uniq >> debugfiles-efi.list
-
-# vim:fenc=utf-8:tw=75
diff --git a/fwupdate.spec b/fwupdate.spec
deleted file mode 100644
index 99ef945..0000000
--- a/fwupdate.spec
+++ /dev/null
@@ -1,344 +0,0 @@
-%global efivar_version 35-3
-%global efibootmgr_version 16-3
-%global gnu_efi_version 3.0.8-4
-%global efi_macros_version 3-2
-%undefine _debuginfo_subpackages
-
-Name: fwupdate
-Version: 11
-Release: 6%{?dist}
-Summary: Tools to manage UEFI firmware updates
-License: GPLv2+
-URL: https://github.com/rhboot/fwupdate
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: efi-filesystem
-BuildRequires: gcc
-BuildRequires: efi-srpm-macros >= %{efi_macros_version}
-BuildRequires: efi-filesystem
-BuildRequires: efivar-devel >= %{efivar_version}
-BuildRequires: gnu-efi >= %{gnu_efi_version}
-BuildRequires: gnu-efi-devel >= %{gnu_efi_version}
-BuildRequires: pesign
-BuildRequires: elfutils popt-devel git gettext pkgconfig
-BuildRequires: systemd
-BuildRequires: libabigail
-%ifarch x86_64
-BuildRequires: libsmbios-devel
-%endif
-ExclusiveArch: %{efi}
-ExcludeArch: %{arm}
-Source0: https://github.com/rhboot/fwupdate/releases/download/%{name}-%{version}/%...
-Source1: find-debuginfo-efi.sh
-Patch0001: 0001-Update-arch-names-for-gnu-efi-3.0.8-3.fc29.patch
-
-%global __os_install_post %{expand:\
- %{?__debug_package:%{__debug_install_post}} \
- %{SOURCE1} \
- %{__arch_install_post} \
- %{__os_install_post} \
- %{nil}}%{nil}
-
-%description
-fwupdate provides a simple command line interface to the UEFI firmware updates.
-
-%package libs
-Summary: Library to manage UEFI firmware updates
-%ifnarch %{ix86}
-Requires: shim
-%endif
-Requires: %{name}-efi = %{version}-%{release}
-
-%description libs
-Library to allow for the simple manipulation of UEFI firmware updates.
-
-%package devel
-Summary: Development headers for libfwup
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: efivar-devel >= %{efivar_version}
-
-%description devel
-development headers required to use libfwup.
-
-%package efi
-Summary: UEFI binaries used by libfwup
-Requires: %{name}-libs = %{version}-%{release}
-
-%description efi
-UEFI binaries used by libfwup.
-
-%package efi-debuginfo
-Summary: debuginfo for UEFI binaries used by libfwup
-Requires: %{name}-efi = %{version}-%{release}
-AutoReq: 0
-AutoProv: 1
-
-%description efi-debuginfo
-debuginfo for UEFI binaries used by libfwup.
-
-%prep
-%autosetup -S git
-mkdir build-%{efi_arch}
-%if %{efi_has_alt_arch}
- mkdir build-%{efi_alt_arch}
-%endif
-git config --local --add fwupdate.efidir %{efi_vendor}
-
-%build
-cd build-%{efi_arch}
-%make_build -f ../Makefile \
- TOPDIR=.. OPT_FLAGS="$RPM_OPT_FLAGS" \
- libdir=%{_libdir} bindir=%{_bindir} \
- EFIDIR=%{efi_vendor}
-mv -v efi/fwup%{efi_arch}.efi efi/fwup%{efi_arch}.unsigned.efi
-%pesign -s -i efi/fwup%{efi_arch}.unsigned.efi -o efi/fwup%{efi_arch}.efi
-cd ..
-
-%if %{efi_has_alt_arch}
- cd build-%{efi_alt_arch}
- setarch linux32 -B %make_build -f ../Makefile \
- TOPDIR=.. ARCH=%{efi_alt_arch} \
- OPT_FLAGS="$RPM_OPT_FLAGS" \
- libdir=%{_libdir} bindir=%{_bindir} \
- EFIDIR=%{efi_vendor}
- mv -v efi/fwup%{efi_alt_arch}.efi efi/fwup%{efi_alt_arch}.unsigned.efi
- %pesign -s -i efi/fwup%{efi_alt_arch}.unsigned.efi -o efi/fwup%{efi_alt_arch}.efi
- cd ..
-%endif
-
-%install
-rm -rf $RPM_BUILD_ROOT
-cd build-%{efi_arch}
-%make_install -f ../Makefile \
- TOPDIR=.. RPMARCH=%{_arch} RELEASE=%{RELEASE} \
- libdir=%{_libdir} bindir=%{_bindir} mandir=%{_mandir} \
- localedir=%{_datadir}/locale/ includedir=%{_includedir} \
- libexecdir=%{_libexecdir} datadir=%{_datadir} \
- sharedstatedir=%{_sharedstatedir}
-cd ..
-
-%if %{efi_has_alt_arch}
- cd build-%{efi_alt_arch}
- setarch linux32 -B %make_install -f ../Makefile \
- ARCH=%{efi_alt_arch} TOPDIR=.. \
- EFIDIR=%{efi_vendor} RPMARCH=%{_arch} \
- RELEASE=%{RELEASE} libdir=%{_libdir} \
- bindir=%{_bindir} mandir=%{_mandir} \
- localedir=%{_datadir}/locale/ \
- includedir=%{_includedir} \
- libexecdir=%{_libexecdir} \
- datadir=%{_datadir} \
- sharedstatedir=%{_sharedstatedir}
- cd ..
-%endif
-
-%post libs
-/sbin/ldconfig
-%systemd_post fwupdate-cleanup.service
-
-%preun libs
-%systemd_preun fwupdate-cleanup.service
-
-%postun libs
-/sbin/ldconfig
-%systemd_postun_with_restart pesign.service
-
-%check
-%ifarch x86_64
-make abicheck
-%endif
-
-%files
-%{!?_licensedir:%global license %%doc}
-%license COPYING
-# %%doc README
-%{_bindir}/fwupdate
-%{_datadir}/locale/en/fwupdate.po
-%doc %{_mandir}/man1/*
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/fwupdate
-
-%files devel
-%doc %{_mandir}/man3/*
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-
-%files libs
-%{_libdir}/*.so.*
-%{_datadir}/locale/en/libfwup.po
-%{_unitdir}/fwupdate-cleanup.service
-%attr(0755,root,root) %dir %{_sharedstatedir}/fwupdate/
-%config(noreplace) %ghost %{_sharedstatedir}/fwupdate/done
-%attr(0755,root,root) %dir %{_libexecdir}/fwupdate/
-%{_libexecdir}/fwupdate/cleanup
-
-%files efi
-%dir %attr(0700,root,root) %{efi_esp_dir}/fw/
-%attr (0700,root,root) %{efi_esp_dir}/fwup%{efi_arch}.efi
-%if %{efi_has_alt_arch}
-%attr (0700,root,root) %{efi_esp_dir}/fwup%{efi_alt_arch}.efi
-%endif
-
-%files efi-debuginfo -f debugfiles-efi.list
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 11-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 11-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Aug 08 2018 Peter Jones <pjones(a)redhat.com> - 11-4
-- Fix the completely broken -3 build that shouldn't have been allowed at
- all.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue May 01 2018 Peter Jones <pjones(a)redhat.com> - 11-2
-- Use efi-rpm-macros instead of defining all the efi macros ourselves
-
-* Mon Apr 09 2018 Peter Jones <pjones(a)redhat.com> - 11-1
-- Update to fwupdate 11
-
-* Thu Mar 01 2018 Peter Jones <pjones(a)redhat.com> - 10-6
-- Fix fwup.pc
-
-* Tue Feb 27 2018 Peter Jones <pjones(a)redhat.com> - 10-5
-- Rebuild because I forgot to make sure efivar-34 was already in the
- buildroot.
-
-* Tue Feb 27 2018 Peter Jones <pjones(a)redhat.com> - 10-4
-- Roll in some bugfixes that'll be in fwupdate-11 upstream.
- This helps fix a couple of vendors machines.
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 18 2018 Peter Jones <pjones(a)redhat.com> - 10-2
-- Make really sure everything in /boot/efi is 0700 so we don't conflict with
- the grub packages.
-
-* Mon Jan 08 2018 Peter Jones <pjones(a)redhat.com> - 10-1
-- Update to the final released version 10.
-- Make everything under /boot/efi be mode 0700, since that's what FAT will
- show anyway.
-
-* Tue Sep 12 2017 Peter Jones <pjones(a)redhat.com> - 10-0.2
-- Update for version 10
-- test release for ux capsule support; to enable UX capsules define
- LIBFWUP_ADD_UX_CAPSULE=1 in your environment.
-
-* Thu Aug 24 2017 Peter Jones <pjones(a)redhat.com> - 9-0.2
-- Rebuild for aarch64 .reloc fix.
-
-* Tue Aug 22 2017 Peter Jones <pjones(a)redhat.com> - 9-0.1
-- Update to fwupdate 9
-- Support ia32
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 8-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Peter Jones <pjones(a)redhat.com> - 8-6
-- Try to make debuginfo generation work with rpm-4.13.0.1-38.fc27.x86_64
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 8-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Jul 08 2017 Peter Jones <pjones(a)redhat.com> - 8-4
-- Rebuild for efivar-31-1.fc26
- Related: rhbz#1468841
-- Fix some gcc 7 quirks
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Sep 27 2016 Peter Jones <pjones(a)redhat.com> - 8-2
-- Rebuild for efivar 30.
-
-* Fri Aug 19 2016 Peter Jones <pjones(a)redhat.com> - 8-1
-- Update to fwupdate 8
-- Fix some i686 build errors
-- Be less stupid about SONAMEs so in the future we'll only have to rebuild
- dependent things on actual ABI changes.
-- Only depend on libsmbios on x86, for now, because it hasn't been ported to
- Aarch64.
-
-* Wed Aug 17 2016 Peter Jones <pjones(a)redhat.com> - 7-1
-- Update to fwupdate 7
-- Fix the fix for ae7b85
-- fix one place where a second "rc" varibale is clobbering a result.
-
-* Tue Aug 16 2016 Peter Jones <pjones(a)redhat.com> - 6-1
-- Update to fwupdate 6
-- lots of build fixes for newer compilers and such
-- Use libsmbios on some systems to enable firmware updates (Mario Limonciello)
-- Use the correct reset type from the QueryCapsuleInfo data
-- Lots of fixes from auditing
-- Use efivar's error reporting infrastructure
-
-* Fri Aug 12 2016 Adam Williamson <awilliam(a)redhat.com> - 0.5-5
-- backport a couple of commits to fix build against efivar 26
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Nov 18 2015 Peter Jones <pjones(a)redhat.com> - 0.5-3
-- Temporarily don't require shim on i?86 - we've never built it there, and
- libfwup knows how to handle it not being there just fine.
-
-* Wed Nov 18 2015 Peter Jones <pjones(a)redhat.com> - 0.5-2
-- Fix missing -libs Requires: due to editing error
-
-* Wed Nov 18 2015 Peter Jones <pjones(a)redhat.com> - 0.5-1
-- Rebase to 0.5
-- Highlights in 0.5:
- - fwupdate.efi is called fwup$EFI_ARCH.efi now so weird platforms can have
- them coexist. "Platform" here might mean "distro tools that care about
- multilib". Anyway, it's needed to support things like baytrail.
- - Worked around shim command line bug where we need to treat LOAD_OPTIONS
- differently if we're invoked from the shell vs BDS
- - various debug features - SHIM_DEBUG and FWUPDATE_VERBOSE UEFI variables
- that'll let you get some debugging info some times
- - oh yeah, the actual debuginfo is useful
- - Automatically cleans up old instances on fresh OS installs
- - valgrind --leak-check=full on fwupdate doesn't show any errors at all
- - covscan shows only two things; one *really* doesn't matter, the other is
- because it doesn't understand our firmware variable data structure and
- can't work out that we have guaranteed the length of some data in a code
- path it isn't considering.
- - fwup_set_up_update() API improvements
- - killed fwup_sterror() and friends entirely
- - Should work on x64, ia32, and aarch64.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Jun 02 2015 Peter Jones <pjones(a)redhat.com> - 0.4-1
-- Update to 0.4
-- Set DESTDIR so it's more consistently respected
-- Always use upper case for Boot#### names.
-- Create abbreviated device paths for our BootNext entry.
-- Make subdir Makefiles get the version right.
-- Fix ucs2len() to handle max=-1 correctly.
-- Compare the right blobs when we're searching old boot entries.
-- Fix .efi generation on non-x86 platforms.
-- Use a relative path for fwupdate.efi when launched from shim.
-- Show fewer debugging messages.
-- Set BootNext when we find an old Boot#### variable as well.
-- Add fwup_get_fw_type().
-
-* Mon Jun 01 2015 Peter Jones <pjones(a)redhat.com> - 0.3-4
-- Make abbreviated device paths work in the BootNext entry.
-- Fix a ucs2 parsing bug.
-
-* Mon Jun 01 2015 Peter Jones <pjones(a)redhat.com> - 0.3-3
-- Always use abbreviated device paths for Boot#### entries.
-
-* Mon Jun 01 2015 Peter Jones <pjones(a)redhat.com> - 0.3-2
-- Fix boot entry naming.
-
-* Thu May 28 2015 Peter Jones <pjones(a)redhat.com> - 0.3-1
-- Here we go again.
-
-# vim:expandtab
diff --git a/sources b/sources
deleted file mode 100644
index c828ad0..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (fwupdate-11.tar.bz2) = ecf1225730f9769dcb631dd94113d2346e82df4806e23aef77441f946855f9eda7083cd51ab0af24a36f90a27661191c1802caa1c4bbbab863c0b194837d7d97
4 years, 9 months
Architecture specific change in rpms/eucalyptus.git
by githook-noreply@fedoraproject.org
The package rpms/eucalyptus.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eucalyptus.git/commit/?id=91fe863....
Change:
-%ifnarch %{arm}
Thanks.
Full change:
============
commit 91fe863b480a8cff9ac088c247af0261cf33a51f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:43:13 2019 +0000
eucalyptus fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674866
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8c5898f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/eucalyptus-3.1.2gitb8c109b4-generated.tgz
-/eucalyptus-3.1.2gitb8c109b4.tar.gz
-/eucalyptus-3.2.0git5ab72572.tar.gz
-/eucalyptus-3.2.0git5ab72572-generated.tar.gz
-/eucalyptus-3.2.0git5ab72572-generated.tgz
-/eucalyptus-3.2.1-generated.tgz
-/eucalyptus-3.2.1.tar.gz
-/eucalyptus-3.3.0.32052445.tgz
-/eucalyptus-3.3.0.32052445-generated.tgz
diff --git a/axis2.xml b/axis2.xml
deleted file mode 100644
index 4776efc..0000000
--- a/axis2.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<axisconfig name="Axis2/C">
- <!-- ================================================= -->
- <!-- Parameters -->
- <!-- ================================================= -->
- <!-- Uncomment following to enable MTOM support globally -->
- <!--parameter name="enableMTOM" locked="false">true</parameter-->
-
- <!-- Set the suitable size for optimum memory usage when sending large attachments -->
- <!--parameter name="MTOMBufferSize" locked="false">10</parameter-->
- <!--parameter name="MTOMMaxBuffers" locked="false">1000</parameter-->
- <!--parameter name="EnableMTOMServiceCallback" locked="false">true</parameter-->
- <!--parameter name="attachmentDIR" locked="false">/path/to/the/attachment/caching/dir/</parameter-->
- <!--parameter name="MTOMCachingCallback" locked="false">/path/to/the/caching_callback</parameter-->
- <!--parameter name="MTOMSendingCallback" locked="false">/path/to/the/sending_callback</parameter-->
-
- <!-- Enable REST -->
- <parameter name="enableREST" locked="false">true</parameter>
-
- <!-- Uncomment following to persist op_ctx, useful with RM -->
- <!--parameter name="persistOperationContext" locked="false">true</parameter-->
-
- <!--if you want to extract the service archive file and work with that please uncomment this-->
- <!--else , it wont extract archive file or does not take into consideration if someone drop-->
- <!--exploded directory into /service directory-->
- <!--<parameter name="extractServiceArchive" locked="false">true</parameter>-->
-
-
- <!-- ================================================= -->
- <!-- Message Receivers -->
- <!-- ================================================= -->
- <!-- This is the Deafult Message Receiver for the Request Response style Operations -->
- <!--messageReceiver mep="INOUT" class="axis2_receivers"/-->
-
-
- <!-- ================================================= -->
- <!-- Transport Ins -->
- <!-- ================================================= -->
-
- <transportReceiver name="http" class="axis2_http_receiver">
- <parameter name="port" locked="false">6060</parameter>
- <parameter name="exposeHeaders" locked="true">false</parameter>
- </transportReceiver>
-
- <!--transportReceiver name="https" class="axis2_http_receiver">
- <parameter name="port" locked="false">6060</parameter>
- <parameter name="exposeHeaders" locked="true">false</parameter>
- </transportReceiver-->
-
- <!--transportReceiver name="tcp" class="axis2_tcp_receiver">
- <parameter name="port" locked="false">6060</parameter>
- </transportReceiver-->
-
-
- <!-- ================================================= -->
- <!-- Transport Outs -->
- <!-- ================================================= -->
-
- <transportSender name="http" class="axis2_http_sender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- <parameter name="xml-declaration" insert="false"/>
- <!--parameter name="Transfer-Encoding">chunked</parameter-->
- <!--parameter name="HTTP-Authentication" username="" password="" locked="true"/-->
- <!--parameter name="PROXY" proxy_host="127.0.0.1" proxy_port="8080" proxy_username="" proxy_password="" locked="true"/-->
- </transportSender>
-
- <!-- Uncomment the following with appropriate parameters to enable the SSL transport sender.
- Also make sure that the appropriate transport receiver is enabled above.-->
- <!--transportSender name="https" class="axis2_http_sender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- <parameter name="xml-declaration" insert="false"/>
- </transportSender>
- <parameter name="SERVER_CERT">/path/to/ca/certificate</parameter>
- <parameter name="KEY_FILE">/path/to/client/certificate/chain/file</parameter>
- <parameter name="SSL_PASSPHRASE">passphrase</parameter>
- -->
-
- <!-- Uncomment this one with the appropriate papameters to enable the TCP transport Sender-->
- <!--transportSender name="tcp" class="axis2_tcp_sender">
- <parameter name="PROTOCOL" locked="false">TCP</parameter>
- <parameter name="xml-declaration" insert="false"/>
- </transportSender-->
-
-
- <!-- ================================================= -->
- <!-- Global Modules -->
- <!-- ================================================= -->
- <!-- Comment this to disable Addressing -->
- <module ref="addressing"/>
-
-
- <!--Configuring module , providing paramters for modules whether they refer or not-->
- <!--<moduleConfig name="addressing">-->
- <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
- <!--</moduleConfig>-->
-
- <!-- ================================================= -->
- <!-- Phases -->
- <!-- ================================================= -->
- <phaseOrder type="inflow">
- <!-- System pre defined phases -->
- <phase name="Transport"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch"/>
- <phase name="PostDispatch"/>
- <phase name="Security"/>
- <!-- End system pre defined phases -->
- <!-- After PostDispatch phase, module or service author can add any phase as required -->
- <!-- User defined phases could be added here -->
- <!--phase name="userphase1"/-->
- </phaseOrder>
- <phaseOrder type="outflow">
- <!-- User defined phases could be added here -->
- <!--phase name="userphase1"/-->
- <!--system predefined phase-->
- <phase name="MessageOut"/>
- <phase name="Security"/>
- </phaseOrder>
- <phaseOrder type="INfaultflow">
- <!-- User defined phases could be added here -->
- <!--phase name="userphase1"/-->
- </phaseOrder>
- <phaseOrder type="Outfaultflow">
- <!-- User defined phases could be added here -->
- <!--phase name="userphase1"/-->
- <phase name="MessageOut"/>
- </phaseOrder>
-</axisconfig>
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..7166e11
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+eucalyptus fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674866
diff --git a/euca-WSDL2C.sh b/euca-WSDL2C.sh
deleted file mode 100644
index 3fffcdf..0000000
--- a/euca-WSDL2C.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-CLASSPATH=$( build-classpath axis2v14/codegen axis2v14/adb axis2v14/adb-codegen axis2v14/kernel neethi wsdl4j commons-logging axiom/axiom-api axiom/axiom-dom axiom/axiom-impl XmlSchema backport-util-concurrent xalan-j2-serializer xalan-j2 ):${CLASSPATH} java org.apache.axis2.wsdl.WSDL2C $*
-
diff --git a/eucalyptus-3.2-guava.patch b/eucalyptus-3.2-guava.patch
deleted file mode 100644
index 90f7ac5..0000000
--- a/eucalyptus-3.2-guava.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ur eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java
---- eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java 2012-12-11 11:16:05.039019755 -0500
-@@ -72,7 +72,7 @@
- import com.eucalyptus.records.Logs;
- import com.eucalyptus.util.EucalyptusCloudException;
- import com.eucalyptus.util.Exceptions;
--import com.google.common.util.concurrent.Futures;
-+import com.google.common.util.concurrent.JdkFutureAdapters;
- import com.google.common.util.concurrent.MoreExecutors;
-
- public class ComponentRegistrationHandler {
-@@ -140,7 +140,7 @@
- try {
- Components.lookup( newComponent ).setup( newComponent );
- Future<ServiceConfiguration> res = Topology.start( newComponent );
-- Futures.makeListenable( res ).addListener( new Runnable( ) {
-+ JdkFutureAdapters.listenInPoolThread( res ).addListener( new Runnable( ) {
-
- @Override
- public void run( ) {
-diff -ur eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslUtils.java eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslUtils.java
---- eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslUtils.java 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslUtils.java 2012-12-11 11:09:34.068731461 -0500
-@@ -53,7 +53,7 @@
- public class SslUtils {
-
- private static final Map<SslCipherSuiteBuilderParams,String[]> SSL_CIPHER_LOOKUP =
-- new MapMaker().maximumSize(32).makeComputingMap( SslCipherSuiteBuilder.INSTANCE );
-+ new MapMaker().makeComputingMap( SslCipherSuiteBuilder.INSTANCE );
-
- public static String[] getEnabledCipherSuites( final String cipherStrings, final String[] supportedCipherSuites ) {
- return SSL_CIPHER_LOOKUP.get( params(cipherStrings, supportedCipherSuites) );
-diff -ur eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java
---- eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572.good/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java 2012-12-11 12:04:50.079883700 -0500
-@@ -68,6 +68,10 @@
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
- import java.lang.annotation.Target;
-+import java.lang.IllegalAccessException;
-+import java.lang.NoSuchMethodException;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
- import java.lang.reflect.UndeclaredThrowableException;
- import java.util.Arrays;
- import java.util.Collection;
-@@ -448,9 +452,22 @@
- try {
- ErrorMessages annote = Ats.from( input ).get( ErrorMessages.class );
- Function<Class, String> errorFunction = ( Function<Class, String> ) Classes.builder( input ).newInstance( );
-- ConcurrentMap<Class, String> errorMap = new MapMaker( ).expireAfterAccess( 60, TimeUnit.SECONDS ).makeComputingMap( errorFunction );
-+ MapMaker mm = new MapMaker( );
-+ Method expireAfterAccess = mm.getClass().getDeclaredMethod("expireAfterAccess");
-+ expireAfterAccess.setAccessible(true);
-+ mm = (MapMaker) expireAfterAccess.invoke(mm, 60, TimeUnit.SECONDS );
-+ ConcurrentMap<Class, String> errorMap = mm.makeComputingMap( errorFunction );
- classErrorMessages.put( annote.value( ), errorMap );
- return true;
-+ } catch ( InvocationTargetException ex ) {
-+ LOG.error( ex, ex );
-+ return false;
-+ } catch ( NoSuchMethodException ex ) {
-+ LOG.error( ex, ex );
-+ return false;
-+ } catch ( IllegalAccessException ex ) {
-+ LOG.error( ex, ex );
-+ return false;
- } catch ( UndeclaredThrowableException ex ) {
- LOG.error( ex, ex );
- return false;
diff --git a/eucalyptus-axis2-services.patch b/eucalyptus-axis2-services.patch
deleted file mode 100644
index ee2f81c..0000000
--- a/eucalyptus-axis2-services.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -ur eucalyptus-3.2.0git5ab72572.orig/cluster/Makefile eucalyptus-3.2.0git5ab72572/cluster/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/cluster/Makefile 2012-12-11 10:08:32.915980248 -0500
-+++ eucalyptus-3.2.0git5ab72572/cluster/Makefile 2012-12-11 10:23:55.804473968 -0500
-@@ -152,25 +152,25 @@
- $(CC) -o $(CLIENTKILLALL) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(CLIENT).c cc-client-marshal-adb.c -DMODE=0 generated/adb_*.o generated/axis2_stub_*.o ../util/log.o ../util/fault.o ../util/wc.o ../util/utf8.o ../util/misc.o ../util/euca_string.o ../storage/diskutil.o ../util/ipc.o ../util/sensor.o $(WSSECLIBS) $(CC_LIBS)
-
- fakedeploy:
-- $(INSTALL) $(SERVICE_SO_FAKE) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(SERVICE_SO)
-+ $(INSTALL) $(SERVICE_SO_FAKE) $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/$(SERVICE_SO)
-
- deploy:
-- $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-- $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-- $(INSTALL) $(CCWSDL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) -d $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) $(CCWSDL) $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/
- #no ws-sec
-- cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
-+ cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) > $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
-
- #ws-sec
-- cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) | ../tools/add_service_policy.pl ../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cloud-cert.pem:g" | sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed "s:SERVER-CERT:cluster-cert.pem:g" | sed "s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
-+ cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) | ../tools/add_service_policy.pl ../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cloud-cert.pem:g" | sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed "s:SERVER-CERT:cluster-cert.pem:g" | sed "s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services_WS.xml
- cat ../tools/client-policy-template.xml | sed "s:EUCALYPTUS_HOME:$(EUCALYPTUS):g" | sed "s:AXIS2C_HOME:$(AXIS2C_HOME):g" | sed "s:CLIENT-CERT:cloud-cert.pem:g" | sed "s:SERVER-CERT:cluster-cert.pem:g" | sed "s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > cc-client-policy.xml
- ## cp ../tools/*.pem $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- # cp cc-client-policy.xml $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- # chmod -R 0600 $(EUCALYPTUS)/var/lib/eucalyptus/keys/*
- # ws
-- $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+ $(INSTALL) $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services.xml
- # no ws
--# cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+# cp $(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(AXIS2_CC_SERVICES)/$(SERVICE_NAME)/services.xml
-
- indent:
- @for idfile in *.[ch]; do \
-@@ -190,4 +190,4 @@
- uninstall:
- # @$(RM) -f $(DESTDIR)$(sbindir)/$(SHUTDOWNCC)
- @$(RM) -f $(DESTDIR)$(eucastatedir)/keys/cc-client-policy.xml
-- @$(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
-+ @$(RM) -rf $(DESTDIR)$(AXIS2_CC_SERVICES)/$(SERVICE_NAME)
-diff -ur eucalyptus-3.2.0git5ab72572.orig/gatherlog/GLclient.c eucalyptus-3.2.0git5ab72572/gatherlog/GLclient.c
---- eucalyptus-3.2.0git5ab72572.orig/gatherlog/GLclient.c 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/gatherlog/GLclient.c 2012-12-11 10:13:54.692409604 -0500
-@@ -201,7 +201,7 @@
- return (EUCA_INVALID_ERROR);
- }
-
-- snprintf(endpoint_uri, 256, " http://%s/axis2/services/EucalyptusGL", argv[APPNAME_ARG]);
-+ snprintf(endpoint_uri, 256, "http://%s/axis2/services/EucalyptusGL", argv[APPNAME_ARG]);
- if ((env = axutil_env_create_all("/tmp/fooh", AXIS2_LOG_LEVEL_TRACE)) == NULL) {
- printf("ERROR: fail to retrieve AXIS2 environment.\n");
- return (EUCA_ERROR);
-diff -ur eucalyptus-3.2.0git5ab72572.orig/gatherlog/Makefile eucalyptus-3.2.0git5ab72572/gatherlog/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/gatherlog/Makefile 2012-12-11 10:08:32.915980248 -0500
-+++ eucalyptus-3.2.0git5ab72572/gatherlog/Makefile 2012-12-11 10:15:25.513200884 -0500
-@@ -107,22 +107,22 @@
- $(CC) -o $(CLIENT) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(CLIENT).c gl-client-marshal-adb.c generated/adb_*.o generated/axis2_stub_*.o ../util/log.o ../util/misc.o ../util/euca_string.o ../storage/diskutil.o ../util/ipc.o ../util/euca_auth.o -DMODE=1 $(LIBS) $(LDFLAGS) -lssl -lcrypto
-
- deploy:
-- $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-- $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-- $(INSTALL) $(GLWSDL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) -d $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) $(GLWSDL) $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/
- #no ws-sec
-- cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(GLWSDLNAME) > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
-+ cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/$(GLWSDLNAME) > $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
-
- #ws-sec
--# cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(GLWSDLNAME) | ../tools/add_service_policy.pl ../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cloud-cert.pem:g" | sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed "s:SERVER-CERT:cluster-cert.pem:g" | sed "s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
-+# cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/$(GLWSDLNAME) | ../tools/add_service_policy.pl ../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cloud-cert.pem:g" | sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed "s:SERVER-CERT:cluster-cert.pem:g" | sed "s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > $(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services_WS.xml
- # cat ../tools/client-policy-template.xml | sed "s:EUCALYPTUS_HOME:$(EUCALYPTUS):g" | sed "s:AXIS2C_HOME:$(AXIS2C_HOME):g" | sed "s:CLIENT-CERT:cloud-cert.pem:g" | sed "s:SERVER-CERT:cluster-cert.pem:g" | sed "s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > cc-client-policy.xml
- # cp ../tools/*.pem $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- # cp cc-client-policy.xml $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- # chmod -R 0600 $(EUCALYPTUS)/var/lib/eucalyptus/keys/*
- # ws
--# cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+# cp $(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services.xml
- # no ws
-- $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+ $(INSTALL) $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)/services.xml
-
- indent:
- @for idfile in *.[ch]; do \
-@@ -136,4 +136,4 @@
- install:
-
- uninstall:
-- @$(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
-+ @$(RM) -rf $(DESTDIR)$(AXIS2_GL_SERVICES)/$(SERVICE_NAME)
-diff -ur eucalyptus-3.2.0git5ab72572.orig/Makedefs.in eucalyptus-3.2.0git5ab72572/Makedefs.in
---- eucalyptus-3.2.0git5ab72572.orig/Makedefs.in 2012-12-11 10:08:32.916980291 -0500
-+++ eucalyptus-3.2.0git5ab72572/Makedefs.in 2012-12-11 10:17:40.512827454 -0500
-@@ -8,9 +8,16 @@
-
- # packages we depend upon
- export APACHE2_MODULE_DIR = @APACHE2_MODULE_DIR@
-+export WSFCPP_HOME = @AXIS2C_HOME@
- export AXIS2C_HOME = @AXIS2C_HOME@
- export AXIS2C_SERVICES = @AXIS2C_SERVICES@
- export AXIS2_HOME = @AXIS2_HOME@
-+export AXIS2_NC_REPO = ${AXIS2C_SERVICES}/nc
-+export AXIS2_NC_SERVICES = ${AXIS2_NC_REPO}/services
-+export AXIS2_CC_REPO = ${AXIS2C_SERVICES}/cc
-+export AXIS2_CC_SERVICES = ${AXIS2_CC_REPO}/services
-+export AXIS2_GL_REPO = ${AXIS2C_SERVICES}/gl
-+export AXIS2_GL_SERVICES = ${AXIS2_GL_REPO}/services
- export LIBVIRT_HOME = @LIBVIRT_HOME@
- export VDDK_HOME = @VDDK_HOME@
-
-@@ -68,7 +75,8 @@
- -DLIBDIR=\"$(libdir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
- -DLOCALSTATEDIR=\"$(localstatedir)\" \
-- -DHELPERDIR=\"$(datarootdir)\"
-+ -DHELPERDIR=\"$(datarootdir)\" \
-+ -DWSFCPP_HOME=\"$(WSFCPP_HOME)\"
-
- CPPFLAGS = @CPPFLAGS@ $(PATHS)
-
-diff -ur eucalyptus-3.2.0git5ab72572.orig/node/Makefile eucalyptus-3.2.0git5ab72572/node/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/node/Makefile 2012-12-11 10:08:32.916980291 -0500
-+++ eucalyptus-3.2.0git5ab72572/node/Makefile 2012-12-11 10:27:15.359799110 -0500
-@@ -189,21 +189,21 @@
- $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -o libvirt_tortura libvirt_tortura.c -lvirt
-
- deploy:
-- $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-- $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) -d $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/
-+ $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/
-
- # no ws-sec
-- cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(NCWSDLNAME) > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
-+ cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/$(NCWSDLNAME) > $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
- # ws-sec
-- cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(NCWSDLNAME) | ../tools/add_service_policy.pl ../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cluster-cert.pem:g" | sed "s:CLIENT-KEY:cluster-pk.pem:g" | sed "s:SERVER-CERT:node-cert.pem:g" | sed "s:SERVER-KEY:node-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
-- cat ../tools/client-policy-template.xml | sed "s:EUCALYPTUS_HOME:$(EUCALYPTUS):g" | sed "s:AXIS2C_HOME:$(AXIS2C_HOME):g" | sed "s:CLIENT-CERT:cluster-cert.pem:g" | sed "s:CLIENT-KEY:cluster-pk.pem:g" | sed "s:SERVER-CERT:node-cert.pem:g" | sed "s:SERVER-KEY:node-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > nc-client-policy.xml
-+ cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/$(NCWSDLNAME) | ../tools/add_service_policy.pl ../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cluster-cert.pem:g" | sed "s:CLIENT-KEY:cluster-pk.pem:g" | sed "s:SERVER-CERT:node-cert.pem:g" | sed "s:SERVER-KEY:node-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services_WS.xml
-+ cat ../tools/client-policy-template.xml | sed "s:EUCALYPTUS_HOME:$(EUCALYPTUS):g" | sed "s:AXIS2C_HOME:$(AXIS2_NC_REPO):g" | sed "s:CLIENT-CERT:cluster-cert.pem:g" | sed "s:CLIENT-KEY:cluster-pk.pem:g" | sed "s:SERVER-CERT:node-cert.pem:g" | sed "s:SERVER-KEY:node-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > nc-client-policy.xml
- # cp nc-client-policy.xml $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- ## cp ../tools/*.pem $(EUCALYPTUS)/var/lib/eucalyptus/keys/
- # chmod -R 0600 $(EUCALYPTUS)/var/lib/eucalyptus/keys/*
- # ws
-- $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+ $(INSTALL) $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services.xml
- # no ws
--# cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-+# cp $(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(AXIS2_NC_SERVICES)/$(SERVICE_NAME)/services.xml
-
- indent:
- @for idfile in *.[ch]; do \
-@@ -224,4 +224,4 @@
- uninstall:
- $(RM) -f $(DESTDIR)$(eucastatedir)/keys/nc-client-policy.xml
- $(RM) -f $(DESTDIR)$(eucasbindir)/euca_test_nc
-- $(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
-+ $(RM) -rf $(DESTDIR)$(AXIS2_NC_SERVICES)/$(SERVICE_NAME)
diff --git a/eucalyptus-bad-tgt-check.patch b/eucalyptus-bad-tgt-check.patch
deleted file mode 100644
index 04ccff2..0000000
--- a/eucalyptus-bad-tgt-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- eucalyptus-3.3.0.32052445/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/ISCSIManager.java.orig 2013-03-28 17:32:16.000000000 -0400
-+++ eucalyptus-3.3.0.32052445/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/ISCSIManager.java 2013-04-06 16:02:28.846246704 -0400
-@@ -119,15 +119,15 @@
- LOG.warn("Unable to connect to tgt daemon. Is tgtd loaded?");
- LOG.info("Attempting to start tgtd ISCSI daemon");
- output = execute(new String[] { ROOT_WRAP, "service", TGT_SERVICE_NAME, "status" }, timeout);
-- if (output.returnValue != 0 || StringUtils.isNotBlank(output.error)) {
-+ if (output.returnValue != 0 || (StringUtils.isNotBlank(output.error) && !StringUtils.startsWith(output.error, "Redirecting"))) {
- output = execute(new String[] { ROOT_WRAP, "service", TGT_SERVICE_NAME, "start" }, timeout);
-- if (output.returnValue != 0 || StringUtils.isNotBlank(output.error)) {
-+ if (output.returnValue != 0 || (StringUtils.isNotBlank(output.error) && !StringUtils.startsWith(output.error, "Redirecting"))) {
- Faults.forComponent(Storage.class).havingId(TGT_CORRUPTED).withVar("component", "Storage Controller").withVar("operation", "service tgt start").withVar("error", output.error).log();
- throw new EucalyptusCloudException("Unable to start tgt daemon. Cannot proceed.");
- }
- } else {
- output = execute(new String[] { ROOT_WRAP, "service", "tgt", "start" } ,timeout);
-- if (output.returnValue != 0 || StringUtils.isNotBlank(output.error)) {
-+ if (output.returnValue != 0 || (StringUtils.isNotBlank(output.error) && !StringUtils.startsWith(output.error, "Redirecting"))) {
- Faults.forComponent(Storage.class).havingId(TGT_CORRUPTED).withVar("component", "Storage Controller").withVar("operation", "service tgt start").withVar("error", output.error).log();
- throw new EucalyptusCloudException("Unable to start tgt daemon. Cannot proceed.");
- }
-@@ -140,7 +140,7 @@
- Long timeout = DirectStorageInfo.getStorageInfo().getTimeoutInMillis();
-
- CommandOutput output = execute(new String[] { ROOT_WRAP, "service", TGT_SERVICE_NAME, "status" }, timeout);
-- if (StringUtils.isNotBlank(output.error)) {
-+ if (output.returnValue != 0 || (StringUtils.isNotBlank(output.error) && !StringUtils.startsWith(output.error, "Redirecting"))) {
- Faults.forComponent(Storage.class).havingId(TGT_CORRUPTED).withVar("component", "Storage Controller").withVar("operation", "service tgt status").withVar("error", output.error).log();
- throw new EucalyptusCloudException("tgt service check failed with error: " + output.error);
- }
diff --git a/eucalyptus-braindead-gwt-import.patch b/eucalyptus-braindead-gwt-import.patch
deleted file mode 100644
index 7538fc9..0000000
--- a/eucalyptus-braindead-gwt-import.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eucalyptus-3.3.0.32052445/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java.orig 2013-04-06 18:56:12.674971976 -0400
-+++ eucalyptus-3.3.0.32052445/clc/modules/dns/src/main/java/com/eucalyptus/cloud/ws/DNSControl.java 2013-04-06 18:54:55.689948858 -0400
-@@ -70,7 +70,7 @@
-
- import edu.ucsb.eucalyptus.cloud.AccessDeniedException;
- import com.eucalyptus.util.EucalyptusCloudException;
--import com.google.gwt.thirdparty.guava.common.collect.Lists;
-+import com.google.common.collect.Lists;
-
- import edu.ucsb.eucalyptus.cloud.entities.*;
- import edu.ucsb.eucalyptus.msgs.*;
diff --git a/eucalyptus-cc.init b/eucalyptus-cc.init
deleted file mode 100755
index 4d4a2f3..0000000
--- a/eucalyptus-cc.init
+++ /dev/null
@@ -1,325 +0,0 @@
-#!/bin/bash
-#Copyright (c) 2009 Eucalyptus Systems, Inc.
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, only version 3 of the License.
-#
-#This file is distributed in the hope that it will be useful, but WITHOUT
-#ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-#for more details.
-#
-#You should have received a copy of the GNU General Public License along
-#with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#Please contact Eucalyptus Systems, Inc., 130 Castilian
-#Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
-#if you need additional information or have any questions.
-#
-#This file may incorporate work covered under the following copyright and
-#permission notice:
-#
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Regents of the University of California
-#
-#
-# Redistribution and use of this software in source and binary forms, with
-# or without modification, are permitted provided that the following
-# conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF
-# THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-# LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-# SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-# IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-# BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-# THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-# OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-# WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-# ANY SUCH LICENSES OR RIGHTS.
-#
-#
-# Init script for the Eucalyptus cluster controller
-#
-# chkconfig: 2345 99 05
-# description: script for starting and stopping eucalyptus cluster controller
-#
-### BEGIN INIT INFO
-# Provides: eucalyptus-cc
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start Eucalyptus cluster controller
-# Description: Start the Eucalyptus cluster controller
-### END INIT INFO
-#
-
-# Do NOT "set -e"
-
-# if we have lsb functions let's source them
-WE_HAVE_LSB="N"
-if [ -e /lib/lsb/init-functions ]; then
- . /lib/lsb/init-functions
- # very old lsb don't have the functions we need
- if type log_daemon_msg > /dev/null 2> /dev/null ; then
- WE_HAVE_LSB="Y"
- fi
-fi
-
-if [ "$EUID" != "0" ]; then
- echo "Eucalyptus init scripts must be run as root."
- exit 1
-fi
-
-# I just wanted to set PATH to be the system PATH, but if a user install
-# eucalyptus manually, it may have binaries in a non-standard position:
-# hence we need to keep the PATH we receive.
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
-DESC="Eucalyptus cluster controller"
-NAME=eucalyptus-cc
-EUCA_USER="eucalyptus"
-
-export EUCALYPTUS="/"
-EUCAHELPERDIR=$EUCALYPTUS/usr/share/eucalyptus
-EUCASBINDIR=$EUCALYPTUS/usr/sbin
-EUCACONFDIR=$EUCALYPTUS/etc/eucalyptus
-EUCADATADIR=$EUCALYPTUS/usr/share/eucalyptus
-EUCARUNDIR=$EUCALYPTUS/var/run/eucalyptus
-EUCALOGDIR=$EUCALYPTUS/var/log/eucalyptus
-EUCALIBEXECDIR=$EUCALYPTUS/usr/libexec/eucalyptus/
-LIBDIR=@LIBDIR@
-
-# crude way to start the axis2c services
-do_start() {
- # fixes #469984 (was against NC but CC may have similar issue)
- IPTABLES="`which iptables 2> /dev/null`"
- if [ -n "$IPTABLES" ]; then
- [ -x $IPTABLES ] && $IPTABLES -L -n > /dev/null 2> /dev/null
- fi
-
- if ! $EUCASBINDIR/euca_conf --check cc ; then
- exit 1
- fi
-
- # we need IP forwarding and we need to use iptable over the bridge
- if [ -w /proc/sys/net/ipv4/ip_forward ]; then
- VAL=`cat /proc/sys/net/ipv4/ip_forward`
- if [ "$VAL" = "0" ]; then
- echo
- echo -n "Enabling IP forwarding"
- echo -n 1 > /proc/sys/net/ipv4/ip_forward
- fi
- fi
-
- # if in MANAGED or STATIC mode, we need to use
- # dhcpd, so better check we know how to use it
- if [ "$VNET_MODE" = "MANAGED" -o "$VNET_MODE" = "STATIC" ]; then
- if [ -z "$VNET_DHCPDAEMON" -o ! -x $VNET_DHCPDAEMON ]; then
- echo
- echo "Cannot find dhcp server!"
- exit 1
- fi
- if ! $VNET_DHCPDAEMON --help 2>&1 |grep -- -tf > /dev/null ; then
- echo
- echo "dhcp server doesn't accept -tf option!"
- fi
- fi
-
- ulimit -u 100000
- ulimit -n 10000
- # now we start the services
- if ! httpd -f $EUCACONFDIR/httpd/conf/httpd-cc.conf ; then
- echo
- echo "Failed to start the CC!"
- exit 1
- fi
-}
-
-do_status() {
- pidfile=$EUCARUNDIR/eucalyptus-cc.pid
- if [ -s $pidfile ]; then
- pid=`cat $pidfile 2> /dev/null`
- if ps axww|grep $pid|grep httpd-cc.conf > /dev/null ; then
- # we are good
- return 0
- fi
- fi
- return 1
-}
-
-do_stop() {
- pidfile="$EUCARUNDIR/eucalyptus-cc.pid"
-
- # let's be sure we are killing the right process
- if ! do_status ; then
- rm -f $pidfile
- return
- fi
- # now kill the services
- pidfiles="$EUCARUNDIR/net/euca-dhcp.pid $EUCARUNDIR/eucalyptus-cc.pid $EUCARUNDIR/httpd-dynserv.pid"
- pids=""
- sids=""
- for pidfile in $pidfiles ; do
- if [ -s $pidfile ]; then
- pid=`cat $pidfile 2> /dev/null`
- sids="$pid $sids"
- morepids="$pid"
- for i in `pgrep -P $pid`; do
- morepids="$morepids `echo $i`"
- morepids="$morepids `pgrep -P $i`"
- done
- pids="$pids $morepids"
- rm -f $pidfile
- fi
- done
- if [ -n "$pids" ]; then
- kill -15 $pids >/dev/null 2>&1
- pkill -9 -s $sids >/dev/null 2>&1
- fi
-
- dopkill=0
- for pid in $pids ; do
- timeout=5
- while [ $timeout -gt 0 ]; do
- if ps $pid > /dev/null 2>&1 ; then
- sleep 1
- timeout=$(($timeout - 1))
- dopkill=1
- else
- break
- fi
- done
- if [ $timeout -eq 0 ]; then
- kill -9 ${pid} >/dev/null 2>&1
- fi
- done
- if [ $dopkill -gt 0 ]; then
- pkill -9 -s $sids >/dev/null 2>&1
- fi
-}
-
-# set the library path correctly
-export LD_LIBRARY_PATH=$LIBDIR/wso2-axis2/modules/rampart
-export AXIS2C_HOME=$LIBDIR/eucalyptus/axis2/cc
-export WSFCPP_HOME=$LIBDIR/eucalyptus/axis2/cc
-
-case "$1" in
- start)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_daemon_msg "Starting $DESC" "$NAME"
- else
- echo -n "Starting $DESC: "
- fi
- fi
-
- # let's check there is no previous CC running
- if do_status ; then
- echo
- echo "another CC is already running!"
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 1
- fi
- fi
- exit 1
- fi
-
- # start and stop are hard: clear the semaphores
- rm -f /dev/shm/*eucalyptusCC*
- do_start
- case "$?" in
- 0|1)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- *)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 1
- else
- echo "failed!"
- fi
- fi
- ;;
- esac
- ;;
- stop)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_begin_msg "Stopping $DESC"
- else
- echo -n "Stopping $DESC: "
- fi
- fi
- # start and stop are hard: we loose the CC state
- do_stop
- rm -f /dev/shm/*eucalyptusCC*
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- restart)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_begin_msg "Restarting $DESC"
- else
- echo -n "Restarting $DESC: "
- fi
- fi
- # restart allow the CC to mantain the state across restart
- do_stop
- rm -f /dev/shm/*eucalyptusCC*
- do_start
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- status)
- if do_status ; then
- echo "CC is running"
- else
- exit 3
- fi
- ;;
-
- *)
- echo "Usage: $NAME {start|stop|restart}" >&2
- exit 3
- ;;
-esac
-
-:
diff --git a/eucalyptus-cc.service b/eucalyptus-cc.service
deleted file mode 100644
index 8b5420e..0000000
--- a/eucalyptus-cc.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=The Eucalyptus Cluster Controller service
-After=syslog.target network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/eucalyptus/eucalyptus-cc.pid
-# EnvironmentFile=/etc/sysconfig/eucalyptus
-ExecStart=/usr/libexec/eucalyptus/eucalyptus-cc.init start
-ExecStop=/usr/libexec/eucalyptus/eucalyptus-cc.init stop
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/eucalyptus-clean-cc b/eucalyptus-clean-cc
deleted file mode 100755
index 2d6ff84..0000000
--- a/eucalyptus-clean-cc
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-#Copyright (c) 2009 Eucalyptus Systems, Inc.
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, only version 3 of the License.
-#
-#This file is distributed in the hope that it will be useful, but WITHOUT
-#ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-#for more details.
-#
-#You should have received a copy of the GNU General Public License along
-#with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#Please contact Eucalyptus Systems, Inc., 130 Castilian
-#Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
-#if you need additional information or have any questions.
-#
-#This file may incorporate work covered under the following copyright and
-#permission notice:
-#
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Regents of the University of California
-#
-#
-# Redistribution and use of this software in source and binary forms, with
-# or without modification, are permitted provided that the following
-# conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF
-# THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-# LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-# SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-# IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-# BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-# THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-# OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-# WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-# ANY SUCH LICENSES OR RIGHTS.
-#
-
-EUCARUNDIR=/var/run/eucalyptus
-EUCASTATEDIR=/var/lib/eucalyptus
-
-systemctl status eucalyptus-cc && \
- echo "You must stop eucalyptus-cc prior to running $0"
-
-# fully clean up all local CC state
-do_fullclean() {
- pidfiles="`ls -1 $EUCARUNDIR/vtund*.pid 2>/dev/null`"
- pids=""
- sids=""
- for pidfile in $pidfiles ; do
- if [ -s $pidfile ]; then
- pid=`cat $pidfile 2> /dev/null`
- sids="$pid $sids"
- morepids="$pid"
- for i in `pgrep -P $pid`; do
- morepids="$morepids `echo $i`"
- morepids="$morepids `pgrep -P $i`"
- done
- pids="$pids $morepids"
- rm -f $pidfile
- fi
- done
- if [ -n "$pids" ]; then
- kill -15 $pids >/dev/null 2>&1
- pkill -15 -s $sids >/dev/null 2>&1
- fi
-
- dopkill=0
- for pid in $pids ; do
- timeout=5
- while [ $timeout -gt 0 ]; do
- if ps $pid > /dev/null 2>&1 ; then
- sleep 1
- timeout=$(($timeout - 1))
- dopkill=1
- else
- break
- fi
- done
- if [ $timeout -eq 0 ]; then
- kill -9 ${pid} >/dev/null 2>&1
- fi
- done
- if [ $dopkill -gt 0 ]; then
- pkill -9 -s $sids >/dev/null 2>&1
- fi
-
- rm -f $EUCASTATEDIR/CC/*
- rm -f /dev/shm/*eucalyptusCC*
-}
-
-do_fullclean
diff --git a/eucalyptus-cloud.service b/eucalyptus-cloud.service
deleted file mode 100644
index c4b7932..0000000
--- a/eucalyptus-cloud.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=The Eucalyptus Cloud web services stack
-After=syslog.target network.target remote-fs.target nss-lookup.target
-Wants=tgtd.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/eucalyptus/eucalyptus-cloud.pid
-ExecStart=/usr/libexec/eucalyptus/eucalyptus-cloud.init start
-ExecStop=/usr/libexec/eucalyptus/eucalyptus-cloud.init stop
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/eucalyptus-configurable-paths.patch b/eucalyptus-configurable-paths.patch
deleted file mode 100644
index b33312b..0000000
--- a/eucalyptus-configurable-paths.patch
+++ /dev/null
@@ -1,365 +0,0 @@
-diff -ur eucalyptus-3.2.0git5ab72572.orig/clc/Makefile eucalyptus-3.2.0git5ab72572/clc/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/clc/Makefile 2012-12-11 09:15:58.232605029 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/Makefile 2012-12-11 09:24:53.263922777 -0500
-@@ -146,8 +146,8 @@
-
- uninstall:
- make -C eucadmin uninstall
-- $(RM) -rf $(DESTDIR)$(etcdir)/eucalyptus/cloud.d
-- $(RM) -rf $(DESTDIR)$(datarootdir)/eucalyptus/*jar
-+ $(RM) -rf $(DESTDIR)$(eucaconfdir)/cloud.d
-+ $(RM) -rf $(DESTDIR)$(eucadatadir)/*jar
- $(RM) -rf $(DESTDIR)$(vardir)/eucalyptus/webapps
-
- # cleaning up after run-test currently requires a few iterations of:
-diff -ur eucalyptus-3.2.0git5ab72572.orig/clc/modules/bootstrap/src/main/native/Makefile eucalyptus-3.2.0git5ab72572/clc/modules/bootstrap/src/main/native/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/clc/modules/bootstrap/src/main/native/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/modules/bootstrap/src/main/native/Makefile 2012-12-11 09:26:17.486400093 -0500
-@@ -85,8 +85,8 @@
- gengetopt --input=arguments.ggo --file-name=eucalyptus-opts --func-name=arguments --arg-struct-name=eucalyptus_opts
-
- install: eucalyptus-cloud
-- $(INSTALL) -d $(DESTDIR)$(sbindir)
-- $(INSTALL) -m 0755 eucalyptus-cloud $(DESTDIR)$(sbindir)/eucalyptus-cloud
-+ $(INSTALL) -d $(DESTDIR)$(eucasbindir)
-+ $(INSTALL) -m 0755 eucalyptus-cloud $(DESTDIR)$(eucasbindir)/eucalyptus-cloud
-
- indent:
-
-@@ -101,4 +101,4 @@
- @$(RM) -f $(OBJS) eucalyptus-cloud arguments.ggo
-
- uninstall:
-- @$(RM) -f $(DESTDIR)$(sbindir)/eucalyptus-cloud
-+ @$(RM) -f $(DESTDIR)$(eucasbindir)/eucalyptus-cloud
-diff -ur eucalyptus-3.2.0git5ab72572.orig/clc/modules/storage-controller/native/Makefile eucalyptus-3.2.0git5ab72572/clc/modules/storage-controller/native/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/clc/modules/storage-controller/native/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/modules/storage-controller/native/Makefile 2012-12-11 09:28:43.780466669 -0500
-@@ -96,11 +96,11 @@
- distclean: clean
-
- install:
-- mkdir -p $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/
-- cp $(LIBDIR)/$(LVM2_SO) $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/
-- cp $(LIBDIR)/$(DAS_SO) $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/
-+ mkdir -p $(DESTDIR)$(eucalibdir)
-+ cp $(LIBDIR)/$(LVM2_SO) $(DESTDIR)$(eucalibdir)
-+ cp $(LIBDIR)/$(DAS_SO) $(DESTDIR)$(eucalibdir)
-
- uninstall:
-- rm -r $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/$(LVM2_SO)
-- rm -r $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/$(DAS_SO)
-+ rm -r $(DESTDIR)$(eucalibdir)/$(LVM2_SO)
-+ rm -r $(DESTDIR)$(eucalibdir)/$(DAS_SO)
-
-diff -ur eucalyptus-3.2.0git5ab72572.orig/cluster/Makefile eucalyptus-3.2.0git5ab72572/cluster/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/cluster/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/cluster/Makefile 2012-12-11 09:32:09.594033083 -0500
-@@ -184,10 +184,10 @@
- rm -rf generated cc-client-policy.xml
-
- install: deploy
-- @$(INSTALL) -m 0555 $(SHUTDOWNCC) $(DESTDIR)$(usrdir)/lib/eucalyptus
-- @$(INSTALL) cc-client-policy.xml $(DESTDIR)$(vardir)/lib/eucalyptus/keys/
-+ @$(INSTALL) -m 0555 $(SHUTDOWNCC) $(DESTDIR)$(eucalibexecdir)
-+ @$(INSTALL) cc-client-policy.xml $(DESTDIR)$(eucastatedir)/keys/
-
- uninstall:
- # @$(RM) -f $(DESTDIR)$(sbindir)/$(SHUTDOWNCC)
-- @$(RM) -f $(DESTDIR)$(vardir)/lib/eucalyptus/keys/cc-client-policy.xml
-+ @$(RM) -f $(DESTDIR)$(eucastatedir)/keys/cc-client-policy.xml
- @$(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
-diff -ur eucalyptus-3.2.0git5ab72572.orig/Makedefs.in eucalyptus-3.2.0git5ab72572/Makedefs.in
---- eucalyptus-3.2.0git5ab72572.orig/Makedefs.in 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/Makedefs.in 2012-12-11 09:20:55.201015508 -0500
-@@ -18,19 +18,30 @@
- # comply to the GNU standard
- prefix = @prefix@
- #exec_prefix = @exec_prefix@
--#bindir = @bindir@
--#sbindir = @sbindir@
--#libdir = @libdir@
-+bindir = @bindir@
-+docdir = @docdir@
-+sbindir = @sbindir@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
- #mandir = @mandir@
--#incdir = @includedir@
--#etcdir = @sysconfdir@
--#datarootdir = @datarootdir@
--etcdir = ${prefix}/etc
--vardir = ${prefix}/var
--usrdir = ${prefix}/usr
--bindir = ${prefix}/usr/bin
--sbindir = ${prefix}/usr/sbin
--datarootdir = ${usrdir}/share
-+incdir = @includedir@
-+etcdir = @sysconfdir@
-+initddir = $(etcdir)/init.d
-+datarootdir = @datarootdir@
-+
-+# Trying to centralize the use of "prefix" and $EUCALYPTUS
-+eucaconfdir = ${prefix}${etcdir}/eucalyptus
-+eucadatadir = ${prefix}${datarootdir}/eucalyptus
-+eucadocdir = ${prefix}${docdir}/eucalyptus
-+eucalibdir = ${libdir}/eucalyptus
-+eucastatedir = ${prefix}${localstatedir}/lib/eucalyptus
-+eucarundir = ${prefix}${vardir}/run/eucalyptus
-+eucalibexecdir = ${prefix}${libexecdir}/eucalyptus
-+eucasbindir = ${prefix}/usr/sbin
-+# This _could_ be eucalibexecdir instead
-+eucahelperdir = ${eucadatadir}
-+
-
- # where we are going to install eucalyptus and where are the sources
- export EUCALYPTUS = ${prefix}
-@@ -51,6 +61,17 @@
- INDENTTOOLS = indent
- INDENTFLAGS = -nbad -bap -nbc -bbo -hnl -br -brs -c40 -cd40 -ncdb -ce -cli0 -d0 -di1 -nfc1 -i4 -nut -ip0 -l180 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
-
-+# various directory paths
-+PATHS= -DSYSCONFDIR=\"$(etcdir)\" \
-+ -DSBINDIR=\"$(sbindir)\" \
-+ -DDATADIR=\"$(datarootdir)\" \
-+ -DLIBDIR=\"$(libdir)\" \
-+ -DLIBEXECDIR=\"$(libexecdir)\" \
-+ -DLOCALSTATEDIR=\"$(localstatedir)\" \
-+ -DHELPERDIR=\"$(datarootdir)\"
-+
-+CPPFLAGS = @CPPFLAGS@ $(PATHS)
-+
- # compile time configurations
- euca_theme = @INTERFACE_THEME@
- extensions = @EXTENSIONS@
-diff -ur eucalyptus-3.2.0git5ab72572.orig/Makefile eucalyptus-3.2.0git5ab72572/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/Makefile 2012-12-11 09:24:11.448201502 -0500
-@@ -50,24 +50,24 @@
-
- install: deploy
- @$(INSTALL) -d $(DESTDIR)$(prefix)
-- @$(INSTALL) -d $(DESTDIR)$(etcdir)/eucalyptus/cloud.d
-- @$(INSTALL) -d $(DESTDIR)$(etcdir)/eucalyptus/nc-hooks
-- @$(INSTALL) -m 0644 VERSION $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus-version
-+ @$(INSTALL) -d $(DESTDIR)$(eucaconfdir)/cloud.d
-+ @$(INSTALL) -d $(DESTDIR)$(eucaconfdir)/nc-hooks
-+ @$(INSTALL) -m 0644 VERSION $(DESTDIR)$(eucadatadir)/eucalyptus-version
- @$(INSTALL) -d $(DESTDIR)$(etcdir)/init.d
-- @$(INSTALL) -d $(DESTDIR)$(vardir)/run/eucalyptus/net
-- @$(INSTALL) -d $(DESTDIR)$(vardir)/lib/eucalyptus/keys
-- @$(INSTALL) -d $(DESTDIR)$(vardir)/lib/eucalyptus/CC
-- @$(INSTALL) -d $(DESTDIR)$(vardir)/log/eucalyptus
-- @$(INSTALL) -d $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -d $(DESTDIR)$(datarootdir)/eucalyptus/doc
-- @$(INSTALL) -d $(DESTDIR)$(usrdir)/sbin
-- @$(INSTALL) -d $(DESTDIR)$(usrdir)/lib/eucalyptus
-+ @$(INSTALL) -d $(DESTDIR)$(eucarundir)/net
-+ @$(INSTALL) -d $(DESTDIR)$(eucastatedir)/keys
-+ @$(INSTALL) -d $(DESTDIR)$(eucastatedir)/CC
-+ @$(INSTALL) -d $(DESTDIR)$(eucalogdir)
-+ @$(INSTALL) -d $(DESTDIR)$(eucadatadir)
-+ @$(INSTALL) -d $(DESTDIR)$(eucadocdir)
-+ @$(INSTALL) -d $(DESTDIR)$(eucasbindir)
-+ @$(INSTALL) -d $(DESTDIR)$(eucalibdir)
- @$(INSTALL) -d $(DESTDIR)$(etcdir)/bash_completion.d
- @for subdir in $(SUBDIRS); do \
- (cd $$subdir && $(MAKE) $@) || exit $$? ; done
-
- uninstall:
-- @$(RM) -f $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus-version
-+ @$(RM) -f $(DESTDIR)$(eucadatadir)/eucalyptus-version
- @for subdir in $(SUBDIRS); do \
- (cd $$subdir && $(MAKE) $@) || exit $$? ; done
-
-diff -ur eucalyptus-3.2.0git5ab72572.orig/node/Makefile eucalyptus-3.2.0git5ab72572/node/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/node/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/node/Makefile 2012-12-11 09:36:34.306077903 -0500
-@@ -218,10 +218,10 @@
- rm -rf generated $(SERVICE_SO) *.o $(CLIENT) $(CLIENT)_local nc-client-policy.xml test test_nc test_hooks *~* *#*
-
- install: deploy
-- $(INSTALL) nc-client-policy.xml $(DESTDIR)$(vardir)/lib/eucalyptus/keys/
-- $(INSTALL) -m 0755 test_nc $(DESTDIR)$(sbindir)/euca_test_nc
-+ $(INSTALL) nc-client-policy.xml $(DESTDIR)$(eucastatedir)/keys/
-+ $(INSTALL) -m 0755 test_nc $(DESTDIR)$(eucasbindir)/euca_test_nc
-
- uninstall:
-- $(RM) -f $(DESTDIR)$(vardir)/lib/eucalyptus/keys/nc-client-policy.xml
-- $(RM) -f $(DESTDIR)$(sbindir)/euca_test_nc
-+ $(RM) -f $(DESTDIR)$(eucastatedir)/keys/nc-client-policy.xml
-+ $(RM) -f $(DESTDIR)$(eucasbindir)/euca_test_nc
- $(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
-diff -ur eucalyptus-3.2.0git5ab72572.orig/tools/Makefile eucalyptus-3.2.0git5ab72572/tools/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/tools/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/tools/Makefile 2012-12-11 09:52:21.369526869 -0500
-@@ -76,75 +76,55 @@
- @rm -rf eucalyptus eucalyptus-cloud eucalyptus-walrus eucalyptus-sc
-
- install: build
-- @if test -e /etc/init.d/eucalyptus ; then \
-- mv /etc/init.d/eucalyptus /etc/init.d/eucalyptus.old ; \
-+ @if test -e $(initddir)/eucalyptus ; then \
-+ mv $(initddir)/eucalyptus $(initddir)/eucalyptus.old ; \
- echo "Moving away old init.d script"; fi
-- @if test -e $(DESTDIR)$(etcdir)/init.d/eucalyptus ; then \
-- mv $(DESTDIR)$(etcdir)/init.d/eucalyptus $(DESTDIR)$(etcdir)/init.d/eucalyptus.old ; fi
-- @$(INSTALL) -m 755 eucalyptus-cloud $(DESTDIR)$(etcdir)/init.d
-- @$(INSTALL) -m 755 eucalyptus-nc $(DESTDIR)$(etcdir)/init.d
-- @$(INSTALL) -m 755 eucalyptus-cc $(DESTDIR)$(etcdir)/init.d
-- @$(INSTALL) -m 644 httpd.conf $(DESTDIR)$(etcdir)/eucalyptus
-- @if test -e $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus.conf ; then \
-- cp $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus.conf $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus.conf.old ; fi
-- @$(INSTALL) -m 644 eucalyptus.conf $(DESTDIR)$(etcdir)/eucalyptus
-- @$(INSTALL) -m 644 vtunall.conf.template $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 add_key.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 gen_libvirt_xml $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 gen_kvm_libvirt_xml $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 detach.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 partition2disk $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 get_xen_info $(DESTDIR)$(datarootdir)/eucalyptus/get_xen_info
-- @$(INSTALL) -m 755 get_sys_info $(DESTDIR)$(datarootdir)/eucalyptus/get_sys_info
-- @$(INSTALL) -m 755 euca_ipt $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 euca_upgrade $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 populate_arp.pl $(DESTDIR)$(datarootdir)/eucalyptus
--# @$(INSTALL) -m 755 euca_conf $(DESTDIR)$(sbindir)
--# -$(INSTALL) -m 755 euca_conf.complete $(DESTDIR)$(etcdir)/bash_completion.d/euca_conf
--# @$(INSTALL) -m 755 eucanetd $(DESTDIR)$(sbindir)
-- @$(INSTALL) -m 755 euca_sync_key $(DESTDIR)$(sbindir)
-- @$(INSTALL) -m 755 connect_iscsitarget.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 connect_iscsitarget_sc.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 connect_iscsitarget_main.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 disconnect_iscsitarget.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 disconnect_iscsitarget_sc.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 disconnect_iscsitarget_main.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 get_iscsitarget.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 iscsitarget_common.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 644 floppy $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 dynserv.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 644 libvirt-kvm-windows-example.xml $(DESTDIR)$(datarootdir)/eucalyptus/doc/
-- @$(INSTALL) -m 644 libvirt-xen-windows-example.xml $(DESTDIR)$(datarootdir)/eucalyptus/doc/
-- @$(INSTALL) -m 755 getstats.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 getstats_net.pl $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 euca-lictool $(DESTDIR)$(sbindir)
-- @$(INSTALL) -m 755 lic_template $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 755 lic_default $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 644 libvirt.xsl $(DESTDIR)$(etcdir)/eucalyptus
-- @$(INSTALL) -m 755 create-loop-devices $(DESTDIR)$(datarootdir)/eucalyptus
-- @$(INSTALL) -m 644 nc-hooks/example.sh $(DESTDIR)$(etcdir)/eucalyptus/nc-hooks/
-+ @if test -e $(DESTDIR)$(initddir)/eucalyptus ; then \
-+ mv $(DESTDIR)$(initddir)/eucalyptus $(DESTDIR)$(initddir)/eucalyptus.old ; fi
-+ @$(INSTALL) -m 755 eucalyptus-cloud $(DESTDIR)$(initddir)
-+ @$(INSTALL) -m 755 eucalyptus-nc $(DESTDIR)$(initddir)
-+ @$(INSTALL) -m 755 eucalyptus-cc $(DESTDIR)$(initddir)
-+ @$(INSTALL) -m 644 httpd.conf $(DESTDIR)$(eucaconfdir)
-+ @if test -e $(DESTDIR)$(eucaconfdir)/eucalyptus.conf ; then \
-+ cp $(DESTDIR)$(eucaconfdir)/eucalyptus.conf $(DESTDIR)$(eucaconfdir)/eucalyptus.conf.old ; fi
-+ @$(INSTALL) -m 644 eucalyptus.conf $(DESTDIR)$(eucaconfdir)
-+ @$(INSTALL) -m 644 vtunall.conf.template $(DESTDIR)$(eucadatadir)
-+ @$(INSTALL) -d 755 $(DESTDIR)$(eucahelperdir)
-+ @for x in add_key.pl gen_libvirt_xml gen_kvm_libvirt_xml detach.pl partition2disk \
-+ get_xen_info get_sys_info euca_ipt euca_upgrade populate_arp.pl \
-+ connect_iscsitarget.pl connect_iscsitarget_sc.pl disconnect_iscsitarget.pl \
-+ disconnect_iscsitarget_sc.pl get_iscsitarget.pl floppy dynserv.pl \
-+ connect_iscsitarget_main.pl disconnect_iscsitarget_main.pl \
-+ iscsitarget_common.pl getstats.pl getstats_net.pl create-loop-devices; \
-+ do $(INSTALL) -m 755 $$x $(DESTDIR)$(eucahelperdir); done
-+# @$(INSTALL) -m 755 eucanetd $(DESTDIR)$(eucasbindir)
-+ @$(INSTALL) -m 755 euca_sync_key $(DESTDIR)$(eucasbindir)
-+ @$(INSTALL) -m 644 libvirt-kvm-windows-example.xml $(DESTDIR)$(eucadocdir)
-+ @$(INSTALL) -m 644 libvirt-xen-windows-example.xml $(DESTDIR)$(eucadocdir)
-+ @$(INSTALL) -m 755 euca-lictool $(DESTDIR)$(eucasbindir)
-+ @$(INSTALL) -m 755 lic_template $(DESTDIR)$(eucadatadir)
-+ @$(INSTALL) -m 755 lic_default $(DESTDIR)$(eucadatadir)
-+ @$(INSTALL) -m 644 libvirt.xsl $(DESTDIR)$(eucaconfdir)
-+ @$(INSTALL) -m 644 nc-hooks/example.sh $(DESTDIR)$(eucaconfdir)/nc-hooks/
-
- uninstall:
-- @$(RM) -f $(DESTDIR)$(etcdir)/init.d/eucalyptus-cloud
-- @$(RM) -f $(DESTDIR)$(etcdir)/init.d/eucalyptus-nc
-- @$(RM) -f $(DESTDIR)$(etcdir)/init.d/eucalyptus-cc
-- @$(RM) -f $(DESTDIR)$(etcdir)/eucalyptus/httpd*
-- @$(RM) -f $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus.conf
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/vtunall.conf.template
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/add_key.pl
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/gen_libvirt_xml
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/gen_kvm_libvirt_xml
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/detach.pl
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/partition2disk
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/get_xen_info
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/get_sys_info
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/euca_ipt
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/euca_upgrade
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/populate_arp.pl
-- @$(RM) -f $(DESTDIR)$(sbindir)/euca_conf
-+ @for x in eucalyptus-cloud eucalyptus-nc eucalyptus-cc; \
-+ do @$(RM) -f $(DESTDIR)$(initddir)/$$x; done
-+ @$(RM) -f $(DESTDIR)$(eucaconfdir)/httpd*
-+ @$(RM) -f $(DESTDIR)$(eucaconfdir)/eucalyptus.conf
-+ @$(RM) -f $(DESTDIR)$(eucadatadir)/vtunall.conf.template
-+# XXX: Need root privs
- @$(RM) -f $(DESTDIR)$(etcdir)/bash_completion.d/euca_conf
-- @$(RM) -f $(DESTDIR)$(sbindir)/euca_sync_key
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/lic_template
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/lic_default
-- @$(RM) -f $(DESTDIR)$(sbindir)/euca-lictool
-- @$(RM) -f $(DESTDIR)$(datarootdir)/eucalyptus/create-loop-devices
-+ @for x in add_key.pl gen_libvirt_xml gen_kvm_libvirt_xml detach.pl partition2disk \
-+ get_xen_info get_sys_info euca_ipt euca_upgrade populate_arp.pl \
-+ connect_iscsitarget.pl connect_iscsitarget_sc.pl disconnect_iscsitarget.pl \
-+ disconnect_iscsitarget_sc.pl get_iscsitarget.pl floppy dynserv.pl \
-+ connect_iscsitarget_main.pl disconnect_iscsitarget_main.pl \
-+ iscsitarget_common.pl getstats.pl getstats_net.pl create-loop-devices; \
-+ do $(RM) -f $(DESTDIR)$(eucahelperdir)/$$x; done
-+ @$(RM) -f $(DESTDIR)$(eucasbindir)/euca_conf
-+ @$(RM) -f $(DESTDIR)$(eucasbindir)/euca_sync_key
-+ @$(RM) -f $(DESTDIR)$(eucasbindir)/euca-lictool
-+ @$(RM) -f $(DESTDIR)$(eucadatadir)/lic_template
-+ @$(RM) -f $(DESTDIR)$(eucadatadir)/lic_default
-+
-diff -ur eucalyptus-3.2.0git5ab72572.orig/util/eucalyptus-config.h.in eucalyptus-3.2.0git5ab72572/util/eucalyptus-config.h.in
---- eucalyptus-3.2.0git5ab72572.orig/util/eucalyptus-config.h.in 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/util/eucalyptus-config.h.in 2012-12-11 10:04:32.254948948 -0500
-@@ -70,6 +70,9 @@
- /* Current version */
- #undef EUCA_VERSION
-
-+/* location for rootwrap / mountwrap */
-+#undef EUCALYPTUS_LIBEXEC_DIR
-+
- /* headers on the system */
-
- /* Define if you have standards headers */
-diff -ur eucalyptus-3.2.0git5ab72572.orig/util/Makefile eucalyptus-3.2.0git5ab72572/util/Makefile
---- eucalyptus-3.2.0git5ab72572.orig/util/Makefile 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/util/Makefile 2012-12-11 10:03:17.275828210 -0500
-@@ -112,17 +112,18 @@
- rm -rf eucalyptus-config.h
-
- install: all
-- $(INSTALL) -m 0755 euca_rootwrap $(DESTDIR)$(usrdir)/lib/eucalyptus/
-- $(INSTALL) -m 0755 euca_mountwrap $(DESTDIR)$(usrdir)/lib/eucalyptus/
-- $(INSTALL) -m 0755 euca-generate-fault $(DESTDIR)$(usrdir)/sbin/
-- $(INSTALL) -d $(DESTDIR)$(usrdir)/share/eucalyptus/faults/en_US/
-- $(INSTALL) -m 0644 faults/en_US/common.xml $(DESTDIR)$(usrdir)/share/eucalyptus/faults/en_US/
-- $(INSTALL) -m 0644 -v faults/en_US/????.xml $(DESTDIR)$(usrdir)/share/eucalyptus/faults/en_US/
-- $(INSTALL) -d $(DESTDIR)$(etcdir)/eucalyptus/faults/en_US/
-+ $(INSTALL) -d -m 0755 $(DESTDIR)$(eucalibexecdir)
-+ $(INSTALL) -m 0755 euca_rootwrap $(DESTDIR)$(eucalibexecdir)/
-+ $(INSTALL) -m 0755 euca_mountwrap $(DESTDIR)$(eucalibexecdir)/
-+ $(INSTALL) -m 0755 euca-generate-fault $(DESTDIR)$(eucasbindir)/
-+ $(INSTALL) -d $(DESTDIR)$(eucadatadir)/faults/en_US/
-+ $(INSTALL) -m 0644 faults/en_US/common.xml $(DESTDIR)$(eucadatadir)/faults/en_US/
-+ $(INSTALL) -m 0644 -v faults/en_US/????.xml $(DESTDIR)$(eucadatadir)/faults/en_US/
-+ $(INSTALL) -d $(DESTDIR)$(eucaconfdir)/faults/en_US/
-
- deploy:
-
- uninstall:
-- $(RM) -f $(DESTDIR)$(usrdir)/lib/eucalyptus/euca_rootwrap
-- $(RM) -f $(DESTDIR)$(usrdir)/lib/eucalyptus/euca_mountwrap
-- $(RM) -f $(DESTDIR)$(usrdir)/share/eucalyptus/faults/en_US/*.xml
-+ $(RM) -f $(DESTDIR)$(eucalibexecdir)/euca_rootwrap
-+ $(RM) -f $(DESTDIR)$(eucalibexecdir)/euca_mountwrap
-+ $(RM) -f $(DESTDIR)$(eucadatadir)/faults/en_US/*.xml
diff --git a/eucalyptus-console.service b/eucalyptus-console.service
deleted file mode 100644
index 1d48f49..0000000
--- a/eucalyptus-console.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=The Eucalyptus Cluster Controller service
-After=syslog.target network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-User=eucaconsole
-PIDFile=/var/run/eucalyptus-console/eucalyptus-console.pid
-EnvironmentFile=/etc/sysconfig/eucalyptus-console
-ExecStart=/usr/bin/euca-console-server -d
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/eucalyptus-disable-gwt-in-buildxml.patch b/eucalyptus-disable-gwt-in-buildxml.patch
deleted file mode 100644
index 4374b69..0000000
--- a/eucalyptus-disable-gwt-in-buildxml.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/clc/modules/www/build.xml 2012-06-20 06:21:42.000000000 +0000
-+++ b/clc/modules/www/build.xml 2012-06-29 11:59:29.000000000 +0000
-@@ -123,7 +123,7 @@
- <target name="compile-src">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${test.dir}"/>
-- <javac deprecation="false" srcdir="${src.dir}" destdir="${build.dir}" classpathref="gwtclasspath" failonerror="true" debug="true" target="1.5" />
-+ <javac deprecation="false" srcdir="${src.dir}" excludes="com/eucalyptus/webui/**,com/eucalyptus/www/CommandServlet.java,com/eucalyptus/www/LoginServlet.java,com/eucalyptus/www/ReportServlet.java" destdir="${build.dir}" classpathref="gwtclasspath" failonerror="true" debug="true" target="1.5" />
- </target>
-
- <target name="clean">
-@@ -138,13 +138,15 @@
- <delete dir="${gwt.war.build.dir}" />
- <mkdir dir="${gwt.war.build.dir}" />
- <mkdir dir="${gwt.war.dir}" />
-+ <!--
- <java classpathref="gwtcompilerclasspath" fork="true" failonerror="true" classname="com.google.gwt.dev.Compiler">
- <jvmarg value="-Xmx1024m" />
- <jvmarg value="-Xss1024k" />
- <arg line="-war ${gwt.war.build.dir}" />
- <arg line="com.eucalyptus.webui.EucalyptusWebInterface" />
- </java>
-- <war destfile="${gwt.war}" webxml="${conf.dir}/gwt-web.xml" basedir="${gwt.war.build.dir}/${gwt.module.rename}/" />
-+ -->
-+ <war destfile="${gwt.war}" webxml="${conf.dir}/gwt-web.xml" basedir="${gwt.war.build.dir}/" />
- </target>
-
- <target name="compile-gwt-debug" depends="check-src" unless="gwtc.notRequired">
diff --git a/eucalyptus-disable-gwt-in-makefile.patch b/eucalyptus-disable-gwt-in-makefile.patch
deleted file mode 100644
index e80f866..0000000
--- a/eucalyptus-disable-gwt-in-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/clc/Makefile.orig 2012-06-29 11:29:29.000000000 +0000
-+++ b/clc/Makefile 2012-06-29 11:30:44.000000000 +0000
-@@ -152,22 +152,23 @@
- @touch .nogit
- endif
-
--update_properties: ${web_prop_dir}/eucalyptus-web.properties
-+update_properties:
-
- ${web_prop_dir}/eucalyptus-web.properties: ${web_prop_dir}/eucalyptus-web-default.properties ${TOP}/Makedefs
- @sed "s/\(^extensions =\).*/\1 ${extensions}/" < ${web_prop_dir}/eucalyptus-web-default.properties > ${web_prop_dir}/eucalyptus-web.properties
- @echo "Copied defaults to ${web_prop_dir}/eucalyptus-web.properties"
-
- update_theme:
-- @if test -d ${theme_dir}/${euca_theme} ; then \
-- if [ "`readlink ${theme_dir}/active`" != "${euca_theme}" ] ; then \
-- echo "Making '${euca_theme}' the active theme" ; \
-- rm -f ${theme_dir}/active ; \
-- ln -sf ${euca_theme} ${theme_dir}/active ; \
-- fi \
-- else \
-- echo "Theme ${theme_dir}/${euca_theme} is not found!"; exit 1; \
-- fi \
-+ echo "Disabling update_theme as GWT is not being used."
-+ #@if test -d ${theme_dir}/${euca_theme} ; then \
-+ # if [ "`readlink ${theme_dir}/active`" != "${euca_theme}" ] ; then \
-+ # echo "Making '${euca_theme}' the active theme" ; \
-+ # rm -f ${theme_dir}/active ; \
-+ # ln -sf ${euca_theme} ${theme_dir}/active ; \
-+ # fi \
-+ #else \
-+ # echo "Theme ${theme_dir}/${euca_theme} is not found!"; exit 1; \
-+ #fi \
-
- extras: update_properties
- @if test -n "${euca_theme}" ; then \
diff --git a/eucalyptus-disable-gwt.patch b/eucalyptus-disable-gwt.patch
deleted file mode 100644
index 1d2c9c3..0000000
--- a/eucalyptus-disable-gwt.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java b/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
-index c499c6d..d1ead20 100644
---- a/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
-+++ b/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
-@@ -95,8 +95,8 @@ import com.eucalyptus.crypto.Certs;
- import com.eucalyptus.crypto.util.PEMFiles;
- import com.eucalyptus.util.Internets;
- import com.eucalyptus.ws.StackConfiguration;
--import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
--import com.google.gwt.safehtml.shared.SafeHtmlUtils;
-+//import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
-+//import com.google.gwt.safehtml.shared.SafeHtmlUtils;
-
- public class X509Download extends HttpServlet {
-
-@@ -313,11 +313,13 @@ public class X509Download extends HttpServlet {
- }
-
- public static String getError( String message ) {
-- SafeHtmlBuilder builder = new SafeHtmlBuilder( );
-- builder.append( SafeHtmlUtils.fromTrustedString( "<html><title>Getting credentials failed</title><body><div align=\"center\"><p><h1>Getting credentails failed</h1></p><p><img src=\"themes/active/logo.png\" /></p><p><h3 style=\"font-color: red;\">" ) );
-- builder.appendEscaped( message );
-- builder.append( SafeHtmlUtils.fromTrustedString( "</h3></p></div></body></html>" ) );
-- return builder.toSafeHtml( ).asString( );
-+ return "<html><title>Getting credentials failed</title><body><div align=\"center\"><p><h1>Getting credentails failed</h1></p><p><img src=\"themes/active/logo.png\" /></p><p><h3 style=\"font-color: red;\">"
-+ + message + "</h3></p></div></body></html>" ;
-+// SafeHtmlBuilder builder = new SafeHtmlBuilder( );
-+// builder.append( SafeHtmlUtils.fromTrustedString( "<html><title>Getting credentials failed</title><body><div align=\"center\"><p><h1>Getting credentails failed</h1></p><p><img src=\"themes/active/logo.png\" /></p><p><h3 style=\"font-color: red;\">" ) );
-+// builder.appendEscaped( message );
-+// builder.append( SafeHtmlUtils.fromTrustedString( "</h3></p></div></body></html>" ) );
-+// return builder.toSafeHtml( ).asString( );
- }
-
- }
---- a/clc/modules/www/conf/gwt-web.xml 2012-06-28 19:36:09.000000000 -0700
-+++ b/clc/modules/www/conf/gwt-web.xml 2012-06-28 19:37:37.000000000 -0700
-@@ -81,81 +81,15 @@
-
- <servlet>
- <description></description>
-- <display-name>EucalyptusService</display-name>
-- <servlet-name>EucalyptusServiceImpl</servlet-name>
-- <servlet-class>com.eucalyptus.webui.server.EucalyptusServiceImpl</servlet-class>
-- <load-on-startup>1</load-on-startup>
-- </servlet>
--
-- <servlet>
-- <description>Executes a command within Eucalyptus</description>
-- <display-name>Command Servlet</display-name>
-- <servlet-name>CommandServlet</servlet-name>
-- <servlet-class>com.eucalyptus.www.CommandServlet</servlet-class>
-- <load-on-startup>1</load-on-startup>
-- </servlet>
--
-- <servlet>
-- <description>New Report Generation Servlet</description>
-- <display-name>Report Servlet</display-name>
-- <servlet-name>ReportServlet</servlet-name>
-- <servlet-class>com.eucalyptus.www.ReportServlet</servlet-class>
-- <load-on-startup>1</load-on-startup>
-- </servlet>
--
-- <servlet>
-- <description>Logs into eucalyptus and returns a session id</description>
-- <display-name>Login Servlet</display-name>
-- <servlet-name>LoginServlet</servlet-name>
-- <servlet-class>com.eucalyptus.www.LoginServlet</servlet-class>
-- <load-on-startup>1</load-on-startup>
-- </servlet>
--
-- <servlet>
-- <description></description>
- <display-name>X509Downloader</display-name>
- <servlet-name>X509Download</servlet-name>
- <servlet-class>com.eucalyptus.www.X509Download</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
-- <servlet>
-- <description></description>
-- <display-name>CloudRegistration</display-name>
-- <servlet-name>CloudRegistration</servlet-name>
-- <servlet-class>com.eucalyptus.www.Registration</servlet-class>
-- <load-on-startup>1</load-on-startup>
-- </servlet>
--
--
-- <servlet-mapping>
-- <servlet-name>EucalyptusServiceImpl</servlet-name>
-- <url-pattern>/backend</url-pattern>
-- </servlet-mapping>
--
- <servlet-mapping>
- <servlet-name>X509Download</servlet-name>
- <url-pattern>/getX509</url-pattern>
- </servlet-mapping>
-
-- <servlet-mapping>
-- <servlet-name>CommandServlet</servlet-name>
-- <url-pattern>/commandservlet</url-pattern>
-- </servlet-mapping>
--
-- <servlet-mapping>
-- <servlet-name>LoginServlet</servlet-name>
-- <url-pattern>/loginservlet</url-pattern>
-- </servlet-mapping>
--
-- <servlet-mapping>
-- <servlet-name>ReportServlet</servlet-name>
-- <url-pattern>/reportservlet</url-pattern>
-- </servlet-mapping>
--
-- <servlet-mapping>
-- <servlet-name>CloudRegistration</servlet-name>
-- <url-pattern>/register</url-pattern>
-- </servlet-mapping>
--
- </web-app>
diff --git a/eucalyptus-disable-reporting.patch b/eucalyptus-disable-reporting.patch
deleted file mode 100644
index 4b379a9..0000000
--- a/eucalyptus-disable-reporting.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur eucalyptus-3.2.0git5ab72572/clc/modules/module-inc.order eucalyptus-3.2.0git5ab72572.good/clc/modules/module-inc.order
---- eucalyptus-3.2.0git5ab72572/clc/modules/module-inc.order 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572.good/clc/modules/module-inc.order 2012-12-11 12:39:04.515976887 -0500
-@@ -15,7 +15,7 @@
- cluster-manager
- notifications
- storage-common
--reporting
-+# reporting
- troubleshooting
- walrus
- storage-controller
diff --git a/eucalyptus-drop-backport-util-concurrent.patch b/eucalyptus-drop-backport-util-concurrent.patch
deleted file mode 100644
index f699f10..0000000
--- a/eucalyptus-drop-backport-util-concurrent.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 0237ff5b85b111f2ffed863fabfc51a590814822 Mon Sep 17 00:00:00 2001
-From: Marek Goldmann <goldmann(a)fedoraproject.org>
-Date: Wed, 28 Nov 2012 13:13:35 +0100
-Subject: [PATCH] Use java.util.concurrent from JDK, drop the use of
- backport-util-concurrent
-
----
- .../src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java | 2 +-
- .../src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java | 2 +-
- .../msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java | 2 +-
- .../msgs/src/main/java/com/eucalyptus/component/ComponentId.java | 2 +-
- .../src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java | 2 +-
- .../msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java | 2 +-
- clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java | 2 +-
- .../wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
-index b5b3430..9999287 100644
---- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
-+++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
-@@ -111,7 +111,7 @@ import com.google.common.base.Function;
- import com.google.common.base.Predicate;
- import com.google.common.collect.Iterables;
- import com.google.common.collect.Lists;
--import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-+import java.util.concurrent.TimeUnit;
- import edu.ucsb.eucalyptus.cloud.VirtualBootRecord;
- import edu.ucsb.eucalyptus.cloud.VmKeyInfo;
- import edu.ucsb.eucalyptus.cloud.VmRunResponseType;
-diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java
-index db01a04..48cd450 100644
---- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java
-+++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java
-@@ -72,7 +72,7 @@ import java.util.Properties;
- import org.apache.log4j.Logger;
- import com.google.common.collect.Maps;
- import com.google.common.io.Resources;
--import edu.emory.mathcs.backport.java.util.Collections;
-+import java.util.Collections;
-
- /**
- * Purpose: Show version information about the tree used to build the running software.
-diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
-index 631f74b..fdc492a 100644
---- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
-+++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
-@@ -31,7 +31,7 @@ import com.eucalyptus.ws.server.Pipelines;
- import com.google.common.base.Predicate;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
--import edu.emory.mathcs.backport.java.util.Arrays;
-+import java.util.Arrays;
- import edu.ucsb.eucalyptus.msgs.BaseMessage;
-
- public abstract class ComponentId implements HasName<ComponentId>, HasFullName<ComponentId>, Serializable {
-diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java
-index a8b064f..7474a79 100644
---- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java
-+++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java
-@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
- import org.apache.log4j.Logger;
- import com.eucalyptus.bootstrap.ServiceJarDiscovery;
- import com.google.common.collect.ObjectArrays;
--import edu.emory.mathcs.backport.java.util.Arrays;
-+import java.util.Arrays;
-
- public class PropertiesDiscovery extends ServiceJarDiscovery {
- private static Logger LOG = Logger.getLogger( PropertiesDiscovery.class );
-diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
-index aa2c7ce..30860f6 100644
---- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
-+++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
-@@ -30,7 +30,7 @@ import com.google.common.collect.ArrayListMultimap;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Multimap;
- import com.google.common.collect.Ordering;
--import edu.emory.mathcs.backport.java.util.Collections;
-+import java.util.Collections;
-
- @SuppressWarnings( "unchecked" )
- public class PersistenceContexts {
-diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java b/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
-index f408717..3a94a97 100644
---- a/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
-+++ b/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
-@@ -123,7 +123,7 @@ import com.google.common.collect.Collections2;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
- import com.google.common.primitives.Ints;
--import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
-+import java.util.concurrent.atomic.AtomicBoolean;
-
- /**
- * TODO:GRZE: wrong package should be .util
-diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java
-index 8772cd7..784d214 100644
---- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java
-+++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java
-@@ -92,7 +92,7 @@ import com.eucalyptus.util.Exceptions;
- import com.google.common.base.Predicate;
- import com.google.common.collect.Iterables;
- import com.google.common.collect.Maps;
--import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
-+import java.util.concurrent.atomic.AtomicBoolean;
-
- @Provides( Empyrean.class )
- @RunDuring( Bootstrap.Stage.RemoteServicesInit )
---- eucalyptus-3.3.0.32052445/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentMessages.java.orig 2013-03-28 17:32:16.000000000 -0400
-+++ eucalyptus-3.3.0.32052445/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentMessages.java 2013-04-06 16:14:24.897834979 -0400
-@@ -76,7 +76,7 @@
- import com.google.common.collect.Collections2;
- import com.google.common.collect.Iterables;
- import com.google.common.collect.Maps;
--import edu.emory.mathcs.backport.java.util.Collections;
-+import java.util.Collections;
- import edu.ucsb.eucalyptus.msgs.BaseMessage;
-
- public class ComponentMessages {
diff --git a/eucalyptus-groovy18.patch b/eucalyptus-groovy18.patch
deleted file mode 100644
index 6b45b4f..0000000
--- a/eucalyptus-groovy18.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ur eucalyptus-3.bzr1505.new/clc/modules/module-inc.xml eucalyptus-3.bzr1505/clc/modules/module-inc.xml
---- eucalyptus-3.bzr1505.new/clc/modules/module-inc.xml 2012-02-09 03:58:11.960546598 -0500
-+++ eucalyptus-3.bzr1505/clc/modules/module-inc.xml 2012-02-09 10:03:52.303521124 -0500
-@@ -118,6 +118,16 @@
- <include name="**/*" />
- </fileset>
- </path>
-+ <path id="srcpathjava">
-+ <fileset dir="${build.dir}">
-+ <include name="**/*.java" />
-+ </fileset>
-+ </path>
-+ <path id="srcpathgroovy">
-+ <fileset dir="${build.dir}">
-+ <include name="**/*.groovy" />
-+ </fileset>
-+ </path>
- <!--================================== copy conf ==================================-->
- <target name="copy-conf">
- <copy todir="${DESTDIR}${euca.conf.dir}">
-@@ -203,6 +203,18 @@
- <javac source="1.6" target="1.6" encoding="utf-8" debug="true" />
- </groovyc>
- </target>
-+ <target name="build-groovy-isolated" depends="should-build-groovy" unless="build.notRequired">
-+ <echo message="[COMPILE] ${builder.target} for ${ant.project.name}" />
-+ <antcall target="clean" />
-+ <mkdir dir="${build.dir}" />
-+ <mkdir dir="${conf.dir}" />
-+ <mkdir dir="${rsrc.dir}" />
-+ <mkdir dir="${test.dir}" />
-+ <mkdir dir="${src.dir}" />
-+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="classpath" />
-+ <groovyc srcdir="${src.dir}" classpathref="classpath" sourcepathref="srcpathgroovy" destdir="${build.dir}" verbose="true" listfiles="true"/>
-+ <javac srcdir="${src.dir}" classpathref="classpath" destdir="${build.dir}" deprecation="true" failonerror="true" debug="true" sourcepathref="srcpathjava" target="1.7" listfiles="true" encoding="UTF-8" />
-+ </target>
- <target name="builder-test">
- <antcall target="build-mkdirs" inheritall="true" inheritrefs="true" />
- <condition property="builder.target" value="build-${builder.suffix}" else="build-java">
-diff -ur eucalyptus-3.bzr1505.new/clc/modules/configuration/build.xml eucalyptus-3.bzr1505/clc/modules/configuration/build.xml
---- eucalyptus-3.bzr1505.new/clc/modules/configuration/build.xml 2012-02-09 02:24:49.000000000 -0500
-+++ eucalyptus-3.bzr1505/clc/modules/configuration/build.xml 2012-02-10 04:53:55.476262078 -0500
-@@ -61,7 +61,7 @@
- -->
-
- <project name="eucalyptus-config" basedir=".">
-- <property name="builder.suffix" value="groovy" />
-+ <property name="builder.suffix" value="groovy-isolated" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
-diff -ur eucalyptus-3.bzr1505.new/clc/modules/notifications/build.xml eucalyptus-3.bzr1505/clc/modules/notifications/build.xml
---- eucalyptus-3.bzr1505.new/clc/modules/notifications/build.xml 2012-02-09 02:24:49.000000000 -0500
-+++ eucalyptus-3.bzr1505/clc/modules/notifications/build.xml 2012-02-10 04:54:13.664260948 -0500
-@@ -61,7 +61,7 @@
- -->
-
- <project name="eucalyptus-notifications" basedir=".">
-- <property name="builder.suffix" value="groovy" />
-+ <property name="builder.suffix" value="groovy-isolated" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
-diff -ur eucalyptus-3.bzr1505.old/clc/modules/cloud/build.xml eucalyptus-3.bzr1505/clc/modules/cloud/build.xml
---- eucalyptus-3.bzr1505.old/clc/modules/cloud/build.xml 2012-02-09 02:24:49.000000000 -0500
-+++ eucalyptus-3.bzr1505/clc/modules/cloud/build.xml 2012-02-10 05:07:50.177185340 -0500
-@@ -62,7 +62,7 @@
-
- <project name="eucalyptus-cloud" basedir=".">
- <!--================================== BUILD TARGETS ==================================-->
-- <property name="builder.suffix" value="groovy" />
-+ <property name="builder.suffix" value="groovy-isolated" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
-diff -ur eucalyptus-3.2.0git5ab72572/clc/modules/tokens/build.xml eucalyptus-3.2.0git5ab72572.good/clc/modules/tokens/build.xml
---- eucalyptus-3.2.0git5ab72572/clc/modules/tokens/build.xml 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572.good/clc/modules/tokens/build.xml 2012-12-11 12:16:38.586519614 -0500
-@@ -19,7 +19,7 @@
- additional information or have any questions.
- -->
- <project name="eucalyptus-tokens" basedir=".">
-- <property name="builder.suffix" value="groovy" />
-+ <property name="builder.suffix" value="groovy-isolated" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
diff --git a/eucalyptus-jarlinks.txt b/eucalyptus-jarlinks.txt
deleted file mode 100644
index e86acb7..0000000
--- a/eucalyptus-jarlinks.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-/usr/share/java/activemq/kahadb.jar
-/usr/share/java/activemq/activeio-core.jar
-/usr/share/java/activemq/activemq-core.jar
-/usr/share/java/activemq/protobuf.jar
-/usr/share/java/ant.jar
-/usr/share/java/antlr.jar
-/usr/share/java/apache-commons-beanutils.jar
-/usr/share/java/apache-commons-cli.jar
-/usr/share/java/apache-commons-collections.jar
-/usr/share/java/apache-commons-compress.jar
-/usr/share/java/apache-commons-fileupload.jar
-/usr/share/java/apache-commons-io.jar
-/usr/share/java/apache-commons-jxpath.jar
-/usr/share/java/apache-commons-lang.jar
-/usr/share/java/apache-commons-logging-adapters.jar
-/usr/share/java/apache-commons-logging-api.jar
-/usr/share/java/apache-commons-logging.jar
-/usr/share/java/apache-commons-pool.jar
-/usr/share/java/axiom/axiom-api.jar
-/usr/share/java/axiom/axiom-dom.jar
-/usr/share/java/axiom/axiom-impl.jar
-/usr/share/java/bcel.jar
-/usr/share/java/bcprov.jar
-/usr/share/java/bsf.jar
-/usr/share/java/btm.jar
-/usr/share/java/cglib.jar
-/usr/share/java/commons-codec.jar
-/usr/share/java/commons-digester.jar
-/usr/share/java/dnsjava.jar
-/usr/share/java/dom4j.jar
-/usr/share/java/ehcache-core.jar
-/usr/share/java/ezmorph.jar
-/usr/share/java/geronimo-ejb.jar
-/usr/share/java/geronimo-jms.jar
-/usr/share/java/geronimo-jta.jar
-/usr/share/java/geronimo-validation.jar
-/usr/share/java/groovy.jar
-/usr/share/java/guava.jar
-/usr/share/java/ha-jdbc.jar
-/usr/share/java/hamcrest12/all.jar
-/usr/share/java/hibernate3/hibernate-core-3.jar
-/usr/share/java/hibernate3/hibernate-ehcache-3.jar
-/usr/share/java/hibernate3/hibernate-entitymanager-3.jar
-/usr/share/java/hibernate3/hibernate-jbosscache-3.jar
-/usr/share/java/hibernate3/hibernate-proxool-3.jar
-/usr/share/java/hibernate/hibernate-commons-annotations.jar
-/usr/share/java/hibernate-jpa-2.0-api.jar
-/usr/share/java/jakarta-commons-httpclient.jar
-/usr/share/java/javamail/mail.jar
-/usr/share/java/javassist.jar
-/usr/share/java/java-uuid-generator.jar
-/usr/share/java/jaxen.jar
-/usr/share/java/jbosscache-core.jar
-/usr/share/java/jboss-common-core.jar
-/usr/share/java/jboss-connector-1.6-api.jar
-/usr/share/java/jboss-logging/jboss-logging.jar
-/usr/share/java/jcip-annotations.jar
-/usr/share/java/jetty/jetty-annotations.jar
-/usr/share/java/jetty/jetty-client.jar
-/usr/share/java/jetty/jetty-continuation.jar
-/usr/share/java/jetty/jetty-deploy.jar
-/usr/share/java/jetty/jetty-http.jar
-/usr/share/java/jetty/jetty-io.jar
-/usr/share/java/jetty/jetty-jmx.jar
-/usr/share/java/jetty/jetty-jndi.jar
-/usr/share/java/jetty/jetty-plus.jar
-/usr/share/java/jetty/jetty-rewrite.jar
-/usr/share/java/jetty/jetty-security.jar
-/usr/share/java/jetty/jetty-server.jar
-/usr/share/java/jetty/jetty-servlet.jar
-/usr/share/java/jetty/jetty-servlets.jar
-/usr/share/java/jetty/jetty-util.jar
-/usr/share/java/jetty/jetty-webapp.jar
-/usr/share/java/jetty/jetty-xml.jar
-/usr/share/java/jgroups212.jar
-/usr/share/java/jibx/bind.jar
-/usr/share/java/jibx/extras.jar
-/usr/share/java/jibx/run.jar
-/usr/share/java/jibx/schema.jar
-/usr/share/java/jibx/tools.jar
-/usr/share/java/jsch.jar
-/usr/share/java/json-lib.jar
-/usr/share/java/jsr-305.jar
-/usr/share/java/junit4.jar
-/usr/share/java/log4j.jar
-/usr/share/java/mule/mule-core.jar
-/usr/share/java/mule/mule-module-builders.jar
-/usr/share/java/mule/mule-module-client.jar
-/usr/share/java/mule/mule-module-spring-config.jar
-/usr/share/java/mule/mule-module-xml.jar
-/usr/share/java/mule/mule-transport-vm.jar
-/usr/share/java/netty31.jar
-/usr/share/java/objectweb-asm/asm-all.jar
-/usr/share/java/proxool.jar
-/usr/share/java/qname.jar
-/usr/share/java/quartz.jar
-/usr/share/java/regexp.jar
-/usr/share/java/rhq-plugin-annotations.jar
-/usr/share/java/slf4j/api.jar
-/usr/share/java/slf4j/jcl-over-slf4j.jar
-/usr/share/java/slf4j/jul-to-slf4j.jar
-/usr/share/java/slf4j/log4j12.jar
-/usr/share/java/springframework/spring-beans.jar
-/usr/share/java/springframework/spring-context.jar
-/usr/share/java/springframework/spring-context-support.jar
-/usr/share/java/springframework/spring-core.jar
-/usr/share/java/springframework/spring-expression.jar
-/usr/share/java/springframework/spring-web.jar
-/usr/share/java/stax2-api.jar
-/usr/share/java/tomcat-el-2.2-api.jar
-/usr/share/java/tomcat-servlet-3.0-api.jar
-/usr/share/java/velocity.jar
-/usr/share/java/woodstox-core.jar
-/usr/share/java/wsdl4j.jar
-/usr/share/java/wss4j/wss4j.jar
-/usr/share/java/xalan-j2.jar
-/usr/share/java/xalan-j2-serializer.jar
-/usr/share/java/xerces-j2.jar
-/usr/share/java/xml-commons-apis.jar
-/usr/share/java/xml-security.jar
-/usr/share/java/xom.jar
-/usr/share/java/xpp3.jar
-/usr/share/java/xstream.jar
diff --git a/eucalyptus-javah-classpath.patch b/eucalyptus-javah-classpath.patch
deleted file mode 100644
index 6b83f47..0000000
--- a/eucalyptus-javah-classpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eucalyptus-3.3.0.32052445/clc/modules/storage-controller/build.xml.orig 2013-03-28 17:32:16.000000000 -0400
-+++ eucalyptus-3.3.0.32052445/clc/modules/storage-controller/build.xml 2013-04-08 10:05:25.072742075 -0400
-@@ -74,7 +74,7 @@
- <antcall target="build-java" />
- <antcall target="jar" />
- <mkdir dir="include" />
-- <javah classpath="${build.dir}:${modules.dir}/core/build:${modules.dir}/msgs/build:${modules.dir}/storage-common/build:${lib.dir}/groovy-all-1.7.2.jar:${lib.dir}/hibernate-3.5.6-Final.jar" destdir="include" force="yes">
-+ <javah classpath="${build.dir}:${modules.dir}/core/build:${modules.dir}/msgs/build:${modules.dir}/storage-common/build:${lib.dir}/groovy.jar:${lib.dir}/hibernate-core-3.jar" destdir="include" force="yes">
- <class name="com.eucalyptus.storage.OverlayManager" />
- <class name="com.eucalyptus.storage.DASManager" />
- </javah>
diff --git a/eucalyptus-jdk7.patch b/eucalyptus-jdk7.patch
deleted file mode 100644
index 5716ab4..0000000
--- a/eucalyptus-jdk7.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/clc/modules/module-inc.xml b/clc/modules/module-inc.xml
-index 2315bee..10f38c9 100644
---- a/clc/modules/module-inc.xml
-+++ b/clc/modules/module-inc.xml
-@@ -171,7 +171,7 @@
- <echo message="[COMPILE] ${builder.target} for ${ant.project.name}" />
- <antcall target="clean" />
- <antcall target="build-mkdirs" inheritall="true" inheritrefs="true" />
-- <javac srcdir="${src.dir}" classpathref="classpath" destdir="${build.dir}" deprecation="false" failonerror="true" debug="true" sourcepathref="srcpath" target="1.5" listfiles="true" />
-+ <javac srcdir="${src.dir}" classpathref="classpath" destdir="${build.dir}" deprecation="false" failonerror="true" debug="true" sourcepathref="srcpath" source="1.6" target="1.6" listfiles="true" />
- </target>
- <target name="should-build-groovy">
- <mkdir dir="${build.dir}" />
-@@ -185,7 +185,7 @@
- <antcall target="build-mkdirs" inheritall="true" inheritrefs="true" />
- <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="classpath" />
- <groovyc srcdir="${src.dir}" classpathref="classpath" sourcepathref="srcpath" destdir="${build.dir}" verbose="true" listfiles="true">
-- <javac target="1.5" debug="true" />
-+ <javac source="1.6" target="1.6" debug="true" />
- </groovyc>
- </target>
- <target name="builder-test">
-diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java
-index 4e458f5..1c44c55 100644
---- a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java
-+++ b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/BaseMessage.java
-@@ -216,7 +216,7 @@ public class BaseMessage {
- try {
- Class responseClass = ClassLoader.getSystemClassLoader( ).loadClass( replyType );
- reply = ( TYPE ) responseClass.newInstance( );
-- reply.correlationId = this.correlationId;
-+ reply.setCorrelationId ( this.correlationId );
- } catch ( Exception e ) {
- Logger.getLogger( BaseMessage.class ).debug( e, e );
- throw new TypeNotPresentException( this.correlationId, e );
-diff --git a/clc/modules/storage-controller/build.xml b/clc/modules/storage-controller/build.xml
-index 625fccb..6b80c8a 100644
---- a/clc/modules/storage-controller/build.xml
-+++ b/clc/modules/storage-controller/build.xml
-@@ -74,7 +74,7 @@
- <antcall target="build-java" />
- <antcall target="jar" />
- <mkdir dir="include" />
-- <javah classpath="${build.dir}" destdir="include" force="yes">
-+ <javah classpath="${build.dir}:${modules.dir}/core/build:${modules.dir}/msgs/build:${modules.dir}/storage-common/build:/usr/share/java/groovy.jar" destdir="include" force="yes">
- <class name="com.eucalyptus.storage.OverlayManager" />
- <class name="com.eucalyptus.storage.AOEManager" />
- <class name="com.eucalyptus.storage.DASManager" />
diff --git a/eucalyptus-jetty-logging.patch b/eucalyptus-jetty-logging.patch
deleted file mode 100644
index d40981f..0000000
--- a/eucalyptus-jetty-logging.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN eucalyptus-3.2.1/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java eucalyptus-3.2.1.new/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java
---- eucalyptus-3.2.1/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java 2013-02-28 14:02:03.161907116 -0500
-+++ eucalyptus-3.2.1.new/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java 2013-02-28 22:02:51.845870758 -0500
-@@ -225,7 +225,7 @@
- capacity = (capacity > 1 ? capacity - 1 : capacity);
-
- } catch(Exception e) {
-- Log.warn("Unable to detect usable space in the directory:" + WalrusProperties.bucketRootDirectory + " because of exception: " + e.getMessage() + ". Using Walrus default: " + WalrusProperties.DEFAULT_INITIAL_CAPACITY + "GB");
-+ // Log.warn("Unable to detect usable space in the directory:" + WalrusProperties.bucketRootDirectory + " because of exception: " + e.getMessage() + ". Using Walrus default: " + WalrusProperties.DEFAULT_INITIAL_CAPACITY + "GB");
- }
- return capacity;
- }
-diff -urN eucalyptus-3.2.1/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java eucalyptus-3.2.1.new/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java
---- eucalyptus-3.2.1/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java 2013-02-28 14:02:03.160907102 -0500
-+++ eucalyptus-3.2.1.new/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java 2013-02-28 22:03:07.611087579 -0500
-@@ -482,7 +482,7 @@
- }
-
- private int getChunkSize( String hex ) {
-- Log.info( "Chunk Size Hex to parse:" + hex );
-+ // Log.info( "Chunk Size Hex to parse:" + hex );
- hex = hex.replaceAll( "\\W", "" ).trim( );
- for ( int i = 0; i < hex.length( ); i++ ) {
- char c = hex.charAt( i );
-@@ -491,7 +491,7 @@
- break;
- }
- }
-- Log.info( "Chunk Size in Hex:" + hex );
-+ // Log.info( "Chunk Size in Hex:" + hex );
- return Integer.parseInt( hex, 16 );
- }
-
diff --git a/eucalyptus-jetty-ssl-config.patch b/eucalyptus-jetty-ssl-config.patch
deleted file mode 100644
index ec1caf2..0000000
--- a/eucalyptus-jetty-ssl-config.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -urN eucalyptus-3.2.1.new/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java eucalyptus-3.2.1/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java
---- eucalyptus-3.2.1.new/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java 2013-02-28 14:02:03.160907102 -0500
-+++ eucalyptus-3.2.1/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java 2013-03-01 09:13:04.881625622 -0500
-@@ -70,7 +70,7 @@
- import java.nio.channels.SocketChannel;
- import org.apache.log4j.Logger;
- import org.eclipse.jetty.server.Server;
--import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
-+// import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
- import org.eclipse.jetty.xml.XmlConfiguration;
- import com.eucalyptus.component.id.Eucalyptus;
- import com.eucalyptus.component.id.HttpService;
-@@ -252,7 +252,7 @@
- }
- }
-
-- public static final class ConfiguredSslSelectChannelConnector extends SslSelectChannelConnector {
-+ /* public static final class ConfiguredSslSelectChannelConnector extends SslSelectChannelConnector {
- protected SSLEngine createSSLEngine() throws IOException {
- SocketChannel channel = SocketChannel.open();
- return super.createSSLEngine(channel);
-@@ -264,5 +264,5 @@
- engine.setEnabledCipherSuites( getEnabledCipherSuites(HTTPS_CIPHERS, engine.getSupportedCipherSuites()) );
- return engine;
- }
-- }
-+ } */
- }
-diff -urN eucalyptus-3.2.1.new/clc/modules/www/src/main/resources/eucalyptus-jetty.xml eucalyptus-3.2.1/clc/modules/www/src/main/resources/eucalyptus-jetty.xml
---- eucalyptus-3.2.1.new/clc/modules/www/src/main/resources/eucalyptus-jetty.xml 2013-02-28 14:02:03.161907116 -0500
-+++ eucalyptus-3.2.1/clc/modules/www/src/main/resources/eucalyptus-jetty.xml 2013-03-01 09:09:47.611172790 -0500
-@@ -63,26 +63,47 @@
- -->
-
- <Configure id="Server" class="org.eclipse.jetty.server.Server">
-+ <!-- =========================================================== -->
-+ <!-- Setup the SSL Context factory used to establish all TLS -->
-+ <!-- Connections and session. -->
-+ <!-- -->
-+ <!-- Consult the javadoc of o.e.j.util.ssl.SslContextFactory -->
-+ <!-- o.e.j.server.HttpConnectionFactory for all configuration -->
-+ <!-- that may be set here. -->
-+ <!-- =========================================================== -->
-+ <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-+ <Set name="KeyStorePath"><SystemProperty name="euca.var.dir" default="conf" />/keys/euca.p12</Set>
-+ <Set name="KeyStorePassword">eucalyptus</Set>
-+ <Set name="KeyStoreType">pkcs12</Set>
-+ <Set name="KeyManagerPassword">eucalyptus</Set>
-+ <Set name="TrustStorePath"><SystemProperty name="euca.var.dir" default="conf" />/keys/euca.p12</Set>
-+ <Set name="TrustStorePassword">eucalyptus</Set>
-+ <Set name="TrustStoreType">pkcs12</Set>
-+ </New>
-+
- <Call name="addConnector">
- <Arg>
-- <New class="com.eucalyptus.bootstrap.HttpServerBootstrapper$ConfiguredSslSelectChannelConnector">
-- <Set name="Port">
-+ <New class="org.eclipse.jetty.server.ServerConnector">
-+ <Arg name="server"><Ref refid="Server" /></Arg>
-+ <Arg name="factories">
-+ <Array type="org.eclipse.jetty.server.ConnectionFactory">
-+ <Item>
-+ <New class="org.eclipse.jetty.server.SslConnectionFactory">
-+ <Arg name="next">http/1.1</Arg>
-+ <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
-+ </New>
-+ </Item>
-+ <Item>
-+ <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-+ <Arg name="config"><Ref refid="tlsHttpConfig"/></Arg>
-+ </New>
-+ </Item>
-+ </Array>
-+ </Arg>
-+ <Set name="port">
- <SystemProperty name="euca.https.port" default="8443" />
- </Set>
-- <Set name="maxIdleTime">30000</Set>
-- <Set name="keystoreType">pkcs12</Set>
-- <Set name="truststoreType">pkcs12</Set>
-- <Set name="keystore"><SystemProperty name="euca.var.dir" default="conf" />/keys/euca.p12</Set>
-- <Set name="truststore"><SystemProperty name="euca.var.dir" default="conf" />/keys/euca.p12</Set>
-- <Set name="password">eucalyptus</Set>
-- <Set name="keyPassword">eucalyptus</Set>
-- <Set name="trustPassword">eucalyptus</Set>
-- <!-- Set name="ThreadPool">
-- <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
-- <Set name="minThreads">10</Set>
-- <Set name="maxThreads">25</Set>
-- </New>
-- </Set -->
-+ <Set name="idleTimeout">30000</Set>
- </New>
- </Arg>
- </Call>
diff --git a/eucalyptus-jetty8.patch b/eucalyptus-jetty8.patch
deleted file mode 100644
index de22a05..0000000
--- a/eucalyptus-jetty8.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -ur eucalyptus-3.bzr1505/clc/modules/www/src/main/java/com/eucalyptus/www/Redirect.java eucalyptus-3.bzr1505.new/clc/modules/www/src/main/java/com/eucalyptus/www/Redirect.java
---- eucalyptus-3.bzr1505/clc/modules/www/src/main/java/com/eucalyptus/www/Redirect.java 2012-02-09 02:24:49.000000000 -0500
-+++ eucalyptus-3.bzr1505.new/clc/modules/www/src/main/java/com/eucalyptus/www/Redirect.java 2012-02-09 04:33:05.473353310 -0500
-@@ -7,7 +7,7 @@
- import javax.servlet.http.HttpServletResponse;
-
- import org.apache.log4j.Logger;
--import org.mortbay.jetty.handler.rewrite.Rule;
-+import org.eclipse.jetty.rewrite.handler.Rule;
- import com.eucalyptus.bootstrap.HttpServerBootstrapper;
- import com.eucalyptus.component.ServiceConfiguration;
- import com.eucalyptus.component.Topology;
-diff -ur eucalyptus-3.bzr1505/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanTransactionManager.java eucalyptus-3.bzr1505.new/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanTransactionManager.java
---- eucalyptus-3.bzr1505/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanTransactionManager.java 2012-02-09 02:24:49.000000000 -0500
-+++ eucalyptus-3.bzr1505.new/clc/modules/msgs/src/main/java/com/eucalyptus/empyrean/EmpyreanTransactionManager.java 2012-02-09 05:31:39.500028619 -0500
-@@ -13,7 +13,7 @@
- import com.eucalyptus.bootstrap.SystemIds;
- import com.eucalyptus.system.SubDirectory;
-
--public class EmpyreanTransactionManager extends org.mortbay.component.AbstractLifeCycle implements org.jboss.cache.transaction.TransactionManagerLookup, org.hibernate.transaction.TransactionManagerLookup {
-+public class EmpyreanTransactionManager extends org.eclipse.jetty.util.component.AbstractLifeCycle implements org.jboss.cache.transaction.TransactionManagerLookup, org.hibernate.transaction.TransactionManagerLookup {
- // public static final String JNDI_NAME = "eucalyptusTransactionManager";
- private static Logger LOG = Logger.getLogger( EmpyreanTransactionManager.class );
- private static Context ctx = getContext( );
-diff -ur eucalyptus-3.1.0/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java eucalyptus-3.1.0.new/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java
---- eucalyptus-3.1.0/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java 2012-06-19 14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0.new/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/http/NioHttpDecoder.java 2012-06-19 14:41:48.000000000 -0400
-@@ -64,7 +64,7 @@
- import org.jboss.netty.handler.codec.http.HttpResponse;
- import org.jboss.netty.handler.codec.http.HttpVersion;
- import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-
- import com.eucalyptus.context.Context;
- import com.eucalyptus.context.Contexts;
-diff -ur eucalyptus-3.1.0/clc/modules/www.orig/conf/www/admin.xml eucalyptus-3.1.0/clc/modules/www/conf/www/admin.xml
---- eucalyptus-3.1.0/clc/modules/www.orig/conf/www/admin.xml 2012-06-19 14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0/clc/modules/www/conf/www/admin.xml 2012-08-07 11:34:32.191760020 -0400
-@@ -64,7 +64,7 @@
- -->
-
- <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
--<Configure class="org.mortbay.jetty.webapp.WebAppContext">
-+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
- <Set name="contextPath">/</Set>
- <Set name="parentLoaderPriority">true</Set>
- <Set name="logUrlOnStart">true</Set>
-diff -ur eucalyptus-3.1.0/clc/modules/www.orig/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java eucalyptus-3.1.0/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java
---- eucalyptus-3.1.0/clc/modules/www.orig/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java 2012-08-07 11:29:11.908789566 -0400
-+++ eucalyptus-3.1.0/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java 2012-08-07 11:34:41.070759181 -0400
-@@ -65,10 +65,11 @@
- import java.io.FileNotFoundException;
- import java.io.IOException;
- import java.net.URL;
-+import java.nio.channels.SocketChannel;
- import org.apache.log4j.Logger;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.security.SslSelectChannelConnector;
--import org.mortbay.xml.XmlConfiguration;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
-+import org.eclipse.jetty.xml.XmlConfiguration;
- import com.eucalyptus.component.id.Eucalyptus;
- import com.eucalyptus.component.id.HttpService;
- import com.eucalyptus.configurable.ConfigurableClass;
-@@ -119,7 +119,8 @@
- if ( System.getProperty( "http.proxyPort" ) != null ) {
- httpProxyPort = System.getProperty( "http.proxyPort" );
- }
-- jettyServer = new org.mortbay.jetty.Server( );
-+ jettyServer = new org.eclipse.jetty.server.Server( );
-+ System.setProperty( "org.eclipse.jetty.util.log.DEBUG", "true" );
- System.setProperty( "euca.http.port", "" + HTTP_PORT );
- System.setProperty( "euca.https.port", "" + HTTPS_PORT );
- URL defaultConfig = ClassLoader.getSystemResource( "eucalyptus-jetty.xml" );
-@@ -241,9 +251,14 @@
- }
-
- public static final class ConfiguredSslSelectChannelConnector extends SslSelectChannelConnector {
-- @Override
- protected SSLEngine createSSLEngine() throws IOException {
-- final SSLEngine engine = super.createSSLEngine();
-+ SocketChannel channel = SocketChannel.open();
-+ return super.createSSLEngine(channel);
-+ }
-+
-+ @Override
-+ protected SSLEngine createSSLEngine(SocketChannel channel) throws IOException {
-+ final SSLEngine engine = super.createSSLEngine(channel);
- engine.setEnabledCipherSuites( getEnabledCipherSuites(HTTPS_CIPHERS, engine.getSupportedCipherSuites()) );
- return engine;
- }
-diff -ur eucalyptus-3.1.0/clc/modules/www.orig/src/main/resources/eucalyptus-jetty.xml eucalyptus-3.1.0/clc/modules/www/src/main/resources/eucalyptus-jetty.xml
---- eucalyptus-3.1.0/clc/modules/www.orig/src/main/resources/eucalyptus-jetty.xml 2012-06-19 14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0/clc/modules/www/src/main/resources/eucalyptus-jetty.xml 2012-08-07 11:34:25.586760613 -0400
-@@ -62,7 +62,7 @@
- NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS.
- -->
-
--<Configure id="Server" class="org.mortbay.jetty.Server">
-+<Configure id="Server" class="org.eclipse.jetty.server.Server">
- <Call name="addConnector">
- <Arg>
- <New class="com.eucalyptus.bootstrap.HttpServerBootstrapper$ConfiguredSslSelectChannelConnector">
-@@ -77,14 +77,12 @@
- <Set name="password">eucalyptus</Set>
- <Set name="keyPassword">eucalyptus</Set>
- <Set name="trustPassword">eucalyptus</Set>
-- <Set name="ThreadPool">
-- <New class="org.mortbay.thread.QueuedThreadPool">
-+ <!-- Set name="ThreadPool">
-+ <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
- <Set name="minThreads">10</Set>
- <Set name="maxThreads">25</Set>
-- <Set name="lowThreads">5</Set>
-- <Set name="SpawnOrShrinkAt">2</Set>
- </New>
-- </Set>
-+ </Set -->
- </New>
- </Arg>
- </Call>
-@@ -90,7 +90,7 @@
- </Call>
- <Call name="addConnector">
- <Arg>
-- <New class="org.mortbay.jetty.nio.SelectChannelConnector">
-+ <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <Set name="Port">
- <SystemProperty name="euca.http.port" default="8080" />
- </Set>
-@@ -98,26 +98,26 @@
- </Arg>
- </Call>
- <Set name="handler">
-- <New id="Handlers" class="org.mortbay.jetty.handler.rewrite.RewriteHandler">
-+ <New id="Handlers" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
- <Set name="rules">
-- <Array type="org.mortbay.jetty.handler.rewrite.Rule">
-+ <Array type="org.eclipse.jetty.rewrite.handler.Rule">
- <Item>
- <New id="httpsRedirect" class="com.eucalyptus.www.Redirect" />
- </Item>
- </Array>
- </Set>
- <Set name="handler">
-- <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
-+ <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
- <Set name="handlers">
-- <Array type="org.mortbay.jetty.Handler">
-+ <Array type="org.eclipse.jetty.server.Handler">
- <Item>
-- <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection" />
-+ <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection" />
- </Item>
- <Item>
-- <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler" />
-+ <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler" />
- </Item>
- <Item>
-- <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler" />
-+ <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler" />
- </Item>
- </Array>
- </Set>
-@@ -132,7 +132,7 @@
- </Call>
- <Call name="addLifeCycle">
- <Arg>
-- <New class="org.mortbay.jetty.deployer.ContextDeployer">
-+ <New class="org.eclipse.jetty.deploy.ContextDeployer">
- <Set name="contexts">
- <Ref id="Contexts" />
- </Set>
-@@ -144,7 +144,7 @@
- </Call>
- <Ref id="RequestLog">
- <Set name="requestLog">
-- <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
-+ <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><SystemProperty name="euca.log.dir" default="./log" />/jetty-request-yyyy_mm_dd.log</Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
- <Set name="retainDays">90</Set>
-diff -ur eucalyptus-3.1.0/clc/modules/core/src/main/resources/log4j.xml eucalyptus-3.1.0.patched/clc/modules/core/src/main/resources/log4j.xml
---- eucalyptus-3.1.0/clc/modules/core/src/main/resources/log4j.xml 2012-06-19 14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0.patched/clc/modules/core/src/main/resources/log4j.xml 2012-08-08 14:44:16.357733943 -0400
-@@ -301,7 +301,7 @@
- <priority value="${euca.log.level}" />
- <appender-ref ref="cloud-exhaust" />
- </category>
-- <category name="org.mortbay" additivity="false">
-+ <category name="org.eclipse.jetty" additivity="false">
- <priority value="${euca.log.level}" />
- <appender-ref ref="cloud-exhaust" />
- </category>
-diff -ur eucalyptus-3.2.0git5ab72572/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java eucalyptus-3.2.0git5ab72572.good/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java
---- eucalyptus-3.2.0git5ab72572/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572.good/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/WalrusInfo.java 2012-12-11 12:06:37.423401474 -0500
-@@ -72,7 +72,7 @@
- import javax.persistence.Table;
- import org.hibernate.annotations.Cache;
- import org.hibernate.annotations.CacheConcurrencyStrategy;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-
- import com.eucalyptus.configurable.ConfigurableClass;
- import com.eucalyptus.configurable.ConfigurableField;
diff --git a/eucalyptus-jni-abspath.patch b/eucalyptus-jni-abspath.patch
deleted file mode 100644
index 05293e1..0000000
--- a/eucalyptus-jni-abspath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- eucalyptus-3.1.0.orig/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/OverlayManager.java 2012-08-16 23:14:00.640939401 -0400
-+++ eucalyptus-3.1.0/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/OverlayManager.java 2012-08-27 14:18:56.459491065 -0400
-@@ -91,6 +91,7 @@
- import com.eucalyptus.crypto.Ciphers;
- import com.eucalyptus.entities.EntityWrapper;
- import com.eucalyptus.storage.StorageManagers.StorageManagerProperty;
-+import com.eucalyptus.system.BaseDirectory;
- import com.eucalyptus.util.EucalyptusCloudException;
- import com.eucalyptus.util.StorageProperties;
- import com.eucalyptus.util.WalrusProperties;
-@@ -287,7 +288,7 @@
- }
- //The following should be executed only once during the entire lifetime of the VM.
- if(!initialized) {
-- System.loadLibrary("lvm2control");
-+ System.load(BaseDirectory.JNI.toString() + "/liblvm2control.so");
- registerSignals();
- initialized = true;
- }
---- eucalyptus-3.2.0git5ab72572.orig/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/DASManager.java 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/DASManager.java 2012-12-11 14:26:02.451443203 -0500
-@@ -289,7 +289,7 @@
-
- public void initialize() {
- if(!initialized) {
-- System.loadLibrary("dascontrol");
-+ System.load(BaseDirectory.JNI.toString() + "/libdascontrol.so");
- registerSignals();
- initialized = true;
- }
diff --git a/eucalyptus-move-version-file.patch b/eucalyptus-move-version-file.patch
deleted file mode 100644
index cd35a41..0000000
--- a/eucalyptus-move-version-file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eucalyptus-3.1.0.orig/tools/euca_conf.in 2012-06-19 14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0/tools/euca_conf.in 2012-08-27 16:39:21.337567567 -0400
-@@ -750,6 +750,8 @@
-
- if [ -e $EUCALYPTUS/etc/eucalyptus/eucalyptus-version ]; then
- VERSION="$EUCALYPTUS/etc/eucalyptus/eucalyptus-version"
-+ elif [ -e /usr/share/eucalyptus/eucalyptus-version ]; then
-+ VERSION="/usr/share/eucalyptus/eucalyptus-version"
- elif [ -e @prefix@/etc/eucalyptus/eucalyptus-version ]; then
- VERSION="@prefix@/etc/eucalyptus/eucalyptus-version"
- fi
diff --git a/eucalyptus-nc-libvirt.rules b/eucalyptus-nc-libvirt.rules
deleted file mode 100644
index e5e2b64..0000000
--- a/eucalyptus-nc-libvirt.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-polkit.addRule(function(action, subject) {
- if (action.id == "org.libvirt.unix.manage" &&
- subject.user == "eucalyptus") {
- polkit.log("action=" + action.id);
- polkit.log("subject=" + subject);
- polkit.log("Returning " + polkit.Result.YES);
- return polkit.Result.YES;
- }
- polkit.log("Returning " + polkit.Result.NOT_HANDLED + " for user " + subject.user);
- return polkit.Result.NOT_HANDLED;
-});
diff --git a/eucalyptus-nc.init b/eucalyptus-nc.init
deleted file mode 100755
index 7157a14..0000000
--- a/eucalyptus-nc.init
+++ /dev/null
@@ -1,371 +0,0 @@
-#!/bin/bash
-#Copyright (c) 2009 Eucalyptus Systems, Inc.
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, only version 3 of the License.
-#
-#This file is distributed in the hope that it will be useful, but WITHOUT
-#ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-#for more details.
-#
-#You should have received a copy of the GNU General Public License along
-#with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#Please contact Eucalyptus Systems, Inc., 130 Castilian
-#Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
-#if you need additional information or have any questions.
-#
-#This file may incorporate work covered under the following copyright and
-#permission notice:
-#
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Regents of the University of California
-#
-#
-# Redistribution and use of this software in source and binary forms, with
-# or without modification, are permitted provided that the following
-# conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF
-# THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-# LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-# SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-# IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-# BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-# THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-# OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-# WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-# ANY SUCH LICENSES OR RIGHTS.
-#
-
-#
-# Init script for the Eucalyptus node controller.
-#
-# chkconfig: 2345 99 05
-# description: script for starting and stopping eucalyptus node controller
-#
-### BEGIN INIT INFO
-# Provides: eucalyptus-nc
-# Required-Start: $remote_fs $syslog libvirtd
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start Eucalyptus node controller
-# Description: Start the Eucalyptus node controller
-### END INIT INFO
-#
-
-# Do NOT "set -e"
-
-# if we have lsb functions let's source them
-WE_HAVE_LSB="N"
-if [ -e /lib/lsb/init-functions ]; then
- . /lib/lsb/init-functions
- # very old lsb don't have the functions we need
- if type log_daemon_msg > /dev/null 2> /dev/null ; then
- WE_HAVE_LSB="Y"
- fi
-fi
-
-if [ "$EUID" != "0" ]; then
- echo "Eucalyptus init scritps must be run as root."
- exit 1
-fi
-
-# I just wanted to set PATH to be the system PATH, but if a user install
-# eucalyptus manually, it may have binaries in a non-standard position:
-# hence we need to keep the PATH we receive.
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
-DESC="Eucalyptus services"
-NAME=eucalyptus-nc
-BRCTL="`which brctl 2> /dev/null`"
-MODPROBE="`which modprobe 2> /dev/null`"
-EUCA_USER="eucalyptus"
-
-export EUCALYPTUS="/"
-. $EUCALYPTUS/etc/eucalyptus/eucalyptus.conf
-EUCAHELPERDIR=$EUCALYPTUS/usr/share/eucalyptus
-EUCASBINDIR=$EUCALYPTUS/usr/sbin
-EUCACONFDIR=$EUCALYPTUS/etc/eucalyptus
-EUCADATADIR=$EUCALYPTUS/usr/share/eucalyptus
-EUCARUNDIR=$EUCALYPTUS/var/run/eucalyptus
-EUCALOGDIR=$EUCALYPTUS/var/log/eucalyptus
-LIBDIR=@LIBDIR@
-
-# crude way to start the axis2c services
-do_start() {
- # fixes #469984
- IPTABLES="`which iptables 2> /dev/null`"
- if [ -n "$IPTABLES" ]; then
- [ -x $IPTABLES ] && $IPTABLES -L -n > /dev/null 2> /dev/null
- fi
-
- if [ ! -x $EUCASBINDIR/euca_conf ]; then
- echo "Some eucalyptus components are missing"
- exit 1
- fi
-
- # Add loop devices if necessary (and possible)
- [ -z "$CREATE_NC_LOOP_DEVICES" ] && CREATE_NC_LOOP_DEVICES=256
- if [ "$CREATE_NC_LOOP_DEVICES" -gt 0 ] 2>/dev/null; then
- "$EUCAHELPERDIR/create-loop-devices" $CREATE_NC_LOOP_DEVICES
- fi
-
- # let's see how many loop devices we have available
- LOOP_AVL_DEV="`/bin/ls -1d /dev/loop* 2>/dev/null | wc -l`"
- LOOP_AVL_SYS="`/bin/ls -1d /sys/block/loop* 2>/dev/null | wc -l`"
- if [ -z "$LOOP_AVL_DEV" -o "$LOOP_AVL_DEV" = "0" ]; then
- echo "warning: no loop devices found in /dev; expect problems" >&2
- elif [ $LOOP_AVL_DEV -lt 50 ]; then
- echo "warning: found $LOOP_AVL_DEV loop devices in /dev; at least 50 are recommended" >&2
- elif [ -z "$LOOP_AVL_SYS" -o "$LOOP_AVL_SYS" -lt "$LOOP_AVL_DEV" ] && [[ `uname -r` < 2.6.22 ]]; then # The version comparison does not work in every shell
- # When then loop driver's max_loop option is not 0, loop device nodes
- # that are not automatically created by the kernel do not work. We can
- # check for this case by looking for too few loop device entries in
- # sysfs.
- #
- # Trying to determine whether or not max_loop is 0 is difficult on
- # Linux 2, so in general we make no attempt to do so. However, max_loop
- # *cannot* be 0 on Linux < 2.6.22, so we perform this check on those
- # systems so it will hopefully cover the majority of cases.
- echo "warning: found fewer loop devices in /sys/block than in /dev ($LOOP_AVL_SYS < $LOOP_AVL_DEV); expect problems"
- fi
-
- if ! $EUCASBINDIR/euca_conf --check nc ; then
- exit 1
- fi
-
- # we have a program to test the hypervisor and more for the NC
- if [ ! -x $EUCASBINDIR/euca_test_nc ]; then
- echo
- echo "Cannot check Node Controller: missing euca_test_nc."
- else
- # sometimes, libvirtd takes some time to start on init, so retry euca_test_nc a few times before failing
- for i in 1 2 3 4 5
- do
- PASSED=0
- if ( $EUCASBINDIR/euca_test_nc $HYPERVISOR > $EUCALOGDIR/euca_test_nc.log 2>&1 ); then
- PASSED=1
- else
- sleep 1
- fi
- done
- if ( test $PASSED = "0" ); then
- echo
- echo "Node Controller cannot be started: errors in $EUCALOGDIR/euca_test_nc.log"
- exit 1
- fi
- fi
-
- # on SYSTEM or STATIC mode the bridge needs to exists
- if [ "$VNET_MODE" = "SYSTEM" -o "$VNET_MODE" = "STATIC" ]; then
- if [ -n "$BRCTL" -a -x $BRCTL ]; then
- if ! $BRCTL show |grep $VNET_BRIDGE > /dev/null 2> /dev/null ; then
- echo
- echo "Warning! Cannot find bridge $VNET_BRIDGE: instances may be without net"
- fi
- fi
- fi
-
- # we need IP forwarding and we need to use iptable over the bridge
- if [ -w /proc/sys/net/ipv4/ip_forward ]; then
- VAL=`cat /proc/sys/net/ipv4/ip_forward`
- if [ "$VAL" = "0" ]; then
- echo
- echo "Enabling IP forwarding for eucalyptus."
- echo -n 1 > /proc/sys/net/ipv4/ip_forward
- fi
- fi
- if [ -w /proc/sys/net/bridge/bridge-nf-call-iptables ]; then
- VAL=`cat /proc/sys/net/bridge/bridge-nf-call-iptables`
- if [ "$VAL" = "0" ]; then
- echo
- echo "Enabling bridge netfiltering for eucalyptus."
- echo 1 > /proc/sys/net/bridge/bridge-nf-call-iptables
- fi
- fi
-
- if [ -x $EUCASBINDIR/eucanetd ]; then
- if ! $EUCASBINDIR/eucanetd ; then
- echo
- echo "Failed to start the eucanetd"
- fi
- fi
-
- if ! httpd -f $EUCACONFDIR/httpd/conf/httpd-nc.conf ; then
- echo
- echo "Failed to start the NC!"
- exit 1
- fi
-}
-
-do_status() {
- pidfile=$EUCARUNDIR/eucalyptus-nc.pid
- if [ -s $pidfile ]; then
- pid=`cat $pidfile 2> /dev/null`
- if ps axww|grep $pid|grep httpd-nc.conf > /dev/null ; then
- # we are good
- return 0
- fi
- fi
- return 1
-}
-
-do_stop() {
- netpid="$EUCARUNDIR/eucanetd.pid"
- if [ -f "$netpid" ]; then
- kill `cat $netpid` >/dev/null 2>&1
- rm -f $netpid
- fi
-
- pidfile=$EUCARUNDIR/eucalyptus-nc.pid
-
- # let's be sure we are killing the right process
- if ! do_status ; then
- rm -f $pidfile
- return
- fi
-
- # now kill the services
- if [ -s $pidfile ]; then
- pid=`cat $pidfile 2> /dev/null`
- kill $pid > /dev/null 2>&1
- else
- return
- fi
- timeout=5
- while [ $timeout -gt 0 ]; do
- if ps $pid > /dev/null 2>&1 ; then
- sleep 1
- timeout=$(($timeout - 1))
- else
- break
- fi
- done
- if [ $timeout -eq 0 ]; then
- kill -9 $pid > /dev/null 2>&1
- fi
- rm -f $pidfile
-}
-
-# set the library path correctly
-export LD_LIBRARY_PATH=$LIBDIR/wso2-axis2/modules/rampart
-export AXIS2C_HOME=$LIBDIR/eucalyptus/axis2/nc
-export WSFCPP_HOME=$LIBDIR/eucalyptus/axis2/nc
-
-case "$1" in
- start)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_daemon_msg "Starting $DESC" "$NAME"
- else
- echo -n "Starting $DESC: "
- fi
- fi
-
- # let's check there is no previous NC running
- if do_status ; then
- echo
- echo "another NC is already running!"
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 1
- fi
- fi
- exit 1
- fi
-
- rm -f /dev/shm/sem.eucalyptus-nc* /dev/shm/sem.eucalyptus-st*
- do_start
- case "$?" in
- 0|1)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- *)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 1
- else
- echo "failed!"
- fi
- fi
- ;;
- esac
- ;;
- stop)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_begin_msg "Stopping $DESC"
- else
- echo -n "Stopping $DESC: "
- fi
- fi
- do_stop
- rm -f /dev/shm/sem.eucalyptus-nc* /dev/shm/sem.eucalyptus-st*
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- restart)
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_begin_msg "Restarting $DESC"
- else
- echo -n "Restarting $DESC: "
- fi
- fi
- # restart allow the CC to mantain the state across restart
- do_stop
- do_start
- if [ "$VERBOSE" != no ]; then
- if [ "$WE_HAVE_LSB" = "Y" ]; then
- log_end_msg 0
- else
- echo "done."
- fi
- fi
- ;;
- status)
- if do_status ; then
- echo "NC is running"
- else
- exit 3
- fi
- ;;
- *)
- echo "Usage: $NAME {start|stop|restart}" >&2
- exit 3
- ;;
-esac
-
-:
diff --git a/eucalyptus-nc.service b/eucalyptus-nc.service
deleted file mode 100644
index 0d89cc4..0000000
--- a/eucalyptus-nc.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=The Eucalyptus Node Controller service
-After=syslog.target network.target remote-fs.target nss-lookup.target libvirtd.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/eucalyptus/eucalyptus-nc.pid
-# EnvironmentFile=/etc/sysconfig/eucalyptus
-ExecStart=/usr/libexec/eucalyptus/eucalyptus-nc.init start
-ExecStop=/usr/libexec/eucalyptus/eucalyptus-nc.init stop
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/eucalyptus-no-console-cert-validation.patch b/eucalyptus-no-console-cert-validation.patch
deleted file mode 100644
index eb6e922..0000000
--- a/eucalyptus-no-console-cert-validation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eucalyptus-3.2.0git5ab72572.orig/console/eucaconsole/botoclcinterface.py 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/console/eucaconsole/botoclcinterface.py 2012-12-13 07:43:13.297385594 -0500
-@@ -52,7 +52,7 @@
- except ConfigParser.Error:
- pass
- self.conn = EC2Connection(access_id, secret_key, region=reg,
-- port=port, path=path,
-+ port=port, path=path, validate_certs=False,
- is_secure=True, security_token=token, debug=0)
- self.conn.APIVersion = '2012-03-01'
- self.conn.http_connection_kwargs['timeout'] = 30
diff --git a/eucalyptus-rootwrap-python.patch b/eucalyptus-rootwrap-python.patch
deleted file mode 100644
index 9150fdf..0000000
--- a/eucalyptus-rootwrap-python.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur eucalyptus-3.1.0.orig/clc/eucadmin/eucadmin/check.py eucalyptus-3.1.0/clc/eucadmin/eucadmin/check.py
---- eucalyptus-3.1.0.orig/clc/eucadmin/eucadmin/check.py 2012-06-19 14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0/clc/eucadmin/eucadmin/check.py 2012-08-16 16:32:39.180732968 -0400
-@@ -32,7 +32,7 @@
- import pwd
- from eucadmin.command import Command
-
--RootWrapPath = 'usr/lib/eucalyptus/euca_rootwrap'
-+RootWrapPath = '/usr/libexec/eucalyptus/euca_rootwrap'
-
- class Check(object):
-
-diff -ur eucalyptus-3.1.0.orig/clc/eucadmin/eucadmin/eucasetup.py eucalyptus-3.1.0/clc/eucadmin/eucadmin/eucasetup.py
---- eucalyptus-3.1.0.orig/clc/eucadmin/eucadmin/eucasetup.py 2012-06-19 14:41:48.000000000 -0400
-+++ eucalyptus-3.1.0/clc/eucadmin/eucadmin/eucasetup.py 2012-08-16 16:32:54.400888899 -0400
-@@ -32,8 +32,8 @@
- import pwd
- from eucadmin.utils import chown_recursive, chmod_recursive
-
--RootWrapPath = 'usr/lib/eucalyptus/euca_rootwrap'
--MountWrapPath = 'usr/lib/eucalyptus/euca_mountwrap'
-+RootWrapPath = '/usr/libexec/eucalyptus/euca_rootwrap'
-+MountWrapPath = '/usr/libexec/eucalyptus/euca_mountwrap'
-
- MakeDirs = ['var/lib/eucalyptus/dynserv/data',
- 'var/lib/eucalyptus/db',
diff --git a/eucalyptus-unlink-mod_rampart.patch b/eucalyptus-unlink-mod_rampart.patch
deleted file mode 100644
index 7bdff5a..0000000
--- a/eucalyptus-unlink-mod_rampart.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- eucalyptus-3.2.0git5ab72572.orig/configure 2012-12-12 11:00:38.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/configure 2012-12-12 11:01:29.000000000 -0500
-@@ -5951,7 +5951,6 @@
-
- fi
-
--
- { $as_echo "$as_me:$LINENO: checking for main in -lmod_rampart" >&5
- $as_echo_n "checking for main in -lmod_rampart... " >&6; }
- if test "${ac_cv_lib_mod_rampart_main+set}" = set; then
-@@ -6012,12 +6011,8 @@
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mod_rampart_main" >&5
- $as_echo "$ac_cv_lib_mod_rampart_main" >&6; }
- if test "x$ac_cv_lib_mod_rampart_main" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBMOD_RAMPART 1
--_ACEOF
--
-- LIBS="-lmod_rampart $LIBS"
--
-+ { $as_echo "$as_me:$LINENO: result: Found libmod_rampart" >&5
-+$as_echo "Found libmod_rampart" >&6; }
- else
- { { $as_echo "$as_me:$LINENO: error: Cannot find libmod_rampart" >&5
- $as_echo "$as_me: error: Cannot find libmod_rampart" >&2;}
---- eucalyptus-3.2.0git5ab72572.orig/configure.ac 2012-12-11 10:32:38.707295562 -0500
-+++ eucalyptus-3.2.0git5ab72572/configure.ac 2012-12-12 10:44:29.156296112 -0500
-@@ -234,7 +234,7 @@
- AC_CHECK_LIB([axis2_parser],[axiom_xml_reader_init],,AC_MSG_ERROR([Cannot find axis2 libs!]))
- AC_CHECK_LIB([axutil],[main],,AC_MSG_ERROR([Cannot find libaxutil]))
- AC_CHECK_LIB([m],[main])
--AC_CHECK_LIB([mod_rampart],[main],,AC_MSG_ERROR([Cannot find libmod_rampart]))
-+AC_CHECK_LIB([mod_rampart],[main],AC_MSG_RESULT([Found libmod_rampart]),AC_MSG_ERROR([Cannot find libmod_rampart]))
- AC_CHECK_LIB([neethi],[main],,AC_MSG_ERROR([Cannot find libneethi!]))
- AC_CHECK_LIB([pthread],[main])
- AC_CHECK_LIB([rt],[main])
diff --git a/eucalyptus-wso2-axis2-configure.patch b/eucalyptus-wso2-axis2-configure.patch
deleted file mode 100644
index 197a49f..0000000
--- a/eucalyptus-wso2-axis2-configure.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur eucalyptus-3.1.0.orig/configure eucalyptus-3.1.0/configure
---- eucalyptus-3.1.0.orig/configure 2012-08-16 23:14:00.585938864 -0400
-+++ eucalyptus-3.1.0/configure 2012-08-18 10:07:10.102716060 -0400
-@@ -4124,6 +4124,10 @@
- for x in ${AXIS2C_HOME}/include/axis2-* ${AXIS2C_HOME}/include/rampart-*; do
- INCLUDES="${INCLUDES} -I$x"
- done
-+ else
-+ for x in /usr/include/axis2-* /usr/include/rampart-*; do
-+ INCLUDES="${INCLUDES} -I$x"
-+ done
- fi
- if test -d "${AXIS2C_HOME}"/lib ; then
- LDFLAGS="-L${AXIS2C_HOME}/lib ${LDFLAGS}"
-diff -ur eucalyptus-3.1.0.orig/configure.ac eucalyptus-3.1.0/configure.ac
---- eucalyptus-3.1.0.orig/configure.ac 2012-08-16 23:14:00.587938882 -0400
-+++ eucalyptus-3.1.0/configure.ac 2012-08-18 10:06:36.011376622 -0400
-@@ -124,6 +124,10 @@
- for x in ${AXIS2C_HOME}/include/axis2-* ${AXIS2C_HOME}/include/rampart-*; do
- INCLUDES="${INCLUDES} -I$x"
- done
-+ else
-+ for x in /usr/include/axis2-* /usr/include/rampart-*; do
-+ INCLUDES="${INCLUDES} -I$x"
-+ done
- fi
- if test -d "${AXIS2C_HOME}"/lib ; then
- LDFLAGS="-L${AXIS2C_HOME}/lib ${LDFLAGS}"
diff --git a/eucalyptus-wss4j-support.patch b/eucalyptus-wss4j-support.patch
deleted file mode 100644
index 86fd9d1..0000000
--- a/eucalyptus-wss4j-support.patch
+++ /dev/null
@@ -1,355 +0,0 @@
-diff -urN eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/EnvelopeIdResolver.java eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/EnvelopeIdResolver.java
---- eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/EnvelopeIdResolver.java 1969-12-31 19:00:00.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/EnvelopeIdResolver.java 2012-12-11 10:36:26.895875354 -0500
-@@ -0,0 +1,133 @@
-+/**
-+ * Licensed to the Apache Software Foundation (ASF) under one
-+ * or more contributor license agreements. See the NOTICE file
-+ * distributed with this work for additional information
-+ * regarding copyright ownership. The ASF licenses this file
-+ * to you under the Apache License, Version 2.0 (the
-+ * "License"); you may not use this file except in compliance
-+ * with the License. You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing,
-+ * software distributed under the License is distributed on an
-+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-+ * KIND, either express or implied. See the License for the
-+ * specific language governing permissions and limitations
-+ * under the License.
-+ */
-+
-+package com.eucalyptus.crypto.util;
-+
-+import org.apache.ws.security.WSDocInfo;
-+import org.apache.ws.security.WSSecurityException;
-+import org.apache.ws.security.message.CallbackLookup;
-+import org.apache.ws.security.message.DOMCallbackLookup;
-+import org.apache.xml.security.signature.XMLSignatureInput;
-+import org.apache.xml.security.utils.resolver.ResourceResolverException;
-+import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
-+import org.w3c.dom.Attr;
-+import org.w3c.dom.Element;
-+
-+/**
-+ * XML-Security resolver that is used for resolving same-document URIs like URI="#id".
-+ * It is designed to work only with SOAPEnvelopes.
-+ * <p/>
-+ *
-+ * @author Davanum Srinivas (dims(a)yahoo.com).
-+ */
-+public class EnvelopeIdResolver extends ResourceResolverSpi {
-+ private static org.apache.commons.logging.Log log =
-+ org.apache.commons.logging.LogFactory.getLog(EnvelopeIdResolver.class);
-+
-+ private boolean doDebug = false;
-+
-+ private WSDocInfo wsDocInfo;
-+
-+ /**
-+ * @param docInfo The WSDocInfo object to be used for resolving elements
-+ */
-+ public void setWsDocInfo(WSDocInfo docInfo) {
-+ wsDocInfo = docInfo;
-+ }
-+
-+ /**
-+ * This is the workhorse method used to resolve resources.
-+ * <p/>
-+ *
-+ * @param uri
-+ * @param BaseURI
-+ * @return TODO
-+ * @throws ResourceResolverException
-+ */
-+ public XMLSignatureInput engineResolve(Attr uri, String BaseURI)
-+ throws ResourceResolverException {
-+
-+ doDebug = log.isDebugEnabled();
-+
-+ String uriNodeValue = uri.getNodeValue();
-+ if (doDebug) {
-+ log.debug("enter engineResolve, look for: " + uriNodeValue);
-+ }
-+
-+ //
-+ // First check to see if the element that we require is a previously processed
-+ // Security Token that is stored in WSDocInfo.
-+ //
-+ Element selectedElem = null;
-+ String id = uriNodeValue.substring(1);
-+ if (selectedElem == null && wsDocInfo != null) {
-+ selectedElem = wsDocInfo.getTokenElement(id);
-+ }
-+
-+ if (selectedElem == null && (id != null || "".equals(id))) {
-+ CallbackLookup callbackLookup = null;
-+ if (wsDocInfo != null) {
-+ callbackLookup = wsDocInfo.getCallbackLookup();
-+ }
-+ if (callbackLookup == null) {
-+ callbackLookup = new DOMCallbackLookup(uri.getOwnerDocument());
-+ }
-+ try {
-+ selectedElem = callbackLookup.getElement(id, null, true);
-+ } catch (WSSecurityException ex) {
-+ throw new ResourceResolverException(
-+ ex.getMessage(), new Object[]{"Id: " + id + " not found"},
-+ uri, BaseURI
-+ );
-+ }
-+ if (selectedElem == null) {
-+ throw new ResourceResolverException("generic.EmptyMessage",
-+ new Object[]{"Id: " + id + " not found"},
-+ uri,
-+ BaseURI);
-+ }
-+ }
-+
-+ XMLSignatureInput result = new XMLSignatureInput(selectedElem);
-+ result.setMIMEType("text/xml");
-+ if (doDebug) {
-+ log.debug("exit engineResolve, result: " + result);
-+ }
-+ return result;
-+ }
-+
-+ /**
-+ * This method helps the ResourceResolver to decide whether a
-+ * ResourceResolverSpi is able to perform the requested action.
-+ * <p/>
-+ *
-+ * @param uri
-+ * @param BaseURI
-+ * @return TODO
-+ */
-+ public boolean engineCanResolve(Attr uri, String BaseURI) {
-+ if (uri == null) {
-+ return false;
-+ }
-+ String uriNodeValue = uri.getNodeValue();
-+ return uriNodeValue.startsWith("#");
-+ }
-+
-+}
-+
-diff -urN eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java
---- eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/WSSecurity.java 2012-12-11 10:36:34.270183164 -0500
-@@ -69,6 +69,7 @@
- import java.security.cert.X509Certificate;
- import java.util.Calendar;
- import java.util.Date;
-+import java.util.List;
- import java.util.Vector;
- import org.apache.axiom.om.OMElement;
- import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-@@ -79,7 +80,7 @@
- import org.apache.ws.security.WSSConfig;
- import org.apache.ws.security.WSSecurityEngineResult;
- import org.apache.ws.security.WSSecurityException;
--import org.apache.ws.security.message.EnvelopeIdResolver;
-+import org.apache.ws.security.handler.RequestData;
- import org.apache.ws.security.message.token.BinarySecurity;
- import org.apache.ws.security.message.token.Reference;
- import org.apache.ws.security.message.token.SecurityTokenReference;
-@@ -111,6 +112,7 @@
- public class WSSecurity {
- private static Logger LOG = Logger.getLogger( WSSecurity.class );
- private static CertificateFactory factory;
-+ public static final WSSConfig wssConfig;
- private static final String SYSTEM_PROPERTY_SKIP_SECURITY_CHECK = "com.eucalyptus.crypto.util.skipWsSecurityConfigurationChecks";
-
- static {
-@@ -120,9 +122,12 @@
- LOG.fatal("XML Security configuration not applied, set system property "+SYSTEM_PROPERTY_SKIP_SECURITY_CHECK+"=true to skip check");
- throw new RuntimeException("XML Security Configuration not applied");
- }
-- WSSConfig.getDefaultWSConfig( ).addJceProvider( "BC", BouncyCastleProvider.class.getCanonicalName( ) );
-- WSSConfig.getDefaultWSConfig( ).setTimeStampStrict( true );
-- WSSConfig.getDefaultWSConfig( ).setEnableSignatureConfirmation( true );
-+ wssConfig = WSSConfig.getNewInstance( );
-+
-+ wssConfig.addJceProvider( "BC", BouncyCastleProvider.class.getCanonicalName( ) );
-+ wssConfig.setTimeStampStrict( true );
-+ wssConfig.setEnableSignatureConfirmation( true );
-+ wssConfig.setWsiBSPCompliant( false );
- }
-
- public static void init() {
-@@ -166,12 +171,9 @@
- throws WSSecurityException, XMLSignatureException, XMLSecurityException {
- final SecurityTokenReference secRef = WSSecurity.getSecurityTokenReference( sig.getKeyInfo( ) );
- final Reference tokenRef = secRef.getReference( );
-- Element bstDirect = WSSecurityUtil.getElementByWsuId( securityNode.getOwnerDocument( ), tokenRef.getURI( ) );
-+ Element bstDirect = WSSecurityUtil.findElementById( securityNode.getOwnerDocument( ), tokenRef.getURI( ), false );
- if ( bstDirect == null ) {
-- bstDirect = WSSecurityUtil.getElementByGenId( securityNode.getOwnerDocument( ), tokenRef.getURI( ) );
-- if ( bstDirect == null ) {
-- throw new WSSecurityException( WSSecurityException.INVALID_SECURITY, "noCert" );
-- }
-+ throw new WSSecurityException( WSSecurityException.INVALID_SECURITY, "noCert" );
- }
- BinarySecurity token = new BinarySecurity( bstDirect );
- String type = token.getValueType( );
-@@ -276,15 +278,17 @@
- // can't call handleTimestamp() directly because
- // the config will not be set in that case
- // all null-params are not used by handleToken()
-- Vector retResults = new Vector();
-- tsProc.handleToken((Element)node, null, null, null, null, retResults, WSSConfig.getDefaultWSConfig());
-+ RequestData data = new RequestData();
-+ data.setWssConfig(WSSecurity.wssConfig);
-+
-+ List<WSSecurityEngineResult> retResults = tsProc.handleToken((Element)node, data, null);
-
- // need to make sure that the timestamp's valid period
- // is at least as long as the request caching time
- Timestamp ts = (Timestamp)((WSSecurityEngineResult)retResults.get(0)).get(WSSecurityEngineResult.TAG_TIMESTAMP);
- LOG.debug("timestamp: " + ts);
-
-- Date expires = ts.getExpires().getTime();
-+ Date expires = ts.getExpires();
-
- if(!SecurityContext.validateTimestampPeriod(expires)) {
- LOG.warn("[security] ]Timestamp expiration is further in the future than replay cache expiration");
-@@ -338,12 +342,12 @@
- } catch ( XMLSecurityException e2 ) {
- throw new WSSecurityException( WSSecurityException.FAILED_CHECK, "noXMLSig", null, e2 );
- }
-- sig.addResourceResolver( EnvelopeIdResolver.getInstance( ) );
-+ sig.addResourceResolver( new EnvelopeIdResolver() );
- return sig;
- }
-
- public static SecurityTokenReference getSecurityTokenReference( KeyInfo info ) throws WSSecurityException {
-- Node secTokenRef = WSSecurityUtil.getDirectChild( info.getElement( ), SecurityTokenReference.SECURITY_TOKEN_REFERENCE, WSConstants.WSSE_NS );
-+ Node secTokenRef = WSSecurityUtil.getDirectChildElement( info.getElement( ), SecurityTokenReference.SECURITY_TOKEN_REFERENCE, WSConstants.WSSE_NS );
- if ( secTokenRef == null ) {
- throw new WSSecurityException( WSSecurityException.INVALID_SECURITY, "unsupportedKeyInfo" );
- }
-diff -urN eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java
---- eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/WsSecHandler.java 2012-12-11 10:36:34.270183164 -0500
-@@ -64,6 +64,7 @@
-
- import java.util.Collection;
- import java.util.Vector;
-+import java.util.List;
- import org.apache.axiom.om.OMElement;
- import org.apache.axiom.om.OMException;
- import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-@@ -121,9 +122,16 @@
-
- final Vector v = new Vector( );
- final WSSecHeader wsheader = new WSSecHeader( "", false );
-- wsheader.insertSecurityHeader( doc );
-+ try {
-+ wsheader.insertSecurityHeader( doc );
-+ } catch ( WSSecurityException e ) {
-+ LOG.error( doc );
-+ LOG.error( e, e );
-+ Channels.fireExceptionCaught( ctx, e );
-+ }
-
- final WSSecSignature signer = new WSSecSignature( );
-+ signer.setWsConfig(WSSecurity.wssConfig);
- signer.setKeyIdentifierType( WSConstants.BST_DIRECT_REFERENCE );
- signer.setSigCanonicalization( WSConstants.C14N_EXCL_OMIT_COMMENTS );
- try {
-@@ -142,9 +150,9 @@
- }
- v.addAll( this.getSignatureParts( ) );
- signer.appendBSTElementToHeader( wsheader );
-- signer.appendToHeader( wsheader );
-+ List<javax.xml.crypto.dsig.Reference> references = null;
- try {
-- signer.addReferencesToSign( v, wsheader );
-+ references = signer.addReferencesToSign( v, wsheader );
- } catch ( WSSecurityException e ) {
- LOG.error( doc );
- LOG.error( e, e );
-@@ -152,7 +160,7 @@
- }
-
- try {
-- signer.computeSignature( );
-+ signer.computeSignature( references, false, null );
- } catch ( WSSecurityException e ) {
- LOG.error( doc );
- LOG.error( e, e );
-diff -urN eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java
---- eucalyptus-3.2.0git5ab72572.orig/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java 2012-12-10 14:18:28.000000000 -0500
-+++ eucalyptus-3.2.0git5ab72572/clc/modules/msgs/src/main/java/com/eucalyptus/ws/util/CredentialProxy.java 2012-12-11 10:36:26.897875437 -0500
-@@ -64,6 +64,7 @@
-
- import org.apache.ws.security.WSSecurityException;
- import org.apache.ws.security.components.crypto.Crypto;
-+import org.apache.ws.security.components.crypto.CryptoType;
- import com.eucalyptus.component.ComponentId;
- import com.eucalyptus.component.auth.SystemCredentials;
- import com.eucalyptus.component.id.Eucalyptus;
-@@ -72,6 +73,8 @@
- import java.math.BigInteger;
- import java.security.KeyStore;
- import java.security.PrivateKey;
-+import java.security.PublicKey;
-+import javax.security.auth.callback.CallbackHandler;
- import java.security.cert.Certificate;
- import java.security.cert.CertificateFactory;
- import java.security.cert.X509Certificate;
-@@ -84,27 +87,37 @@
- }
-
- @Override
-- public X509Certificate[] getCertificates( final String arg0 ) throws WSSecurityException {
-+ public X509Certificate[] getCertificatesFromBytes( final byte[] data ) throws WSSecurityException {
- return new X509Certificate[] { SystemCredentials.lookup( this.componentId ).getCertificate( ) };
- }
-
- @Override
-- public PrivateKey getPrivateKey( final String alias, final String password ) throws Exception {
-+ public X509Certificate[] getX509Certificates( final CryptoType cryptoType ) throws WSSecurityException {
-+ return new X509Certificate[] { SystemCredentials.lookup( this.componentId ).getCertificate( ) };
-+ }
-+
-+ @Override
-+ public PrivateKey getPrivateKey( final String alias, final String password ) throws WSSecurityException {
- return SystemCredentials.lookup( this.componentId ).getPrivateKey( );
- }
-
-+ @Override
-+ public PrivateKey getPrivateKey( final X509Certificate certificate, final CallbackHandler callbackHandler ) throws WSSecurityException {
-+ return SystemCredentials.lookup( this.componentId ).getPrivateKey( );
-+ }
-+
-+ @Override public void setCryptoProvider( final String provider ) { }
-+ @Override public String getCryptoProvider() { return null; }
-+ @Override public void setCertificateFactory( final String provider, final CertificateFactory certFactory) { }
-+ @Override public void setDefaultX509Identifier( final String identifier) { }
-+
- @Override public X509Certificate loadCertificate( final InputStream inputStream ) throws WSSecurityException { return null; }
-- @Override public X509Certificate[] getX509Certificates( final byte[] bytes, final boolean b ) throws WSSecurityException { return new X509Certificate[0]; }
-- @Override public byte[] getCertificateData( final boolean b, final X509Certificate[] x509Certificates ) throws WSSecurityException { return new byte[0]; }
-- @Override public String getAliasForX509Cert( final Certificate certificate ) throws WSSecurityException { return null; }
-- @Override public String getAliasForX509Cert( final String s ) throws WSSecurityException { return null; }
-- @Override public String getAliasForX509Cert( final String s, final BigInteger bigInteger ) throws WSSecurityException { return null; }
-- @Override public String getAliasForX509Cert( final byte[] bytes ) throws WSSecurityException { return null; }
-- @Override public String getDefaultX509Alias( ) { return null; }
-- @Override public byte[] getSKIBytesFromCert( final X509Certificate x509Certificate ) throws WSSecurityException { return new byte[0]; }
-- @Override public String getAliasForX509CertThumb( final byte[] bytes ) throws WSSecurityException { return null; }
-- @Override public KeyStore getKeyStore( ) { return null; }
-- @Override public CertificateFactory getCertificateFactory( ) throws WSSecurityException { return null; }
-- @Override public boolean validateCertPath( final X509Certificate[] x509Certificates ) throws WSSecurityException { return false; }
-- @Override public String[] getAliasesForDN( final String s ) throws WSSecurityException { return new String[0]; }
-+ @Override public String getX509Identifier( final X509Certificate cert ) throws WSSecurityException { return null; }
-+ @Override public byte[] getBytesFromCertificates( final X509Certificate[] certs ) throws WSSecurityException { return new byte[0]; }
-+ @Override public byte[] getSKIBytesFromCert( final X509Certificate cert ) throws WSSecurityException { return new byte[0]; }
-+ @Override public String getDefaultX509Identifier() throws WSSecurityException { return null; }
-+ @Override public CertificateFactory getCertificateFactory() throws WSSecurityException { return null; }
-+ @Override public boolean verifyTrust( final X509Certificate[] certs ) throws WSSecurityException { return false; }
-+ @Override public boolean verifyTrust( final X509Certificate[] certs, boolean enableRevocation ) throws WSSecurityException { return false; }
-+ @Override public boolean verifyTrust( final PublicKey publicKey ) throws WSSecurityException { return false; }
- }
diff --git a/eucalyptus.spec b/eucalyptus.spec
deleted file mode 100644
index ed95300..0000000
--- a/eucalyptus.spec
+++ /dev/null
@@ -1,1161 +0,0 @@
-%global axis2c_home %{_libdir}/wso2-axis2
-%global axis2c_services %{_libdir}/%{name}/axis2
-%global eucalibexecdir %{_libexecdir}/%{name}
-%global eucadatadir %{_datadir}/%{name}
-%global eucajavalibdir %{_datadir}/%{name}
-%global helperdir %{_datadir}/%{name}
-%global gittag 32052445
-%global tar_suffix .%{gittag}
-%global with_axis2v14 0
-%global _hardened_build 1
-%global __provides_exclude_from ^%{_libdir}/%{name}/.*.so$
-
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-Summary: Elastic Utility Computing Architecture
-Name: eucalyptus
-Version: 3.3.0
-Release: 0.15.20130408git%{gittag}%{?dist}
-License: GPLv3 and (GPLv3 and ASL 2.0) and (GPLv3 and BSD)
-URL: http://www.eucalyptus.com
-
-BuildRequires: help2man
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: libvirt-devel >= 0.6
-BuildRequires: libxslt-devel
-BuildRequires: openssl-devel
-BuildRequires: python-boto >= 2.1
-BuildRequires: python2-devel
-BuildRequires: python-setuptools
-BuildRequires: swig
-BuildRequires: wso2-axis2-devel
-BuildRequires: wso2-rampart-devel
-BuildRequires: wso2-wsf-cpp-devel
-BuildRequires: iscsi-initiator-utils
-BuildRequires: curl-devel
-BuildRequires: systemd-units
-
-BuildRequires: activemq-core
-BuildRequires: ant >= 1.7
-BuildRequires: antlr-tool
-BuildRequires: apache-commons-codec
-BuildRequires: apache-commons-compress
-BuildRequires: apache-commons-fileupload
-BuildRequires: apache-commons-io
-BuildRequires: apache-commons-lang
-BuildRequires: axiom
-# BuildRequires: axis2
-BuildRequires: bcel
-BuildRequires: bouncycastle
-BuildRequires: btm
-BuildRequires: dnsjava
-# Should be a json-lib Requires
-BuildRequires: ezmorph
-BuildRequires: geronimo-jta
-BuildRequires: geronimo-validation
-BuildRequires: groovy
-BuildRequires: guava >= 9
-BuildRequires: ha-jdbc
-BuildRequires: hamcrest12
-BuildRequires: hibernate3 >= 3.6.10-7
-BuildRequires: hibernate3-ehcache >= 3.6.10-7
-BuildRequires: hibernate3-entitymanager >= 3.6.10-7
-BuildRequires: hibernate3-jbosscache >= 3.6.10-7
-BuildRequires: hibernate3-proxool >= 3.6.10-7
-BuildRequires: hibernate-jpa-2.0-api
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: javamail
-BuildRequires: jboss-logging
-BuildRequires: jetty-annotations
-BuildRequires: jetty-client
-BuildRequires: jetty-continuation
-BuildRequires: jetty-deploy
-BuildRequires: jetty-http
-BuildRequires: jetty-io
-BuildRequires: jetty-jmx
-BuildRequires: jetty-jndi
-BuildRequires: jetty-plus
-BuildRequires: jetty-rewrite
-BuildRequires: jetty-security
-BuildRequires: jetty-server
-BuildRequires: jetty-servlet
-BuildRequires: jetty-servlets
-BuildRequires: jetty-util
-BuildRequires: jetty-webapp
-BuildRequires: jetty-xml
-BuildRequires: jgroups212
-BuildRequires: jibx
-BuildRequires: jsch
-BuildRequires: json-lib
-BuildRequires: junit
-BuildRequires: log4j
-BuildRequires: mule-module-builders
-BuildRequires: mule-module-client
-BuildRequires: mule-module-xml
-BuildRequires: mule-transport-vm
-BuildRequires: netty31
-BuildRequires: proxool
-BuildRequires: rhq-plugin-annotations
-BuildRequires: springframework-context-support
-BuildRequires: springframework-web
-BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: velocity
-BuildRequires: woodstox-core
-BuildRequires: wsdl4j
-BuildRequires: wss4j >= 1.6.7-1
-BuildRequires: xalan-j2
-BuildRequires: xml-commons-apis
-BuildRequires: xml-security >= 1.5.3-1
-# Should be a json-lib Requires
-BuildRequires: xom
-BuildRequires: m2crypto
-
-%if %with_axis2v14
-BuildRequires: axis2v14
-%endif
-
-Requires: vconfig
-Requires: wget
-Requires: rsync
-Requires: which
-Requires: libselinux-python
-Requires: perl(Crypt::OpenSSL::RSA)
-Requires: perl(Crypt::OpenSSL::Random)
-Requires: sudo
-Requires(pre): %{_sbindir}/groupadd
-Requires(pre): %{_sbindir}/useradd
-Requires(post): %{_sbindir}/euca_conf
-
-#Source0: http://downloads.eucalyptus.com/releases/eucalyptus/3.2/source/eucalyptus...
-# git archive --format=tgz --prefix=eucalyptus-3.3.0.$( git rev-parse HEAD | cut -c1-8)/ \
-# HEAD -o ~/fedpkg/eucalyptus/eucalyptus-3.3.0.$( git rev-parse HEAD | cut -c1-8).tgz
-Source0: eucalyptus-%{version}.%{gittag}.tgz
-# A version of WSDL2C.sh that respects standard classpaths
-Source1: euca-WSDL2C.sh
-Source2: eucalyptus-jarlinks.txt
-
-# XXX: these system units should go in the source tree
-Source3: eucalyptus-cloud.service
-Source4: eucalyptus-cc.service
-Source5: eucalyptus-nc.service
-
-# These are sources that greatly simplify CC/NC startup,
-# Removing dynamic config file generation and needless
-# guesswork about where axis2 files are.
-Source6: axis2.xml
-Source7: eucalyptus-cc.init
-Source8: eucalyptus-nc.init
-# Note that these needed to be adapted for httpd 2.4
-# See http://httpd.apache.org/docs/2.4/upgrading.html
-Source9: httpd-cc.conf
-Source10: httpd-nc.conf
-Source11: httpd-common.conf
-
-# Axis2/Java code generation is broken with v1.6
-# To regenerate this code:
-# 1) yum install http://arg.fedorapeople.org/axis2v14/noarch/axis2v14-1.4.1-1.fc18.noarch.rpm
-# 2) Set with_axis2v14 to 1
-# 3) fedpkg prep
-# 4) pushd eucalyptus-<version>
-# 5) Run configure command from: rpmspec -P ../eucalyptus.spec | grep -A 15 ^./configure
-# 6) for x in gatherlog cluster node; do pushd $x; make generated/stubs; popd; done
-# 7) find . -name '*.o' | xargs rm
-# 8) popd
-# 9) tar czf eucalyptus-<version>-generated.tgz \
-# eucalyptus-<version>/{node,cluster,gatherlog}/generated
-%if !%with_axis2v14
-Source12: eucalyptus-%{version}%{tar_suffix}-generated.tgz
-%endif
-
-# Add a separate "clean" script for the CC
-Source13: eucalyptus-clean-cc
-
-# Add a new-style polkit rule
-Source14: eucalyptus-nc-libvirt.rules
-
-# Add tmpfiles config
-Source15: eucalyptus.tmpfiles
-
-# Systemd unit for eucalyptus-console
-Source16: eucalyptus-console.service
-
-# https://eucalyptus.atlassian.net/browse/EUCA-2364
-Patch0: eucalyptus-jdk7.patch
-# https://eucalyptus.atlassian.net/browse/EUCA-3253
-Patch2: eucalyptus-jetty8.patch
-# https://eucalyptus.atlassian.net/browse/EUCA-2993
-Patch4: eucalyptus-groovy18.patch
-
-# Three separate patches to disable gwt
-Patch9: eucalyptus-disable-gwt.patch
-Patch10: eucalyptus-disable-gwt-in-buildxml.patch
-Patch11: eucalyptus-disable-gwt-in-makefile.patch
-
-# Make install paths configurable
-# https://eucalyptus.atlassian.net/browse/EUCA-3531
-Patch13: eucalyptus-configurable-paths.patch
-
-# Make one repo per service of Axis2 services
-Patch14: eucalyptus-axis2-services.patch
-
-# Fix rootwrap path in python files
-Patch15: eucalyptus-rootwrap-python.patch
-
-# Fix include location for axis2 libs
-Patch16: eucalyptus-wso2-axis2-configure.patch
-
-# Use System.load with an absolute path for JNI lib load
-Patch18: eucalyptus-jni-abspath.patch
-
-# Move version file out of /etc
-Patch20: eucalyptus-move-version-file.patch
-
-# Support wss4j 1.6.x
-Patch23: eucalyptus-wss4j-support.patch
-
-# eucalyptus 3.2 patches
-Patch24: eucalyptus-disable-reporting.patch
-Patch25: eucalyptus-3.2-guava.patch
-
-# Drop backport-util-concurrent usage
-Patch26: eucalyptus-drop-backport-util-concurrent.patch
-
-# tgt checks are not systemd-compatible
-# https://eucalyptus.atlassian.net/browse/EUCA-4398
-Patch27: eucalyptus-bad-tgt-check.patch
-
-# libmod_rampart should not be linked into CC, GL, or NC
-# https://eucalyptus.atlassian.net/browse/EUCA-4400
-Patch28: eucalyptus-unlink-mod_rampart.patch
-
-# cert validation in boto 2.6.0 breaks the user console,
-# since the CLC has a self-signed cert
-Patch29: eucalyptus-no-console-cert-validation.patch
-
-# jetty.util.log.Log usage breaks in Jetty 9
-Patch30: eucalyptus-jetty-logging.patch
-# jetty SslSelectChannelConnector was deprecated and has been removed.
-Patch31: eucalyptus-jetty-ssl-config.patch
-
-# import guava class from guava (!) instead of GWT
-Patch32: eucalyptus-braindead-gwt-import.patch
-
-# Fix classpath for JNI builds (do we still need to build these?
-Patch33: eucalyptus-javah-classpath.patch
-
-%description
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the common parts; you will need to install at
-least one of the cloud controller (cloud), cluster controller (cc),
-node controller (nc), storage controller (sc), or walrus packages as well.
-
-%package common-java
-Summary: Elastic Utility Computing Architecture - ws java stack
-Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
-Requires: java-headless >= 1:1.6.0
-Requires: lvm2
-Requires: activemq-core
-Requires: ant
-Requires: antlr-tool
-Requires: apache-commons-codec
-Requires: apache-commons-collections
-Requires: apache-commons-compress
-Requires: apache-commons-fileupload
-Requires: apache-commons-io
-Requires: axiom
-Requires: bcel
-Requires: bouncycastle
-Requires: btm
-Requires: dnsjava
-Requires: dom4j
-Requires: ezmorph
-Requires: geronimo-jms
-Requires: geronimo-jta
-Requires: groovy
-Requires: guava >= 9
-Requires: ha-jdbc
-Requires: hamcrest12
-Requires: hibernate3 >= 3.6.10-7
-Requires: hibernate3-ehcache >= 3.6.10-7
-Requires: hibernate3-entitymanager >= 3.6.10-7
-Requires: hibernate3-jbosscache >= 3.6.10-7
-Requires: hibernate3-proxool >= 3.6.10-7
-Requires: hibernate-commons-annotations
-Requires: hibernate-jpa-2.0-api
-Requires: jakarta-commons-httpclient
-Requires: javamail
-Requires: jboss-logging
-Requires: jetty
-Requires: jgroups212
-Requires: jibx
-Requires: jsch
-Requires: json-lib
-Requires: jsr-305
-Requires: log4j
-Requires: mule-module-builders
-Requires: mule-module-client
-Requires: mule-module-management
-Requires: mule-module-spring-config
-Requires: mule-module-xml
-Requires: mule-transport-vm
-Requires: mx4j
-Requires: netty31
-Requires: postgresql-jdbc
-Requires: proxool
-Requires: springframework-context-support
-Requires: springframework-web
-Requires: stax-utils
-Requires: tomcat-servlet-3.0-api
-Requires: velocity
-Requires: woodstox-core
-Requires: wsdl4j
-Requires: wss4j >= 1.6.7-1
-Requires: xalan-j2
-Requires: xml-commons-apis
-Requires: xml-security >= 1.5.3-1
-Requires: xom
-Requires: %{_sbindir}/euca_conf
-Requires(preun): systemd-units
-Requires(post): systemd-units
-
-%description common-java
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the java WS stack.
-
-%package walrus
-Summary: Elastic Utility Computing Architecture - walrus
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-common-java = %{version}-%{release}
-Requires: drbd-utils
-Requires: lvm2
-
-%description walrus
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains storage component for your cloud: images and buckets
-are handled by walrus. Typically this package is installed alongside the
-cloud controller.
-
-%package sc
-Summary: Elastic Utility Computing Architecture - storage controller
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-common-java = %{version}-%{release}
-Requires: rhq-plugin-annotations
-Requires: device-mapper-multipath
-Requires: lvm2
-Requires: iscsi-initiator-utils
-Requires: scsi-target-utils
-
-%description sc
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the storage controller part of eucalyptus, which
-handles the elastic blocks for a given cluster. Typically you install it
-alongside the cluster controller.
-
-%package cloud
-Summary: Elastic Utility Computing Architecture - cloud controller
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-common-java%{?_isa} = %{version}-%{release}
-Requires: euca2ools >= 2.0
-Requires: lvm2
-Requires: perl(Getopt::Long)
-Requires: postgresql
-Requires: postgresql-server
-
-# For reporting web UI
-# Requires: dejavu-serif-fonts
-
-%description cloud
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the cloud controller part of eucalyptus. The cloud
-controller needs to be reachable by both the cluster controller and from
-the cloud clients.
-
-%package cc
-Summary: Elastic Utility Computing Architecture - cluster controller
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-gl = %{version}-%{release}
-Requires: bridge-utils
-Requires: iproute
-Requires: iptables
-Requires: vtun
-Requires: dhcp
-Requires: httpd
-Requires: %{_sbindir}/euca_conf
-Requires: mod_wso2-axis2
-# XXX: I wish this were not "devel", but some modules are being
-# loaded without a version
-Requires: wso2-axis2-devel
-Requires: wso2-axis2-modules
-Requires(preun): systemd-units
-Requires(post): systemd-units
-
-%description cc
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the cluster controller part of eucalyptus. It
-handles a group of node controllers.
-
-%package nc
-Summary: Elastic Utility Computing Architecture - node controller
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-gl = %{version}-%{release}
-Requires: bridge-utils
-Requires: device-mapper
-Requires: device-mapper-multipath
-Requires: euca2ools >= 2.1.3
-Requires: perl(Sys::Virt)
-Requires: perl(Time::HiRes)
-Requires: perl(XML::Simple)
-# The next six come from storage/diskutil.c, which shells out to lots of stuff.
-Requires: coreutils
-Requires: e2fsprogs
-Requires: file
-# grub2 package not available on arm
-%ifnarch %{arm}
-Requires: grub2
-%endif
-Requires: parted
-Requires: util-linux
-Requires: curl
-Requires: httpd
-Requires: kvm
-Requires: iscsi-initiator-utils
-Requires: libvirt
-Requires: mod_wso2-axis2
-# XXX: I wish this were not "devel", but some modules are being
-# loaded without a version
-Requires: wso2-axis2-devel
-Requires: wso2-axis2-modules
-Requires: %{_sbindir}/euca_conf
-Requires(preun): systemd-units
-Requires(post): systemd-units
-
-%description nc
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the node controller part of eucalyptus. This
-component handles instances.
-
-%package gl
-Summary: Elastic Utility Computing Architecture - log service
-Requires: %{name} = %{version}-%{release}
-Requires: httpd
-
-%description gl
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the internal log service of eucalyptus.
-
-%package admin-tools
-Summary: Elastic Utility Computing Architecture - admin CLI tools
-License: BSD
-Requires: %{name} = %{version}-%{release}
-Requires: python-eucadmin = %{version}-%{release}
-Requires: rsync
-BuildArch: noarch
-
-%description admin-tools
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains command line tools necessary for managing a
-Eucalyptus cluster.
-
-%package -n python-eucadmin
-Summary: Elastic Utility Computing Architecture - administration Python library
-# A patched version of python's gzip is included, so we add the Python license
-License: BSD and Python
-Requires: PyGreSQL
-Requires: python-boto >= 2.1
-Requires: rsync
-BuildArch: noarch
-
-%description -n python-eucadmin
-Eucalyptus is a service overlay that implements elastic computing
-using existing resources. The goal of Eucalyptus is to allow sites
-with existing clusters and server infrastructure to co-host an elastic
-computing service that is interface-compatible with Amazon AWS.
-
-This package contains the Python library used by Eucalyptus administration
-tools. It is neither intended nor supported for use by any other programs.
-
-%package axis2-clients
-Summary: Axis2/C web service clients for Eucalyptus services
-License: GPLv3
-Requires: wso2-axis2
-Requires: %{name}-cc = %{version}-%{release}
-
-%description axis2-clients
-This package contains three debugging programs for testing Eucalyptus
-components which run as Axis2/C webservices.
-
-%package console
-Summary: Client user interface for Eucalyptus
-License: GPLv3 and BSD
-
-Requires: python-tornado
-Requires: python-boto >= 2.1
-Requires: m2crypto
-
-%description console
-Client user interface for Eucalyptus.
-
-
-%prep
-%setup -q -n %{name}-%{version}.%{gittag}
-%if !%with_axis2v14
-tar --strip-components=1 -xvzf %{SOURCE12}
-touch gatherlog/generated/stubs cluster/generated/stubs node/generated/stubs
-%endif
-# This patch is upstream now
-# %patch0 -p1
-%patch2 -p1
-%patch4 -p1
-%patch9 -p1
-# This patch is no longer needed due to build refactoring
-# %patch10 -p1
-%patch11 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-# JNI libraries appear not to be loaded in 3.3
-# %patch18 -p1
-%patch20 -p1
-%patch23 -p1
-# Reporting can be used in 3.3
-# %patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-# This patch is upstream now
-# %patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-
-# remove classes which depend on junit
-# This is because junit on Fedora bundles hamcrest 1.1, which has conflicts
-# with hamcrest 1.2. And regardless, these should not be bundled into our
-# production jars.
-pushd clc/modules
-rm core/src/main/java/edu/ucsb/eucalyptus/util/XMLParserTest.java
-rm dns/src/main/java/com/eucalyptus/cloud/ws/tests/DNSControlTest.java
-rm dns/src/main/java/com/eucalyptus/cloud/ws/tests/RemoveARecordTest.java
-rm storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/CreateVolumeFromSnapshotTest.java
-rm storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/StorageTests.java
-rm storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/VolumeTest.java
-rm storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/DeleteSnapshotTest.java
-rm storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/CreateSnapshotTest.java
-popd
-
-# This has a compilation error, and we aren't supporting upgrades from anything older
-rm clc/modules/core/src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java
-
-# Remove admin web UI. It uses GWT. Ick.
-rm -rf clc/modules/www
-
-# Do not redistribute a binary floppy image
-# We should have a script to reconstruct this
-echo -n > tools/floppy
-
-# Filter unwanted perl provides
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-sed -e '/perl(disconnect_iscsitarget_main.pl)/d' \
- -e '/perl(connect_iscsitarget_main.pl)/d' \
- -e '/perl(iscsitarget_common.pl)/d'
-EOF
-
-%global __perl_provides %{_builddir}/%{name}-%{version}%{?tar_suffix}/%{name}-prov
-chmod +x %{__perl_provides}
-
-
-# Filter unwanted perl requires
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-sed -e '/perl(disconnect_iscsitarget_main.pl)/d' \
- -e '/perl(connect_iscsitarget_main.pl)/d' \
- -e '/perl(iscsitarget_common.pl)/d'
-EOF
-
-%global __perl_requires %{_builddir}/%{name}-%{version}%{?tar_suffix}/%{name}-req
-chmod +x %{__perl_requires}
-
-
-%build
-export CFLAGS="%{optflags}"
-export LDFLAGS="$RPM_LD_FLAGS"
-
-# TODO: we should use %%configure now, except that "prefix" is still broken
-# Also, helperdir sould be a config option, unless we decide that
-# it's always eucadatadir
-./configure --with-axis2=%{_datadir}/axis2-* \
- --with-axis2c=%{axis2c_home} \
- --with-axis2c-services=%{axis2c_services} \
- --with-wsdl2c-sh=%{SOURCE1} \
- --enable-debug \
- --prefix=/ \
- --sbindir=%{_sbindir} \
- --libexecdir=%{_libexecdir} \
- --libdir=%{_libdir} \
- --datarootdir=%{_datadir} \
- --localstatedir=%{_localstatedir} \
- --sysconfdir=%{_sysconfdir} \
- --with-apache2-module-dir=%{_libdir}/httpd/modules \
- --with-db-home=/usr \
- --with-extra-version=%{release}
-
-# symlink java deps
-mkdir clc/lib
-for x in $( cat %{SOURCE2} );
-do
- if [ ! -e $x ]; then
- echo "Could not find $x"
- exit 1
- fi
- ln -s $x clc/lib/;
-done
-
-# Don't bother with git since we're using a cloud-libs tarball
-touch clc/.nogit
-
-# FIXME: storage/Makefile breaks with parallel make
-make # %{?_smp_mflags}
-pushd clc/eucadmin
-( export PYTHONPATH=.; python gen_manpages.py )
-popd
-
-# Build the Eucalyptus Console
-pushd console
-%py2_build
-popd console
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT
-for x in $( cat %{SOURCE2} | grep -v junit4 );
-do
- rm $RPM_BUILD_ROOT%{eucajavalibdir}/$( basename $x )
- ln -s $x $RPM_BUILD_ROOT%{eucajavalibdir}
-done
-rm $RPM_BUILD_ROOT%{eucajavalibdir}/junit4*
-
-# Fix jar paths and replace them with symlinks
-mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
-for x in $RPM_BUILD_ROOT%{eucajavalibdir}/eucalyptus-*.jar; do
- if [ $( basename $x ) == "eucalyptus-storagecontroller-%{version}.jar" ]; then
- DESTFILE=%{_libdir}/%{name}/$( basename $x )
- else
- DESTFILE=%{_javadir}/%{name}/$( basename $x )
- fi
- mv $x $RPM_BUILD_ROOT$DESTFILE
- ln -s $DESTFILE $RPM_BUILD_ROOT/%{eucajavalibdir}/
-done
-
-# Link jars not needed at build time
-for jar in mule/mule-module-management \
- postgresql-jdbc \
- avalon-framework-impl \
- avalon-logkit \
- stax-utils \
- mx4j/mx4j-impl \
- mx4j/mx4j \
- mx4j/mx4j-jmx \
- mx4j/mx4j-remote \
- mx4j/mx4j-tools; do
- ln -s /usr/share/java/${jar}.jar $RPM_BUILD_ROOT%{eucajavalibdir}
-done
-
-pushd clc/eucadmin/man
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-cp -p * $RPM_BUILD_ROOT/%{_mandir}/man1
-popd
-
-sed -i -e 's#.*EUCALYPTUS=.*#EUCALYPTUS="/"#' \
- -e 's#.*HYPERVISOR=.*#HYPERVISOR="kvm"#' \
- -e 's#.*INSTANCE_PATH=.*#INSTANCE_PATH="/var/lib/%{name}/instances"#' \
- -e 's#.*VNET_BRIDGE=.*#VNET_BRIDGE="br0"#' \
- -e 's#.*USE_VIRTIO_DISK=.*#USE_VIRTIO_DISK="1"#' \
- -e 's#.*USE_VIRTIO_ROOT=.*#USE_VIRTIO_ROOT="1"#' \
- -e 's#.*VNET_PUBINTERFACE=.*#VNET_PUBINTERFACE="em1"#' \
- -e 's#.*VNET_PRIVINTERFACE=.*#VNET_PRIVINTERFACE="em1"#' \
- $RPM_BUILD_ROOT/etc/%{name}/eucalyptus.conf
-
-# Move init scripts into sbindir and call them from systemd
-mv $RPM_BUILD_ROOT/etc/init.d/eucalyptus-cloud \
- $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/eucalyptus-cloud.init
-rm -rf $RPM_BUILD_ROOT/etc/init.d
-cp -p %{SOURCE7} $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/eucalyptus-cc.init
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/eucalyptus-nc.init
-sed -i -e "s#@LIBDIR@#%{_libdir}#" $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/eucalyptus-cc.init
-sed -i -e "s#@LIBDIR@#%{_libdir}#" $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/eucalyptus-nc.init
-
-cp -p %{SOURCE13} $RPM_BUILD_ROOT/%{_sbindir}/eucalyptus-clean-cc
-
-# Make a server root for apache
-mkdir -p $RPM_BUILD_ROOT/etc/%{name}/httpd/conf/
-cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/%{name}/httpd/conf/httpd-cc.conf
-cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/%{name}/httpd/conf/httpd-nc.conf
-cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/%{name}/httpd/conf/httpd-common.conf
-ln -s %{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/%{name}/httpd/modules
-rm $RPM_BUILD_ROOT/etc/%{name}/httpd.conf
-
-sed -i -e "s#@EUCAAXIS2HOME@#%{axis2c_services}#" $RPM_BUILD_ROOT/etc/%{name}/httpd/conf/httpd-nc.conf
-sed -i -e "s#@EUCAAXIS2HOME@#%{axis2c_services}#" $RPM_BUILD_ROOT/etc/%{name}/httpd/conf/httpd-cc.conf
-
-# Create the directories where components store their data
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{name}
-touch $RPM_BUILD_ROOT/var/lib/%{name}/services
-for dir in bukkits CC db keys ldap upgrade vmware volumes webapps; do
- install -d -m 0700 $RPM_BUILD_ROOT/var/lib/%{name}/$dir
-done
-install -d -m 0771 $RPM_BUILD_ROOT/var/lib/%{name}/instances
-
-# Add PolicyKit config on systems that support it
-mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/rules.d/
-cp -p %{SOURCE14} $RPM_BUILD_ROOT/usr/share/polkit-1/rules.d/eucalyptus-nc-libvirt.rules
-
-# Put udev rules in the right place
-mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
-cp -p $RPM_BUILD_ROOT/usr/share/eucalyptus/udev/rules.d/12-dm-permissions.rules $RPM_BUILD_ROOT/etc/udev/rules.d/12-dm-permissions.rules
-cp -p $RPM_BUILD_ROOT/usr/share/eucalyptus/udev/rules.d/65-drbd-owner.rules $RPM_BUILD_ROOT/etc/udev/rules.d/65-drbd-owner.rules
-rm -rf $RPM_BUILD_ROOT/usr/share/eucalyptus/udev
-
-
-# Install systemd service files
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -p -m 644 %{SOURCE3} \
- $RPM_BUILD_ROOT%{_unitdir}/eucalyptus-cloud.service
-install -p -m 644 %{SOURCE4} \
- $RPM_BUILD_ROOT%{_unitdir}/eucalyptus-cc.service
-install -p -m 644 %{SOURCE5} \
- $RPM_BUILD_ROOT%{_unitdir}/eucalyptus-nc.service
-install -p -m 644 %{SOURCE16} \
- $RPM_BUILD_ROOT%{_unitdir}/eucalyptus-console.service
-
-# Copy axis2.xml into /etc for now, and symlink it
-install -m 644 %{SOURCE6} \
- $RPM_BUILD_ROOT/etc/%{name}/axis2.xml
-
-# add a mess of symlinks
-ln -s /etc/%{name}/axis2.xml $RPM_BUILD_ROOT%{axis2c_services}/cc/
-ln -s /etc/%{name}/axis2.xml $RPM_BUILD_ROOT%{axis2c_services}/nc/
-ln -s %{_libdir}/wso2-axis2/modules $RPM_BUILD_ROOT%{axis2c_services}/cc/
-ln -s %{_libdir}/wso2-axis2/modules $RPM_BUILD_ROOT%{axis2c_services}/nc/
-ln -s %{_libdir} $RPM_BUILD_ROOT%{axis2c_services}/cc/lib
-ln -s %{_libdir} $RPM_BUILD_ROOT%{axis2c_services}/nc/lib
-ln -s %{axis2c_services}/gl/services/EucalyptusGL $RPM_BUILD_ROOT%{axis2c_services}/cc/services
-ln -s %{axis2c_services}/gl/services/EucalyptusGL $RPM_BUILD_ROOT%{axis2c_services}/nc/services
-
-# Install axis2 test client files
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-install -m 755 gatherlog/GLclient $RPM_BUILD_ROOT%{_bindir}
-install -m 755 node/NCclient $RPM_BUILD_ROOT%{_bindir}
-install -m 755 cluster/CCclient_full $RPM_BUILD_ROOT%{_bindir}/CCclient
-
-# Fix some file permissions found by rpmlint
-chmod -x $RPM_BUILD_ROOT/var/lib/%{name}/keys/nc-client-policy.xml
-chmod -x $RPM_BUILD_ROOT/var/lib/%{name}/keys/cc-client-policy.xml
-chmod -x $RPM_BUILD_ROOT%{axis2c_services}/cc/services/EucalyptusCC/eucalyptus_cc.wsdl
-chmod -x $RPM_BUILD_ROOT%{axis2c_services}/cc/services/EucalyptusCC/services.xml
-chmod -x $RPM_BUILD_ROOT%{axis2c_services}/gl/services/EucalyptusGL/eucalyptus_gl.wsdl
-chmod -x $RPM_BUILD_ROOT%{axis2c_services}/gl/services/EucalyptusGL/services.xml
-chmod -x $RPM_BUILD_ROOT%{axis2c_services}/nc/services/EucalyptusNC/services.xml
-chmod -x $RPM_BUILD_ROOT%{_datadir}/eucalyptus/floppy
-
-# This file is no longer needed, and was not even ported from MySQL to PostGreSQL
-rm $RPM_BUILD_ROOT%{python_sitelib}/eucadmin/local.py*
-
-# This is not the ideal way to set kernel parameters. We'll deal with this
-# via documentation for now.
-rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cloud.d/init.d/01_pg_kernel_params
-
-# Move cloud.d directories which aren't config files. We need symlinks
-# for now, though.
-mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cloud.d/scripts \
- $RPM_BUILD_ROOT%{_libexecdir}/%{name}/scripts
-ln -s %{_libexecdir}/%{name}/scripts \
- $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cloud.d/
-
-# doc fixups
-mv $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/drbd.conf.example \
- $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
-
-# install tmpfiles config
-install -d -m 755 $RPM_BUILD_ROOT/etc/tmpfiles.d
-install -m 0644 %{SOURCE15} $RPM_BUILD_ROOT/etc/tmpfiles.d/%{name}
-
-# Install Eucalyptus Console
-pushd console
-%py2_install
-
-# Install sysconfig file
-install -d $RPM_BUILD_ROOT/etc/sysconfig
-install -m 644 ../tools/eucalyptus-console.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/eucalyptus-console
-
-echo "
-[paths]
-staticpath: /usr/share/eucalyptus-console/static
-" >> $RPM_BUILD_ROOT/etc/eucalyptus-console/console.ini
-
-# Enable SSL support by default
-# NOTE: The certificate and key are not packaged, but will be generated
-# on the first run of the service.
-#
-# Fixes EUCA-3901
-sed -i -e 's@^#sslcert:.*$@sslcert: /etc/eucalyptus-console/console.crt@' \
- -e 's@^#sslkey:.*$@sslkey: /etc/eucalyptus-console/console.key@' \
- $RPM_BUILD_ROOT/etc/eucalyptus-console/console.ini
-
-# Create directory for pid file
-install -d $RPM_BUILD_ROOT/var/run/eucalyptus-console
-popd console
-
-
-%files
-%doc LICENSE README CHANGELOG
-%doc tools/multipath.conf.example tools/iscsid.conf.example
-# Eucalyptus initialization fails if the eucalyptus user
-# cannot write this file.
-%config(noreplace) %attr(-,eucalyptus,eucalyptus) /etc/%{name}/eucalyptus.conf
-%{_datadir}/%{name}/eucalyptus-version
-%config(noreplace) /etc/%{name}/axis2.xml
-%dir /etc/%{name}/httpd
-%dir /etc/%{name}/httpd/conf
-%config(noreplace) /etc/%{name}/httpd/conf/httpd-common.conf
-%config /etc/tmpfiles.d/%{name}
-/etc/%{name}/httpd/modules
-# Needed for multipath on NCs and SAN-enabled SCs
-/etc/udev/rules.d/12-dm-permissions.rules
-/etc/udev/rules.d/65-drbd-owner.rules
-%attr(-,root,root) %dir %{eucalibexecdir}
-%attr(4750,root,eucalyptus) %{eucalibexecdir}/euca_mountwrap
-%attr(4750,root,eucalyptus) %{eucalibexecdir}/euca_rootwrap
-%dir %{eucadatadir}
-%{_sbindir}/euca_sync_key
-%{_sbindir}/euca-generate-fault
-
-# helperdir is either eucadatadir or eucalibexecdir
-%{helperdir}/add_key.pl
-%{helperdir}/connect_iscsitarget.pl
-%{helperdir}/connect_iscsitarget_main.pl
-%{helperdir}/create-loop-devices
-%{helperdir}/disconnect_iscsitarget.pl
-%{helperdir}/disconnect_iscsitarget_main.pl
-%{helperdir}/euca_ipt
-%{helperdir}/euca_upgrade
-%{helperdir}/floppy
-%{helperdir}/faults/
-%{helperdir}/get_iscsitarget.pl
-%{helperdir}/iscsitarget_common.pl
-%{helperdir}/populate_arp.pl
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/db
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/keys
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/upgrade
-# Can this file go into a single-component package? What uses it?
-/var/lib/%{name}/keys/cc-client-policy.xml
-%attr(-,eucalyptus,eucalyptus) %dir /var/log/%{name}
-%attr(-,eucalyptus,eucalyptus) %dir /var/run/%{name}
-
-%files common-java
-%{_unitdir}/eucalyptus-cloud.service
-%{_libexecdir}/%{name}/eucalyptus-cloud.init
-# cloud.d contains random stuff used by every Java component. Most of it
-# probably belongs in /usr/share, but moving it will be painful.
-%{_sysconfdir}/%{name}/cloud.d/
-%{_libexecdir}/%{name}/scripts/
-%{_sbindir}/eucalyptus-cloud
-%{eucajavalibdir}/*jar*
-%{_javadir}/%{name}/*jar*
-%{_libdir}/%{name}/eucalyptus-storagecontroller-%{version}.jar
-%ghost /var/lib/%{name}/services
-%attr(-,eucalyptus,eucalyptus) /var/lib/%{name}/webapps/
-
-%files cloud
-%{_sbindir}/euca-lictool
-%{eucadatadir}/lic_default
-%{eucadatadir}/lic_template
-
-%files walrus
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/bukkits
-%doc %{_docdir}/%{name}-%{version}/drbd.conf.example
-
-%files sc
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/volumes
-%{helperdir}/connect_iscsitarget_sc.pl
-%{helperdir}/disconnect_iscsitarget_sc.pl
-%{_libdir}/eucalyptus/libdascontrol.so
-%{_libdir}/eucalyptus/liblvm2control.so
-
-%files cc
-%{_unitdir}/eucalyptus-cc.service
-%{_libexecdir}/%{name}/eucalyptus-cc.init
-%{axis2c_services}/cc
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/CC
-%config(noreplace) /etc/%{name}/httpd/conf/httpd-cc.conf
-%{_datadir}/%{name}/vtunall.conf.template
-%attr(0755,root,root) %{_libexecdir}/eucalyptus/shutdownCC
-%{_sbindir}/eucalyptus-clean-cc
-%{helperdir}/dynserv.pl
-%{helperdir}/getstats_net.pl
-# Is this used?
-/var/lib/%{name}/keys/nc-client-policy.xml
-
-%files nc
-%config(noreplace) /etc/%{name}/libvirt.xsl
-%dir /etc/%{name}/nc-hooks
-/etc/%{name}/nc-hooks/example.sh
-%{_unitdir}/eucalyptus-nc.service
-%{_libexecdir}/%{name}/eucalyptus-nc.init
-%{axis2c_services}/nc
-%attr(-,eucalyptus,eucalyptus) %dir /var/lib/%{name}/instances
-%config(noreplace) /etc/%{name}/httpd/conf/httpd-nc.conf
-%{_sbindir}/euca_test_nc
-%{helperdir}/detach.pl
-%{helperdir}/gen_kvm_libvirt_xml
-%{helperdir}/gen_libvirt_xml
-%{helperdir}/getstats.pl
-%{helperdir}/get_sys_info
-%{helperdir}/get_xen_info
-%{helperdir}/partition2disk
-/usr/share/polkit-1/rules.d/eucalyptus-nc-libvirt.rules
-%{_docdir}/%{name}-%{version}/libvirt*
-
-%files gl
-%{axis2c_services}/gl
-
-# NB: the vmware tools packaged here only work against Eucalyptus
-# Enterprise plugins, but the client and server may be different
-# systems, so it's reasonable to package these commands here.
-%files admin-tools
-%{_sbindir}/euca_conf
-%{_sbindir}/euca-configure-vmware
-%{_sbindir}/euca-deregister-arbitrator
-%{_sbindir}/euca-deregister-cloud
-%{_sbindir}/euca-deregister-cluster
-%{_sbindir}/euca-deregister-storage-controller
-%{_sbindir}/euca-deregister-vmware-broker
-%{_sbindir}/euca-deregister-walrus
-%{_sbindir}/euca-describe-arbitrators
-%{_sbindir}/euca-describe-clouds
-%{_sbindir}/euca-describe-clusters
-%{_sbindir}/euca-describe-components
-%{_sbindir}/euca-describe-nodes
-%{_sbindir}/euca-describe-properties
-%{_sbindir}/euca-describe-services
-%{_sbindir}/euca-describe-storage-controllers
-%{_sbindir}/euca-describe-vmware-brokers
-%{_sbindir}/euca-describe-walruses
-%{_sbindir}/euca-get-credentials
-%{_sbindir}/euca-modify-cluster
-%{_sbindir}/euca-modify-property
-%{_sbindir}/euca-modify-service
-%{_sbindir}/euca-modify-storage-controller
-%{_sbindir}/euca-modify-walrus
-%{_sbindir}/euca-register-arbitrator
-%{_sbindir}/euca-register-cloud
-%{_sbindir}/euca-register-cluster
-%{_sbindir}/euca-register-storage-controller
-%{_sbindir}/euca-register-vmware-broker
-%{_sbindir}/euca-register-walrus
-%{_sbindir}/eureport-generate-report
-%{_sbindir}/eureport-export-data
-%{_sbindir}/eureport-delete-data
-%{_sbindir}/euca-describe-instance-types
-%{_sbindir}/euca-migrate-instances
-%{_mandir}/man1/*
-
-%files -n python-eucadmin
-%{python2_sitelib}/eucadmin*
-
-%files console
-%doc console/README.md
-%{python2_sitelib}/esapi*
-%{python2_sitelib}/eucaconsole*
-%{python2_sitelib}/Eucalyptus_Management_Console*.egg-info
-%{_bindir}/euca-console-server
-%{_unitdir}/eucalyptus-console.service
-%attr(-,eucaconsole,eucaconsole) %{_datadir}/eucalyptus-console
-%attr(-,eucaconsole,eucaconsole) %dir /etc/eucalyptus-console
-%attr(-,eucaconsole,eucaconsole) %config /etc/eucalyptus-console/console.ini
-%attr(-,eucaconsole,eucaconsole) %dir /var/run/eucalyptus-console
-%config /etc/sysconfig/eucalyptus-console
-
-%files axis2-clients
-%{_bindir}/NCclient
-%{_bindir}/CCclient
-%{_bindir}/GLclient
-
-%pre
-getent group eucalyptus >/dev/null || groupadd -r eucalyptus
-## FIXME: Make QA (and Eucalyptus proper?) work with /sbin/nologin as the shell [RT:2092]
-#getent passwd eucalyptus >/dev/null || \
-# useradd -r -g eucalyptus -d /var/lib/%{name} -s /sbin/nologin \
-# -c 'Eucalyptus' eucalyptus
-getent passwd eucalyptus >/dev/null || \
- useradd -r -g eucalyptus -d /var/lib/%{name} \
- -c 'Eucalyptus' eucalyptus
-
-%pre console
-getent group eucaconsole >/dev/null || groupadd -r eucaconsole
-getent passwd eucaconsole >/dev/null || \
- useradd -r -g eucaconsole -d /etc/eucalyptus-console \
- -c 'Eucalyptus Console' eucaconsole
-
-%post
-udevadm control --reload-rules
-
-%post common-java
-%systemd_post eucalyptus-cloud.service
-
-%post cc
-%systemd_post eucalyptus-cc.service
-
-%post nc
-usermod -a -G kvm eucalyptus
-%systemd_post eucalyptus-nc.service
-
-%post console
-%systemd_post eucalyptus-console.service
-
-%preun common-java
-%systemd_preun eucalyptus-cloud.service
-
-%preun cc
-%systemd_preun eucalyptus-cc.service
-
-%preun nc
-%systemd_preun eucalyptus-nc.service
-
-%preun console
-%systemd_preun eucalyptus-console.service
-
-%postun
-# Reload udev rules on uninstall
-if [ "$1" = "0" ]; then
- /sbin/service udev-post reload || :
-fi
-
-%changelog
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.3.0-0.15.20130408git32052445
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.3.0-0.14.20130408git32052445
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.3.0-0.13.20130408git32052445
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.3.0-0.12.20130408git32052445
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.3.0-0.11.20130408git32052445
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.3.0-0.10.20130408git32052445
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.3.0-0.9.20130408git32052445
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.3.0-0.8.20130408git32052445
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.3.0-0.7.20130408git32052445
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Mar 28 2014 Michael Simacek <msimacek(a)redhat.com> - 3.3.0-0.6.20130408git32052445
-- Use Requires: java-headless rebuild (#1067528)
-
-* Sat Aug 10 2013 Matt Spaulding <mspaulding06(a)gmail.com> - 3.3.0-0.5.20130408git32052445
-- Remove grub2 requirement to fix arm build
-
-* Tue Aug 06 2013 Dennis Gilmore <dennis(a)ausil.us> - 3.3.0-0.4.20130408git32052445
-- fix path to wss4j.jar
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.3.0-0.3.20130408git32052445
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 17 2013 Petr Pisar <ppisar(a)redhat.com> - 3.3.0-0.2.20130408git32052445
-- Perl 5.18 rebuild
-
-* Mon Apr 8 2013 Andy Grimm <agrimm(a)gmail.com> - 3.3.0-0.1.20130408git32052445
-- Update to 3.3.0 snapshot
-
-* Fri Mar 1 2013 Andy Grimm <agrimm(a)gmail.com> - 3.2.1-3
-- Fix build issues caused by Jetty 9 update
-
-* Thu Feb 28 2013 Andy Grimm <agrimm(a)gmail.com> - 3.2.1-2
-- Add explicit BuildRequires/Requires for jboss-logging
-
-* Thu Feb 28 2013 Andy Grimm <agrimm(a)gmail.com> - 3.2.1-1
-- Update to 3.2.1 (CVE-2012-4066)
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2.0-0.6.20121210git5ab72572
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Dec 13 2012 Andy Grimm <agrimm(a)gmail.com> - 3.2.0-0.5.20121210git5ab7257
-- Remove backport-util-concurrent
-- Add systemd unit for eucalyptus-console
-- Fix cert validation error in eucalyptus-console
-- Fix a typo in eucalyptus-clean-cc script
-
-* Wed Dec 12 2012 Andy Grimm <agrimm(a)gmail.com> - 3.2.0-0.4.20121210git5ab7257
-- Use newer wss4j / xml-security / hibernate in F18
-- Fix systemd macro usage
-
-* Wed Dec 12 2012 Andy Grimm <agrimm(a)gmail.com> - 3.2.0-0.3.20121210git5ab7257
-- Work around incorrect tgt status checks
-- Define environment variables in eucalyptus-clean-cc script
-- Remove libmod_rampart link from axis2 service modules
-
-* Tue Dec 11 2012 Andy Grimm <agrimm(a)gmail.com> - 3.2.0-0.2.20121210git5ab7257
-- Add compatibility for F18
-
-* Mon Dec 10 2012 Andy Grimm <agrimm(a)gmail.com> - 3.2.0-0.1.20121210git5ab7257
-- Bump to 3.2.0
-
-* Thu Nov 08 2012 Marek Goldmann <mgoldman(a)redhat.com> - 3.1.2-0.7.20120917gitb8c109b4
-- Add support for new Maven compat version resolver (hibernate3)
-
-* Tue Oct 09 2012 Andy Grimm <agirmm(a)gmail.com> - 3.1.2-0.6.20120917gitb8c109b4
-- First official Fedora build
diff --git a/eucalyptus.tmpfiles b/eucalyptus.tmpfiles
deleted file mode 100644
index 4cc131f..0000000
--- a/eucalyptus.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/eucalyptus 755 eucalyptus eucalyptus
diff --git a/httpd-cc.conf b/httpd-cc.conf
deleted file mode 100644
index ddb60ba..0000000
--- a/httpd-cc.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This is the apache config for eucalyptus: we use it only to load the
-# axis2c module which will take care of the WebServices
-#
-
-ServerRoot "/etc/eucalyptus/httpd"
-
-Include conf/httpd-common.conf
-
-Listen 8774
-
-PidFile /var/run/eucalyptus/eucalyptus-cc.pid
-
-ErrorLog /var/log/eucalyptus/httpd-cc_error_log
-
-Axis2RepoPath /usr/lib64/eucalyptus/axis2/cc
-Axis2LogFile /var/log/eucalyptus/axis2-cc.log
-Axis2MaxLogFileSize 128
-Axis2LogLevel info
-<Location /axis2>
- SetHandler axis2_module
-</Location>
-
diff --git a/httpd-common.conf b/httpd-common.conf
deleted file mode 100644
index a72560c..0000000
--- a/httpd-common.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# This is the apache config for eucalyptus: we use it only to load the
-# axis2c module which will take care of the WebServices
-#
-
-ServerTokens OS
-
-ServerRoot "/etc/eucalyptus/httpd"
-
-ServerName 127.0.0.1
-
-KeepAliveTimeout 30
-
-User eucalyptus
-Group eucalyptus
-
-LogLevel info
-
-<IfModule authz_host>
- <Directory />
- Order deny,allow
- Allow from all
- Deny from all
- </Directory>
-</IfModule>
-
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule axis2_module modules/mod_axis2.so
-LoadModule mpm_event_module modules/mod_mpm_event.so
-LoadModule authn_core_module modules/mod_authn_core.so
-LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule unixd_module modules/mod_unixd.so
diff --git a/httpd-nc.conf b/httpd-nc.conf
deleted file mode 100644
index 1067a30..0000000
--- a/httpd-nc.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This is the apache config for eucalyptus: we use it only to load the
-# axis2c module which will take care of the WebServices
-#
-
-ServerRoot "/etc/eucalyptus/httpd"
-
-Include conf/httpd-common.conf
-
-Listen 8775
-
-PidFile /var/run/eucalyptus/eucalyptus-nc.pid
-
-ErrorLog /var/log/eucalyptus/httpd-nc_error_log
-
-Axis2RepoPath /usr/lib64/eucalyptus/axis2/nc/
-Axis2LogFile /var/log/eucalyptus/axis2-nc.log
-Axis2MaxLogFileSize 128
-Axis2LogLevel debug
-<Location /axis2>
- SetHandler axis2_module
-</Location>
-
diff --git a/sources b/sources
deleted file mode 100644
index 75aa9b7..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-f82ac5ec2153ec2d7e35f7eb9ab4c0f7 eucalyptus-3.3.0.32052445.tgz
-81024eefd6be8d71e3f0f427f2ddfa46 eucalyptus-3.3.0.32052445-generated.tgz
4 years, 9 months
Architecture specific change in rpms/ember.git
by githook-noreply@fedoraproject.org
The package rpms/ember.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ember.git/commit/?id=5ab2c89fec03....
Change:
-%ifnarch %{arm} aarch64
Thanks.
Full change:
============
commit 5ab2c89fec03c5d70f56764ac8d5ee63b329c612
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:42:33 2019 +0000
ember fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674851
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1145f7b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-ember-0.5.6.tar.bz2
-/ember-0.6.0.tar.bz2
-/ember-0.6.1.tar.bz2
-/ember-0.6.1.1.tar.bz2
-/ember-0.6.2.tar.bz2
-/ember-0.6.3.tar.bz2
-/ember-0.7.0.tar.bz2
-/ember-0.7.2.tar.bz2
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..66c2f43
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+ember fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674851
diff --git a/ember-0.6.0-fix_implicit_dso.patch b/ember-0.6.0-fix_implicit_dso.patch
deleted file mode 100644
index 3f99dee..0000000
--- a/ember-0.6.0-fix_implicit_dso.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ember-0.6.0/configure.fix_implicit_dso ember-0.6.0/configure
---- ember-0.6.0/configure.fix_implicit_dso 2011-01-06 16:09:37.446271001 -0500
-+++ ember-0.6.0/configure 2011-01-06 16:09:42.384271000 -0500
-@@ -15711,7 +15711,7 @@ fi
- $as_echo "$ac_cv_lib_GL_glViewport" >&6; }
- if test "x$ac_cv_lib_GL_glViewport" = x""yes; then :
-
-- LIBS="$LIBS -lGL"
-+ LIBS="$LIBS -lGL -lX11"
- CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include -I/usr/include"
-
- $as_echo "#define HAVE_OPENGL 1" >>confdefs.h
diff --git a/ember-0.6.3-fix_implicit_dso.patch b/ember-0.6.3-fix_implicit_dso.patch
deleted file mode 100644
index eded99c..0000000
--- a/ember-0.6.3-fix_implicit_dso.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ember-0.6.3/configure.fix_implicit_dso ember-0.6.3/configure
---- ember-0.6.3/configure.fix_implicit_dso 2012-11-13 16:50:07.440824091 -0500
-+++ ember-0.6.3/configure 2012-11-13 16:50:14.503828660 -0500
-@@ -17390,7 +17390,7 @@ fi
- $as_echo "$ac_cv_lib_GL_glViewport" >&6; }
- if test "x$ac_cv_lib_GL_glViewport" = xyes; then :
-
-- LIBS="$LIBS -lGL"
-+ LIBS="$LIBS -lGL -lX11"
- CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include -I/usr/include"
-
- $as_echo "#define HAVE_OPENGL 1" >>confdefs.h
diff --git a/ember-0.7.0-boost_shared_array.patch b/ember-0.7.0-boost_shared_array.patch
deleted file mode 100644
index 0537cbe..0000000
--- a/ember-0.7.0-boost_shared_array.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ember-0.7.0/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeData2D.cpp\~ ember-0.7.0/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeData2D.cpp
---- ember-0.7.0/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeData2D.cpp~ 2012-03-17 21:49:34.000000000 +0100
-+++ ember-0.7.0/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeData2D.cpp 2013-02-12 17:47:09.000000000 +0100
-@@ -116,7 +116,7 @@ void PagingLandScapeData2D::unload()
- _save ();
- //Use the shared pointer for deletion
- // delete[] mHeightData;
-- mHeightDataPtr.reset(0);
-+ mHeightDataPtr.reset();
- mHeightData = 0;
- _unload();
- mIsLoaded = false;
-
-Diff finished. Tue Feb 12 18:53:28 2013
diff --git a/ember-0.7.0-lua-5.2.patch b/ember-0.7.0-lua-5.2.patch
deleted file mode 100644
index c799652..0000000
--- a/ember-0.7.0-lua-5.2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up ember-0.7.0/src/components/lua/LuaHelper.cpp.lua-52 ember-0.7.0/src/components/lua/LuaHelper.cpp
---- ember-0.7.0/src/components/lua/LuaHelper.cpp.lua-52 2013-05-14 16:07:36.334360381 -0400
-+++ ember-0.7.0/src/components/lua/LuaHelper.cpp 2013-05-14 16:08:56.371361582 -0400
-@@ -35,7 +35,7 @@ namespace Lua {
- int LuaHelper::luaErrorHandler(lua_State *L) {
- #if LUA_VERSION_NUM >= 501
- //see if we have the debug library loaded
-- lua_getfield(L, LUA_GLOBALSINDEX, "debug");
-+ lua_getglobal(L, "debug");
- if (!lua_istable(L, -1)) {
- lua_pop(L, 1);
- return 1;
-diff -up ember-0.7.0/src/components/lua/LuaScriptingProvider.cpp.lua-52 ember-0.7.0/src/components/lua/LuaScriptingProvider.cpp
---- ember-0.7.0/src/components/lua/LuaScriptingProvider.cpp.lua-52 2013-01-14 16:35:44.000000000 -0500
-+++ ember-0.7.0/src/components/lua/LuaScriptingProvider.cpp 2013-05-14 16:07:24.159360199 -0400
-@@ -44,7 +44,9 @@ extern "C" {
- #include "LuaHelper.h"
- #include "LuaScriptingCallContext.h"
-
--
-+#ifndef lua_open
-+#define lua_open() luaL_newstate()
-+#endif
-
- namespace Ember {
-
-@@ -255,7 +257,10 @@ void LuaScriptingProvider::callFunctionI
- lua_pushcfunction(mLuaState, LuaHelper::luaErrorHandler); // st: args func err_h
- #else
- lua_pushliteral(mLuaState, "_TRACEBACK");
-- lua_rawget(mLuaState, LUA_GLOBALSINDEX); /* get traceback function */
-+ lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS);
-+ lua_insert(L,-2);
-+ lua_rawget(L,-2);
-+ lua_remove(L,-2);
- #endif
- lua_insert(mLuaState, error_index); // st: args err_h func
-
diff --git a/ember-0.7.2-fix-boost-m4.patch b/ember-0.7.2-fix-boost-m4.patch
deleted file mode 100644
index a630598..0000000
--- a/ember-0.7.2-fix-boost-m4.patch
+++ /dev/null
@@ -1,826 +0,0 @@
-diff --git a/m4/boost.m4 b/m4/boost.m4
-index c8eb65ae5123..bd0a9bd72bf0 100644
---- a/m4/boost.m4
-+++ b/m4/boost.m4
-@@ -1,5 +1,5 @@
- # boost.m4: Locate Boost headers and libraries for autoconf-based projects.
--# Copyright (C) 2007, 2008, 2009, 2010, 2011 Benoit Sigoure <tsuna(a)lrde.epita.fr>
-+# Copyright (C) 2007-2011, 2014 Benoit Sigoure <tsuna(a)lrde.epita.fr>
- #
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -22,7 +22,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- m4_define([_BOOST_SERIAL], [m4_translit([
--# serial 18
-+# serial 24
- ], [#
- ], [])])
-
-@@ -59,7 +59,8 @@ m4_pattern_forbid([^_?(BOOST|Boost)_])
- # It could be useful to turn this into a macro which extracts the
- # value of any macro.
- m4_define([_BOOST_SED_CPP],
--[AC_LANG_PREPROC_REQUIRE()dnl
-+[AC_LANG_PUSH([C++])dnl
-+AC_LANG_PREPROC_REQUIRE()dnl
- AC_REQUIRE([AC_PROG_SED])dnl
- AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])])
- AS_IF([dnl eval is necessary to expand ac_cpp.
-@@ -71,13 +72,31 @@ dnl strip `\n' with backquotes, not the `\r'. This results in
- dnl boost_cv_lib_version='1_37\r' for instance, which breaks
- dnl everything else.
- dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
-+dnl
-+dnl Beware that GCC 5, when expanding macros, may embed # line directives
-+dnl a within single line:
-+dnl
-+dnl # 1 "conftest.cc"
-+dnl # 1 "<built-in>"
-+dnl # 1 "<command-line>"
-+dnl # 1 "conftest.cc"
-+dnl # 1 "/opt/local/include/boost/version.hpp" 1 3
-+dnl # 2 "conftest.cc" 2
-+dnl boost-lib-version =
-+dnl # 2 "conftest.cc" 3
-+dnl "1_56"
-+dnl
-+dnl So get rid of the # lines, and glue the remaining ones together.
- (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-+ grep -v '#' |
- tr -d '\r' |
-+ tr -s '\n' ' ' |
- $SED -n -e "$1" >conftest.i 2>&1],
- [$3],
- [$4])
- rm -rf conftest*
--])# AC_EGREP_CPP
-+AC_LANG_POP([C++])dnl
-+])# _BOOST_SED_CPP
-
-
-
-@@ -206,7 +225,7 @@ AC_LANG_POP([C++])dnl
- AC_CACHE_CHECK([for Boost's header version],
- [boost_cv_lib_version],
- [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
-- _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;q;}],
-+ _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
- [#include <boost/version.hpp>
- boost-lib-version = BOOST_LIB_VERSION],
- [boost_cv_lib_version=`cat conftest.i`])])
-@@ -214,13 +233,14 @@ boost-lib-version = BOOST_LIB_VERSION],
- boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
- case $boost_major_version in #(
- '' | *[[!0-9]]*)
-- AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
-+ AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version'])
- ;;
- esac
- fi
- CPPFLAGS=$boost_save_CPPFLAGS
- ])# BOOST_REQUIRE
-
-+
- # BOOST_STATIC()
- # --------------
- # Add the "--enable-static-boost" configure argument. If this argument is given
-@@ -232,6 +252,7 @@ AC_DEFUN([BOOST_STATIC],
- [enable_static_boost=yes],
- [enable_static_boost=no])])# BOOST_STATIC
-
-+
- # BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND])
- # --------------------------------------------------------------------------
- # Wrapper around AC_CHECK_HEADER for Boost headers. Useful to check for
-@@ -264,14 +285,16 @@ fi
- ])# BOOST_FIND_HEADER
-
-
--# BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
--# [CXX-PROLOGUE])
--# -------------------------------------------------------------------------
--# Look for the Boost library LIB-NAME (e.g., LIB-NAME = `thread', for
--# libboost_thread). Check that HEADER-NAME works and check that
--# libboost_LIB-NAME can link with the code CXX-TEST. The optional argument
--# CXX-PROLOGUE can be used to include some C++ code before the `main'
--# function.
-+# BOOST_FIND_LIBS([COMPONENT-NAME], [CANDIDATE-LIB-NAMES],
-+# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
-+# [CXX-PROLOGUE])
-+# --------------------------------------------------------------
-+# Look for the Boost library COMPONENT-NAME (e.g., `thread', for
-+# libboost_thread) under the possible CANDIDATE-LIB-NAMES (e.g.,
-+# "thread_win32 thread"). Check that HEADER-NAME works and check that
-+# libboost_LIB-NAME can link with the code CXX-TEST. The optional
-+# argument CXX-PROLOGUE can be used to include some C++ code before
-+# the `main' function.
- #
- # Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above).
- #
-@@ -285,7 +308,7 @@ fi
- # builds. Some sample values for PREFERRED-RT-OPT: (nothing), mt, d, mt-d, gdp
- # ... If you want to make sure you have a specific version of Boost
- # (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro.
--AC_DEFUN([BOOST_FIND_LIB],
-+AC_DEFUN([BOOST_FIND_LIBS],
- [AC_REQUIRE([BOOST_REQUIRE])dnl
- AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl
- AC_REQUIRE([BOOST_STATIC])dnl
-@@ -299,32 +322,69 @@ AS_VAR_PUSHDEF([Boost_lib], [boost_cv_lib_$1])dnl
- AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl
- AS_VAR_PUSHDEF([Boost_lib_LDPATH], [boost_cv_lib_$1_LDPATH])dnl
- AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl
--BOOST_FIND_HEADER([$3])
-+BOOST_FIND_HEADER([$4])
- boost_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
--# Now let's try to find the library. The algorithm is as follows: first look
--# for a given library name according to the user's PREFERRED-RT-OPT. For each
--# library name, we prefer to use the ones that carry the tag (toolset name).
--# Each library is searched through the various standard paths were Boost is
--# usually installed. If we can't find the standard variants, we try to
--# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist
--# but there's -obviously- libboost_threads-mt.dylib).
- AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib],
-- [Boost_lib=no
-- case "$2" in #(
-- mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
-- mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*\(.*\)'`;; #(
-- *) boost_mt=; boost_rtopt=$2;;
-+ [_BOOST_FIND_LIBS($@)])
-+case $Boost_lib in #(
-+ (no) _AC_MSG_LOG_CONFTEST
-+ AC_MSG_ERROR([cannot find the flags to link with Boost $1])
-+ ;;
-+esac
-+AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl
-+AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl
-+AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl
-+AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl
-+CPPFLAGS=$boost_save_CPPFLAGS
-+AS_VAR_POPDEF([Boost_lib])dnl
-+AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl
-+AS_VAR_POPDEF([Boost_lib_LDPATH])dnl
-+AS_VAR_POPDEF([Boost_lib_LIBS])dnl
-+AC_LANG_POP([C++])dnl
-+fi
-+])
-+
-+
-+# BOOST_FIND_LIB([LIB-NAME],
-+# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
-+# [CXX-PROLOGUE])
-+# --------------------------------------------------------------
-+# Backward compatibility wrapper for BOOST_FIND_LIBS.
-+AC_DEFUN([BOOST_FIND_LIB],
-+[BOOST_FIND_LIBS([$1], $@)])
-+
-+
-+# _BOOST_FIND_LIBS([LIB-NAME], [CANDIDATE-LIB-NAMES],
-+# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
-+# [CXX-PROLOGUE])
-+# --------------------------------------------------------------
-+# Real implementation of BOOST_FIND_LIBS: rely on these local macros:
-+# Boost_lib, Boost_lib_LDFLAGS, Boost_lib_LDPATH, Boost_lib_LIBS
-+#
-+# The algorithm is as follows: first look for a given library name
-+# according to the user's PREFERRED-RT-OPT. For each library name, we
-+# prefer to use the ones that carry the tag (toolset name). Each
-+# library is searched through the various standard paths were Boost is
-+# usually installed. If we can't find the standard variants, we try
-+# to enforce -mt (for instance on MacOSX, libboost_thread.dylib
-+# doesn't exist but there's -obviously- libboost_thread-mt.dylib).
-+AC_DEFUN([_BOOST_FIND_LIBS],
-+[Boost_lib=no
-+ case "$3" in #(
-+ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
-+ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$3" : 'Xmt-*\(.*\)'`;; #(
-+ (*) boost_mt=; boost_rtopt=$3;;
- esac
- if test $enable_static_boost = yes; then
- boost_rtopt="s$boost_rtopt"
- fi
- # Find the proper debug variant depending on what we've been asked to find.
- case $boost_rtopt in #(
-- *d*) boost_rt_d=$boost_rtopt;; #(
-- *[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn')
-+ (*d*) boost_rt_d=$boost_rtopt;; #(
-+ (*[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn')
- boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
-- *) boost_rt_d='-d';;
-+ (*) boost_rt_d='-d';;
- esac
- # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
- test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
-@@ -335,8 +395,8 @@ AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib],
- AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?])
- boost_save_ac_objext=$ac_objext
- # Generate the test file.
-- AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3>
--$5], [$4])])
-+ AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$4>
-+$6], [$5])])
- dnl Optimization hacks: compiling C++ is slow, especially with Boost. What
- dnl we're trying to do here is guess the right combination of link flags
- dnl (LIBS / LDFLAGS) to use a given library. This can take several
-@@ -358,21 +418,22 @@ dnl start the for loops).
- [AC_MSG_ERROR([cannot compile a test that uses Boost $1])])
- ac_objext=$boost_save_ac_objext
- boost_failed_libs=
--# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
--# matter.
-+# Don't bother to ident the following nested for loops, only the 2
-+# innermost ones matter.
-+for boost_lib_ in $2; do
- for boost_tag_ in -$boost_cv_lib_tag ''; do
- for boost_ver_ in -$boost_cv_lib_version ''; do
- for boost_mt_ in $boost_mt -mt ''; do
- for boost_rtopt_ in $boost_rtopt '' -d; do
- for boost_lib in \
-- boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
-- boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \
-- boost_$1$boost_tag_$boost_mt_$boost_ver_ \
-- boost_$1$boost_tag_$boost_ver_
-+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
-+ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
-+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
-+ boost_$boost_lib_$boost_tag_$boost_ver_
- do
- # Avoid testing twice the same lib
- case $boost_failed_libs in #(
-- *@$boost_lib@*) continue;;
-+ (*@$boost_lib@*) continue;;
- esac
- # If with_boost is empty, we'll search in /lib first, which is not quite
- # right so instead we'll try to a location based on where the headers are.
-@@ -382,14 +443,17 @@ for boost_rtopt_ in $boost_rtopt '' -d; do
- /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
- "$with_boost" C:/Boost/lib /lib*
- do
-- test -e "$boost_ldpath" || continue
-+ # Don't waste time with directories that don't exist.
-+ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
-+ continue
-+ fi
- boost_save_LDFLAGS=$LDFLAGS
- # Are we looking for a static library?
- case $boost_ldpath:$boost_rtopt_ in #(
-- *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
-+ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
- Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext"
- test -e "$Boost_lib_LIBS" || continue;; #(
-- *) # No: use -lboost_foo to find the shared library.
-+ (*) # No: use -lboost_foo to find the shared library.
- Boost_lib_LIBS="-l$boost_lib";;
- esac
- boost_save_LIBS=$LIBS
-@@ -403,27 +467,35 @@ dnl generated only once above (before we start the for loops).
- LDFLAGS=$boost_save_LDFLAGS
- LIBS=$boost_save_LIBS
- if test x"$Boost_lib" = xyes; then
-- # Check or used cached result of whether or not using -R or -rpath makes sense.
-- # Some implementations of ld, such as for Mac OSX, require -rpath but
-- # -R is the flag known to work on other systems.
-- # https://github.com/tsuna/boost.m4/issues/19
-+ # Check or used cached result of whether or not using -R or
-+ # -rpath makes sense. Some implementations of ld, such as for
-+ # Mac OSX, require -rpath but -R is the flag known to work on
-+ # other systems. https://github.com/tsuna/boost.m4/issues/19
- AC_CACHE_VAL([boost_cv_rpath_link_ldflag],
-- [for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
-- LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
-- LIBS="$boost_save_LIBS $Boost_lib_LIBS"
-- _BOOST_AC_LINK_IFELSE([],
-- [boost_rpath_link_ldflag_found=yes
-- break],
-- [boost_rpath_link_ldflag_found=no])
-- done
-+ [case $boost_ldpath in
-+ '') # Nothing to do.
-+ boost_cv_rpath_link_ldflag=
-+ boost_rpath_link_ldflag_found=yes;;
-+ *)
-+ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
-+ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
-+ LIBS="$boost_save_LIBS $Boost_lib_LIBS"
-+ _BOOST_AC_LINK_IFELSE([],
-+ [boost_rpath_link_ldflag_found=yes
-+ break],
-+ [boost_rpath_link_ldflag_found=no])
-+ done
-+ ;;
-+ esac
- AS_IF([test "x$boost_rpath_link_ldflag_found" != "xyes"],
- [AC_MSG_ERROR([Unable to determine whether to use -R or -rpath])])
- LDFLAGS=$boost_save_LDFLAGS
- LIBS=$boost_save_LIBS
- ])
-- Boost_lib_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
-+ test x"$boost_ldpath" != x &&
-+ Boost_lib_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
- Boost_lib_LDPATH="$boost_ldpath"
-- break 6
-+ break 7
- else
- boost_failed_libs="$boost_failed_libs@$boost_lib@"
- fi
-@@ -433,25 +505,10 @@ done
- done
- done
- done
-+done # boost_lib_
- rm -f conftest.$ac_objext
- ])
--case $Boost_lib in #(
-- no) _AC_MSG_LOG_CONFTEST
-- AC_MSG_ERROR([cannot find the flags to link with Boost $1])
-- ;;
--esac
--AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl
--AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl
--AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl
--AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl
--CPPFLAGS=$boost_save_CPPFLAGS
--AS_VAR_POPDEF([Boost_lib])dnl
--AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl
--AS_VAR_POPDEF([Boost_lib_LDPATH])dnl
--AS_VAR_POPDEF([Boost_lib_LIBS])dnl
--AC_LANG_POP([C++])dnl
--fi
--])# BOOST_FIND_LIB
-+
-
-
- # --------------------------------------- #
-@@ -493,20 +550,20 @@ BOOST_FIND_HEADER([boost/asio.hpp])])
-
- # BOOST_BIND()
- # ------------
--# Look for Boost.Bind
-+# Look for Boost.Bind.
- BOOST_DEFUN([Bind],
- [BOOST_FIND_HEADER([boost/bind.hpp])])
-
-
- # BOOST_CHRONO()
--# ------------------
--# Look for Boost.Chrono
-+# --------------
-+# Look for Boost.Chrono.
- BOOST_DEFUN([Chrono],
- [# Do we have to check for Boost.System? This link-time dependency was
- # added as of 1.35.0. If we have a version <1.35, we must not attempt to
- # find Boost.System as it didn't exist by then.
- if test $boost_major_version -ge 135; then
--BOOST_SYSTEM([$1])
-+ BOOST_SYSTEM([$1])
- fi # end of the Boost.System check.
- boost_filesystem_save_LIBS=$LIBS
- boost_filesystem_save_LDFLAGS=$LDFLAGS
-@@ -517,14 +574,40 @@ BOOST_FIND_LIB([chrono], [$1],
- [boost/chrono.hpp],
- [boost::chrono::thread_clock d;])
- if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
-- AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"])
-+ BOOST_CHRONO_LIBS="$BOOST_CHRONO_LIBS $BOOST_SYSTEM_LIBS"
- fi
- LIBS=$boost_filesystem_save_LIBS
- LDFLAGS=$boost_filesystem_save_LDFLAGS
--
- ])# BOOST_CHRONO
-
-
-+# BOOST_CONTEXT([PREFERRED-RT-OPT])
-+# -----------------------------------
-+# Look for Boost.Context. For the documentation of PREFERRED-RT-OPT, see the
-+# documentation of BOOST_FIND_LIB above. This library was introduced in Boost
-+# 1.51.0
-+BOOST_DEFUN([Context],
-+[BOOST_FIND_LIB([context], [$1],
-+ [boost/context/all.hpp],[[
-+// creates a stack
-+void * stack_pointer = new void*[4096];
-+std::size_t const size = sizeof(void*[4096]);
-+
-+// context fc uses f() as context function
-+// fcontext_t is placed on top of context stack
-+// a pointer to fcontext_t is returned
-+fc = ctx::make_fcontext(stack_pointer, size, f);
-+return ctx::jump_fcontext(&fcm, fc, 3) == 6;]],[dnl
-+namespace ctx = boost::context;
-+// context
-+static ctx::fcontext_t fcm, *fc;
-+// context-function
-+static void f(intptr_t i) {
-+ ctx::jump_fcontext(fc, &fcm, i * 2);
-+}])
-+])# BOOST_CONTEXT
-+
-+
- # BOOST_CONVERSION()
- # ------------------
- # Look for Boost.Conversion (cast / lexical_cast)
-@@ -534,6 +617,44 @@ BOOST_FIND_HEADER([boost/lexical_cast.hpp])
- ])# BOOST_CONVERSION
-
-
-+# BOOST_COROUTINE([PREFERRED-RT-OPT])
-+# -----------------------------------
-+# Look for Boost.Coroutine. For the documentation of PREFERRED-RT-OPT, see the
-+# documentation of BOOST_FIND_LIB above. This library was introduced in Boost
-+# 1.53.0
-+BOOST_DEFUN([Coroutine],
-+[
-+boost_coroutine_save_LIBS=$LIBS
-+boost_coroutine_save_LDFLAGS=$LDFLAGS
-+# Link-time dependency from coroutine to context
-+BOOST_CONTEXT([$1])
-+# Starting from Boost 1.55 a dependency on Boost.System is added
-+if test $boost_major_version -ge 155; then
-+ BOOST_SYSTEM([$1])
-+fi
-+m4_pattern_allow([^BOOST_(CONTEXT|SYSTEM)_(LIBS|LDFLAGS)])
-+LIBS="$LIBS $BOOST_CONTEXT_LIBS $BOOST_SYSTEM_LIBS"
-+LDFLAGS="$LDFLAGS $BOOST_CONTEXT_LDFLAGS"
-+
-+BOOST_FIND_LIB([coroutine], [$1],
-+ [boost/coroutine/coroutine.hpp],
-+ [boost::coroutines::coroutine< int(int) > coro; coro.empty();])
-+
-+# Link-time dependency from coroutine to context, existed only in 1.53, in 1.54
-+# coroutine doesn't use context from its headers but from its library.
-+if test $boost_major_version -eq 153 || test $enable_static_boost = yes && test $boost_major_version -ge 154; then
-+ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_CONTEXT_LIBS"
-+ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_CONTEXT_LDFLAGS"
-+fi
-+if test $enable_static_boost = yes && test $boost_major_version -ge 155; then
-+ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_SYSTEM_LIBS"
-+ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_SYSTEM_LDFLAGS"
-+fi
-+LIBS=$boost_coroutine_save_LIBS
-+LDFLAGS=$boost_coroutine_save_LDFLAGS
-+])# BOOST_COROUTINE
-+
-+
- # BOOST_CRC()
- # -----------
- # Look for Boost.CRC
-@@ -564,7 +685,7 @@ BOOST_DEFUN([Filesystem],
- # added as of 1.35.0. If we have a version <1.35, we must not attempt to
- # find Boost.System as it didn't exist by then.
- if test $boost_major_version -ge 135; then
--BOOST_SYSTEM([$1])
-+ BOOST_SYSTEM([$1])
- fi # end of the Boost.System check.
- boost_filesystem_save_LIBS=$LIBS
- boost_filesystem_save_LDFLAGS=$LDFLAGS
-@@ -574,23 +695,34 @@ LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
- BOOST_FIND_LIB([filesystem], [$1],
- [boost/filesystem/path.hpp], [boost::filesystem::path p;])
- if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
-- AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"])
-+ BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"
- fi
- LIBS=$boost_filesystem_save_LIBS
- LDFLAGS=$boost_filesystem_save_LDFLAGS
- ])# BOOST_FILESYSTEM
-
-
-+# BOOST_FLYWEIGHT()
-+# -----------------
-+# Look for Boost.Flyweight.
-+BOOST_DEFUN([Flyweight],
-+[dnl There's a hidden dependency on pthreads.
-+AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
-+BOOST_FIND_HEADER([boost/flyweight.hpp])
-+AC_SUBST([BOOST_FLYWEIGHT_LIBS], [$boost_cv_pthread_flag])
-+])
-+
-+
- # BOOST_FOREACH()
- # ---------------
--# Look for Boost.Foreach
-+# Look for Boost.Foreach.
- BOOST_DEFUN([Foreach],
- [BOOST_FIND_HEADER([boost/foreach.hpp])])
-
-
- # BOOST_FORMAT()
- # --------------
--# Look for Boost.Format
-+# Look for Boost.Format.
- # Note: we can't check for boost/format/format_fwd.hpp because the header isn't
- # standalone. It can't be compiled because it triggers the following error:
- # boost/format/detail/config_macros.hpp:88: error: 'locale' in namespace 'std'
-@@ -649,9 +781,18 @@ BOOST_DEFUN([Lambda],
- [BOOST_FIND_HEADER([boost/lambda/lambda.hpp])])
-
-
-+# BOOST_LOCALE()
-+# --------------
-+# Look for Boost.Locale
-+BOOST_DEFUN([Locale],
-+[BOOST_FIND_LIB([locale], [$1],
-+ [boost/locale.hpp],
-+ [[boost::locale::generator gen; std::locale::global(gen(""));]])
-+])# BOOST_LOCALE
-+
- # BOOST_LOG([PREFERRED-RT-OPT])
- # -----------------------------
--# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
-+# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the
- # documentation of BOOST_FIND_LIB above.
- BOOST_DEFUN([Log],
- [BOOST_FIND_LIB([log], [$1],
-@@ -662,12 +803,12 @@ BOOST_DEFUN([Log],
-
- # BOOST_LOG_SETUP([PREFERRED-RT-OPT])
- # -----------------------------------
--# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
-+# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the
- # documentation of BOOST_FIND_LIB above.
- BOOST_DEFUN([Log_Setup],
- [AC_REQUIRE([BOOST_LOG])dnl
- BOOST_FIND_LIB([log_setup], [$1],
-- [boost/log/utility/init/from_settings.hpp],
-+ [boost/log/utility/setup/from_settings.hpp],
- [boost::log::basic_settings<char> bs; bs.empty();])
- ])# BOOST_LOG_SETUP
-
-@@ -684,6 +825,29 @@ BOOST_DEFUN([Math],
- [BOOST_FIND_HEADER([boost/math/special_functions.hpp])])
-
-
-+# BOOST_MPI([PREFERRED-RT-OPT])
-+# -------------------------------
-+# Look for Boost MPI. For the documentation of PREFERRED-RT-OPT, see the
-+# documentation of BOOST_FIND_LIB above. Uses MPICXX variable if it is
-+# set, otherwise tries CXX
-+#
-+BOOST_DEFUN([MPI],
-+[boost_save_CXX=${CXX}
-+boost_save_CXXCPP=${CXXCPP}
-+if test x"${MPICXX}" != x; then
-+ CXX=${MPICXX}
-+ CXXCPP="${MPICXX} -E"
-+fi
-+BOOST_FIND_LIB([mpi], [$1],
-+ [boost/mpi.hpp],
-+ [int argc = 0;
-+ char **argv = 0;
-+ boost::mpi::environment env(argc,argv);])
-+CXX=${boost_save_CXX}
-+CXXCPP=${boost_save_CXXCPP}
-+])# BOOST_MPI
-+
-+
- # BOOST_MULTIARRAY()
- # ------------------
- # Look for Boost.MultiArray
-@@ -691,6 +855,14 @@ BOOST_DEFUN([MultiArray],
- [BOOST_FIND_HEADER([boost/multi_array.hpp])])
-
-
-+# BOOST_NUMERIC_UBLAS()
-+# --------------------------
-+# Look for Boost.NumericUblas (Basic Linear Algebra)
-+BOOST_DEFUN([Numeric_Ublas],
-+[BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp])
-+])# BOOST_NUMERIC_UBLAS
-+
-+
- # BOOST_NUMERIC_CONVERSION()
- # --------------------------
- # Look for Boost.NumericConversion (policy-based numeric conversion)
-@@ -713,6 +885,12 @@ BOOST_DEFUN([Preprocessor],
- [BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])])
-
-
-+# BOOST_RANGE()
-+# --------------------
-+# Look for Boost.Range
-+BOOST_DEFUN([Range],
-+[BOOST_FIND_HEADER([boost/range/adaptors.hpp])])
-+
- # BOOST_UNORDERED()
- # -----------------
- # Look for Boost.Unordered
-@@ -759,9 +937,9 @@ BOOST_DEFUN([Python],
- _BOOST_PYTHON_CONFIG([LDFLAGS], [ldflags])
- _BOOST_PYTHON_CONFIG([LIBS], [libs])
- m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl
--BOOST_FIND_LIB([python], [$1],
-- [boost/python.hpp],
-- [], [BOOST_PYTHON_MODULE(empty) {}])
-+BOOST_FIND_LIBS([python], [python python3], [$1],
-+ [boost/python.hpp],
-+ [], [BOOST_PYTHON_MODULE(empty) {}])
- CPPFLAGS=$boost_python_save_CPPFLAGS
- LDFLAGS=$boost_python_save_LDFLAGS
- LIBS=$boost_python_save_LIBS
-@@ -867,19 +1045,18 @@ BOOST_FIND_LIB([unit_test_framework], [$1],
- ])# BOOST_TEST
-
-
--# BOOST_THREADS([PREFERRED-RT-OPT])
-+# BOOST_THREAD([PREFERRED-RT-OPT])
- # ---------------------------------
- # Look for Boost.Thread. For the documentation of PREFERRED-RT-OPT, see the
- # documentation of BOOST_FIND_LIB above.
--# FIXME: Provide an alias "BOOST_THREAD".
--BOOST_DEFUN([Threads],
-+BOOST_DEFUN([Thread],
- [dnl Having the pthread flag is required at least on GCC3 where
- dnl boost/thread.hpp would complain if we try to compile without
- dnl -pthread on GNU/Linux.
- AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
--boost_threads_save_LIBS=$LIBS
--boost_threads_save_LDFLAGS=$LDFLAGS
--boost_threads_save_CPPFLAGS=$CPPFLAGS
-+boost_thread_save_LIBS=$LIBS
-+boost_thread_save_LDFLAGS=$LDFLAGS
-+boost_thread_save_CPPFLAGS=$CPPFLAGS
- # Link-time dependency from thread to system was added as of 1.49.0.
- if test $boost_major_version -ge 149; then
- BOOST_SYSTEM([$1])
-@@ -887,36 +1064,26 @@ fi # end of the Boost.System check.
- m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
- LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
- LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
--# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
--# boost/thread.hpp will trigger a #error if -pthread isn't used:
--# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
--# is not turned on. Please set the correct command line options for
--# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
- CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag"
-
- # When compiling for the Windows platform, the threads library is named
- # differently.
- case $host_os in
-- (*mingw*)
-- BOOST_FIND_LIB([thread_win32], [$1],
-- [boost/thread.hpp], [boost::thread t; boost::mutex m;])
-- BOOST_THREAD_LDFLAGS=$BOOST_THREAD_WIN32_LDFLAGS
-- BOOST_THREAD_LDPATH=$BOOST_THREAD_WIN32_LDPATH
-- BOOST_THREAD_LIBS=$BOOST_THREAD_WIN32_LIBS
-- ;;
-- (*)
-- BOOST_FIND_LIB([thread], [$1],
-- [boost/thread.hpp], [boost::thread t; boost::mutex m;])
-- ;;
-+ (*mingw*) boost_thread_lib_ext=_win32;;
- esac
-+BOOST_FIND_LIBS([thread], [thread$boost_thread_lib_ext],
-+ [$1],
-+ [boost/thread.hpp], [boost::thread t; boost::mutex m;])
-
- BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
- BOOST_THREAD_LDFLAGS="$BOOST_SYSTEM_LDFLAGS"
- BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag"
--LIBS=$boost_threads_save_LIBS
--LDFLAGS=$boost_threads_save_LDFLAGS
--CPPFLAGS=$boost_threads_save_CPPFLAGS
--])# BOOST_THREADS
-+LIBS=$boost_thread_save_LIBS
-+LDFLAGS=$boost_thread_save_LDFLAGS
-+CPPFLAGS=$boost_thread_save_CPPFLAGS
-+])# BOOST_THREAD
-+
-+AU_ALIAS([BOOST_THREADS], [BOOST_THREAD])
-
-
- # BOOST_TOKENIZER()
-@@ -964,7 +1131,8 @@ BOOST_DEFUN([Variant],
- [BOOST_FIND_HEADER([boost/variant/variant_fwd.hpp])
- BOOST_FIND_HEADER([boost/variant.hpp])])
-
--# BOOST_POINTERCONTAINER()
-+
-+# BOOST_POINTER_CONTAINER()
- # ------------------------
- # Look for Boost.PointerContainer
- BOOST_DEFUN([Pointer_Container],
-@@ -974,12 +1142,13 @@ BOOST_FIND_HEADER([boost/ptr_container/ptr_vector.hpp])
- BOOST_FIND_HEADER([boost/ptr_container/ptr_array.hpp])
- BOOST_FIND_HEADER([boost/ptr_container/ptr_set.hpp])
- BOOST_FIND_HEADER([boost/ptr_container/ptr_map.hpp])
--])# BOOST_POINTERCONTAINER
-+])# BOOST_POINTER_CONTAINER
-+
-
- # BOOST_WAVE([PREFERRED-RT-OPT])
- # ------------------------------
- # NOTE: If you intend to use Wave/Spirit with thread support, make sure you
--# call BOOST_THREADS first.
-+# call BOOST_THREAD first.
- # Look for Boost.Wave. For the documentation of PREFERRED-RT-OPT, see the
- # documentation of BOOST_FIND_LIB above.
- BOOST_DEFUN([Wave],
-@@ -1014,8 +1183,16 @@ BOOST_DEFUN([Xpressive],
-
- # _BOOST_PTHREAD_FLAG()
- # ---------------------
--# Internal helper for BOOST_THREADS. Based on ACX_PTHREAD:
--# http://autoconf-archive.cryp.to/acx_pthread.html
-+# Internal helper for BOOST_THREAD. Computes boost_cv_pthread_flag
-+# which must be used in CPPFLAGS and LIBS.
-+#
-+# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
-+# boost/thread.hpp will trigger a #error if -pthread isn't used:
-+# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
-+# is not turned on. Please set the correct command line options for
-+# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
-+#
-+# Based on ACX_PTHREAD: http://autoconf-archive.cryp.to/acx_pthread.html
- AC_DEFUN([_BOOST_PTHREAD_FLAG],
- [AC_REQUIRE([AC_PROG_CXX])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])dnl
-@@ -1083,6 +1260,14 @@ AC_LANG_POP([C++])dnl
- m4_define([_BOOST_gcc_test],
- ["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC @ gcc$1$2"])dnl
-
-+# _BOOST_mingw_test(MAJOR, MINOR)
-+# -----------------------------
-+# Internal helper for _BOOST_FIND_COMPILER_TAG.
-+m4_define([_BOOST_mingw_test],
-+["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC && \
-+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
-+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw$1$2"])dnl
-+
-
- # _BOOST_FIND_COMPILER_TAG()
- # --------------------------
-@@ -1092,7 +1277,8 @@ m4_define([_BOOST_gcc_test],
- AC_DEFUN([_BOOST_FIND_COMPILER_TAG],
- [AC_REQUIRE([AC_PROG_CXX])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag],
-+AC_CACHE_CHECK([for the toolset name used by Boost for $CXX],
-+ [boost_cv_lib_tag],
- [boost_cv_lib_tag=unknown
- if test x$boost_cv_inc_path != xno; then
- AC_LANG_PUSH([C++])dnl
-@@ -1110,14 +1296,29 @@ if test x$boost_cv_inc_path != xno; then
- # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines
- # the same defines as GCC's).
- for i in \
-+ _BOOST_mingw_test(5, 0) \
-+ _BOOST_gcc_test(5, 0) \
-+ _BOOST_mingw_test(4, 10) \
-+ _BOOST_gcc_test(4, 10) \
-+ _BOOST_mingw_test(4, 9) \
-+ _BOOST_gcc_test(4, 9) \
-+ _BOOST_mingw_test(4, 8) \
- _BOOST_gcc_test(4, 8) \
-+ _BOOST_mingw_test(4, 7) \
- _BOOST_gcc_test(4, 7) \
-+ _BOOST_mingw_test(4, 6) \
- _BOOST_gcc_test(4, 6) \
-+ _BOOST_mingw_test(4, 5) \
- _BOOST_gcc_test(4, 5) \
-+ _BOOST_mingw_test(4, 4) \
- _BOOST_gcc_test(4, 4) \
-+ _BOOST_mingw_test(4, 3) \
- _BOOST_gcc_test(4, 3) \
-+ _BOOST_mingw_test(4, 2) \
- _BOOST_gcc_test(4, 2) \
-+ _BOOST_mingw_test(4, 1) \
- _BOOST_gcc_test(4, 1) \
-+ _BOOST_mingw_test(4, 0) \
- _BOOST_gcc_test(4, 0) \
- "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \
- && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
-@@ -1183,6 +1384,7 @@ fi])dnl end of AC_CACHE_CHECK
- # Thread) flavors of Boost. Sets boost_guess_use_mt accordingly.
- AC_DEFUN([_BOOST_GUESS_WHETHER_TO_USE_MT],
- [# Check whether we do better use `mt' even though we weren't ask to.
-+AC_LANG_PUSH([C++])dnl
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #if defined _REENTRANT || defined _MT || defined __MT__
- /* use -mt */
-@@ -1190,6 +1392,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- # error MT not needed
- #endif
- ]])], [boost_guess_use_mt=:], [boost_guess_use_mt=false])
-+AC_LANG_POP([C++])dnl
- ])
-
- # _BOOST_AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-@@ -1213,11 +1416,11 @@ boost_use_source=:
- test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
- _AS_ECHO_LOG([re-using the existing conftest.$ac_objext])
- AS_IF([_AC_DO_STDERR($ac_link) && {
-- test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
-- test ! -s conftest.err
-+ test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
-+ test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_executable_p conftest$ac_exeext
-+ test "$cross_compiling" = yes ||
-+ $as_executable_p conftest$ac_exeext
- dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough.
- }],
- [$2],
diff --git a/ember-0.7.2-sigc++.patch b/ember-0.7.2-sigc++.patch
deleted file mode 100644
index bcd2f45..0000000
--- a/ember-0.7.2-sigc++.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN ember-0.7.2.orig/src/components/ogre/terrain/TerrainManager.cpp ember-0.7.2-sigc++/src/components/ogre/terrain/TerrainManager.cpp
---- ember-0.7.2.orig/src/components/ogre/terrain/TerrainManager.cpp 2014-02-21 20:02:59.000000000 +0100
-+++ ember-0.7.2-sigc++/src/components/ogre/terrain/TerrainManager.cpp 2016-02-02 09:42:19.634570664 +0100
-@@ -45,7 +45,6 @@
- #include "../Scene.h"
- #include "../Convert.h"
-
--#include <sigc++/object_slot.h>
-
-
- #include <OgreRoot.h>
-diff -urN ember-0.7.2.orig/src/components/ogre/World.cpp ember-0.7.2-sigc++/src/components/ogre/World.cpp
---- ember-0.7.2.orig/src/components/ogre/World.cpp 2014-02-21 20:02:59.000000000 +0100
-+++ ember-0.7.2-sigc++/src/components/ogre/World.cpp 2016-02-02 10:40:31.492125042 +0100
-@@ -30,6 +30,7 @@
- #include "ForestRenderingTechnique.h"
- #include "RenderDistanceManager.h"
- #include "AvatarCameraWarper.h"
-+#include "GraphicalChangeAdapter.h"
- #include "components/ogre/AvatarCameraMotionHandler.h"
- #include "components/ogre/authoring/AuthoringManager.h"
- #include "components/ogre/authoring/AuthoringMoverConnector.h"
-diff -urN ember-0.7.2.orig/src/services/logging/LoggingService.cpp ember-0.7.2-sigc++/src/services/logging/LoggingService.cpp
---- ember-0.7.2.orig/src/services/logging/LoggingService.cpp 2013-11-19 21:19:20.000000000 +0100
-+++ ember-0.7.2-sigc++/src/services/logging/LoggingService.cpp 2016-02-02 09:41:56.242430041 +0100
-@@ -31,8 +31,6 @@
- #include <cstdio>
- #include <sstream>
-
--#include <sigc++/object_slot.h>
--
- namespace Ember {
-
-
-diff -urN ember-0.7.2.orig/src/services/metaserver/MetaserverService.h ember-0.7.2-sigc++/src/services/metaserver/MetaserverService.h
---- ember-0.7.2.orig/src/services/metaserver/MetaserverService.h 2014-02-21 20:02:59.000000000 +0100
-+++ ember-0.7.2-sigc++/src/services/metaserver/MetaserverService.h 2016-02-02 09:39:00.689453993 +0100
-@@ -24,7 +24,6 @@
- #include <framework/Service.h>
- #include <framework/ConsoleObject.h>
-
--#include <sigc++/object.h>
- #include <Eris/Metaserver.h>
- #include <Eris/ServerInfo.h>
-
-diff -urN ember-0.7.2.orig/src/services/server/OOGChat.h ember-0.7.2-sigc++/src/services/server/OOGChat.h
---- ember-0.7.2.orig/src/services/server/OOGChat.h 2013-05-22 21:14:56.000000000 +0200
-+++ ember-0.7.2-sigc++/src/services/server/OOGChat.h 2016-02-02 09:44:37.860411582 +0100
-@@ -26,7 +26,6 @@
- #include <Eris/Lobby.h>
- #include <Eris/Room.h>
- #include <Eris/Account.h>
--#include <sigc++/object.h>
- #include <sigc++/bind.h>
-
- // Included system headers
-diff -urN ember-0.7.2.orig/src/services/server/ServerService.h ember-0.7.2-sigc++/src/services/server/ServerService.h
---- ember-0.7.2.orig/src/services/server/ServerService.h 2014-02-21 20:02:59.000000000 +0100
-+++ ember-0.7.2-sigc++/src/services/server/ServerService.h 2016-02-02 09:12:35.478567738 +0100
-@@ -29,7 +29,6 @@
-
- #include <Atlas/Message/Element.h>
-
--#include <sigc++/object_slot.h>
- #include <memory>
-
-
-diff -urN ember-0.7.2.orig/src/services/wfut/WfutService.h ember-0.7.2-sigc++/src/services/wfut/WfutService.h
---- ember-0.7.2.orig/src/services/wfut/WfutService.h 2013-11-19 21:19:20.000000000 +0100
-+++ ember-0.7.2-sigc++/src/services/wfut/WfutService.h 2016-02-02 09:44:26.378346087 +0100
-@@ -25,7 +25,6 @@
- #define EMBERWFUTSERVICE_H
-
- #include "framework/Service.h"
--#include <sigc++/object.h>
- #include <sigc++/signal.h>
-
- #include <memory>
-diff -urN ember-0.7.2.orig/src/services/wfut/WfutSession.h ember-0.7.2-sigc++/src/services/wfut/WfutSession.h
---- ember-0.7.2.orig/src/services/wfut/WfutSession.h 2013-05-22 21:14:56.000000000 +0200
-+++ ember-0.7.2-sigc++/src/services/wfut/WfutSession.h 2016-02-02 09:46:02.811922620 +0100
-@@ -24,7 +24,6 @@
- #define EMBEROGREWFUTSESSION_H
-
- #include <libwfut/WFUT.h>
--#include <sigc++/object.h>
-
- namespace Ember {
-
diff --git a/ember-doc-nover.patch b/ember-doc-nover.patch
deleted file mode 100644
index 0d940a8..0000000
--- a/ember-doc-nover.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.am.orig 2014-06-20 19:23:43.833922241 -0300
-+++ Makefile.am 2014-06-20 19:24:10.881401764 -0300
-@@ -15,7 +15,7 @@
- icondir = $(datadir)/icons/worldforge
- dist_icon_DATA = media/ember.png
-
--docdir = $(datadir)/doc/ember-$(VERSION)
-+docdir = $(datadir)/doc/ember
- dist_doc_DATA = README.md COPYING AUTHORS NEWS
-
- EXTRA_DIST = autogen.sh support/ChangeLog-CVS scripts/update_lua_bindings.sh scripts/generate-ChangeLog.sh
---- Makefile.in.orig 2014-06-20 19:23:49.540023404 -0300
-+++ Makefile.in 2014-06-20 19:24:33.153796630 -0300
-@@ -383,7 +383,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/ember-$(VERSION)
-+docdir = $(datadir)/doc/ember
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
diff --git a/ember-start.patch b/ember-start.patch
deleted file mode 100644
index 1813778..0000000
--- a/ember-start.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ember.in.orig 2014-06-20 18:30:20.827560958 -0300
-+++ ember.in 2014-06-20 18:30:41.429988036 -0300
-@@ -31,10 +31,8 @@
- # Note that because of an issue with how CEGUI 0.8.2 detects dynamic libraries we need to include the CEGUI_MODULEDIR path
- if [ "$prefix" != "@prefix@" ]; then
- prefix_arg="--prefix $prefix"
-- export LD_LIBRARY_PATH=$prefix/lib:@CEGUI_MODULEDIR@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- else
- prefix_arg=
-- export LD_LIBRARY_PATH=@prefix@/lib:@CEGUI_MODULEDIR@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- fi
-
- cd $bindir
diff --git a/ember.spec b/ember.spec
deleted file mode 100644
index 92f3d03..0000000
--- a/ember.spec
+++ /dev/null
@@ -1,362 +0,0 @@
-Name: ember
-Version: 0.7.2
-Release: 27%{?dist}
-Summary: 3D client for WorldForge
-
-License: GPLv3+
-URL: http://www.worldforge.org/dev/eng/clients/ember
-Source0: http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2
-Patch1: ember-0.6.3-fix_implicit_dso.patch
-Patch3: ember-start.patch
-Patch6: ember-doc-nover.patch
-# From upstream commit f605bd4bd15ea83da4d7864d45018e6f9a175b76
-Patch7: ember-0.7.2-fix-boost-m4.patch
-Patch8: ember-0.7.2-sigc++.patch
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: SDL-devel tinyxml-devel DevIL-devel cegui-devel ogre-devel
-BuildRequires: lua-devel tolua++-devel openal-devel freealut-devel
-BuildRequires: atlascpp-devel
-BuildRequires: eris-devel >= 1.3.16
-BuildRequires: mercator-devel
-BuildRequires: varconf-devel
-BuildRequires: wfmath-devel >= 1.0
-BuildRequires: libwfut-devel
-BuildRequires: desktop-file-utils
-BuildRequires: cppunit-devel
-# libtool is only needed while we need to run autogen.sh
-BuildRequires: libtool
-
-Requires: %{name}-media >= 0.7.2 %{name}-media < 0.7.3
-
-Obsoletes: sear < 0.6.4-0.16
-
-%description
-Ember is a client for MMORPGs using the WorldForge system.
-It uses the Ogre 3D engine with CEGUI.
-
-
-%prep
-%setup -q
-%patch1 -p1 -b .fix_implicit_dso
-%patch3 -p0 -b .start
-%patch6 -p0 -b .doc-nover
-%patch7 -p1 -b .boost-m4
-%patch8 -p1 -b .sigc++
-
-# Encoding fix
-iconv -f iso-8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
-
-
-%build
-# configure.ac needs to be rebuilt for the updated boost.m4 needed to
-# work with gcc 5. This shouldn't be needed after the next ember release.
-./autogen.sh
-%configure --disable-static --disable-freeimage-check
-make %{?_smp_mflags}
-
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-desktop-file-install \
- --remove-category="Application" --add-category="RolePlaying" \
- --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-mv $RPM_BUILD_ROOT%{_datadir}/icons/worldforge/ember.png \
- $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-
-# Don't need zero length files
-rm -f $RPM_BUILD_ROOT%{_datadir}/ember/media/shared/modeldefinitions/{drystan_archer,vehicles,outdoor_structures,buildings,fencegate,palissade,house_A,choppingblockA,choppingblockB,mushroom,male,humanoid}.modeldef
-rm -f $RPM_BUILD_ROOT%{_datadir}/ember/media/shared/common/resources/ogre/scripts/materials/smoke.material
-
-%check
-%ifnarch %{arm} aarch64
-make check
-%endif
-
-
-%files
-%doc AUTHORS ChangeLog COPYING NEWS README.md
-%{_bindir}/%{name}
-%{_bindir}/%{name}.bin
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/ember.png
-# datadir/%{name} is owned by ember-media
-# datadir/%{name}/media is owned by ember-media
-# datadir/%{name}/media/shared is owned by ember-media
-%{_datadir}/%{name}/media/shared/gui
-%{_datadir}/%{name}/media/shared/entityrecipes
-%{_datadir}/%{name}/media/shared/data/
-%{_datadir}/%{name}/media/shared/scripting
-%{_datadir}/%{name}/media/shared/sounddefinitions
-# datadir/%{name}/media/user is owned by ember-media
-
-# Not using noreplace: having old config file can make things not working as was intended. User can override settings with config in homedir.
-%dir %{_sysconfdir}/%{name}
-%config %{_sysconfdir}/%{name}/*
-
-%changelog
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.2-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.2-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jul 31 2018 Florian Weimer <fweimer(a)redhat.com> - 0.7.2-25
-- Rebuild with fixed binutils
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.2-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.2-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Aug 06 2017 Filipe Rosset <rosset.filipe(a)gmail.com> - 0.7.2-22
-- rebuilt for new boost
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.2-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.2-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jul 21 2017 Kalev Lember <klember(a)redhat.com> - 0.7.2-19
-- Rebuilt for Boost 1.64
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.7.2-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.2-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jan 31 2017 Jonathan Wakely <jwakely(a)redhat.com> - 0.7.2-16
-- Rebuilt for Boost 1.63
-
-* Wed May 18 2016 Jonathan Wakely <jwakely(a)redhat.com> - 0.7.2-15
-- Rebuilt for linker errors in boost (#1331983)
-
-* Wed Feb 03 2016 Ralf Corspius <corsepiu(a)fedoraproject.org> - 0.7.2-14
-- Rebuild for boost-1.60.
-
-* Tue Feb 02 2016 Tim Niemueller <tim(a)niemueller.de> - 0.7.2-13
-- Add patch to fix building against recent libsigc++
-- Disable make check on arm, fails for unknown reason
-
-* Mon Feb 01 2016 Tim Niemueller <tim(a)niemueller.de> - 0.7.2-12
-- rebuild for updated tolua++
-
-* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 0.7.2-11
-- Rebuilt for Boost 1.59
-
-* Wed Aug 05 2015 Jonathan Wakely <jwakely(a)redhat.com> 0.7.2-10
-- Rebuilt for Boost 1.58
-
-* Wed Jun 24 2015 Bruno Wolff III <bruno(a)wolff.to> - 0.7.2-9
-- Go back to latest lua and hope mass rebuild fixed the issue
-
-* Mon Jun 22 2015 Bruno Wolff III <bruno(a)wolff.to> - 0.7.2-8
-- Use cegui06
-
-* Sun Jun 21 2015 Bruno Wolff III <bruno(a)wolff.to> - 0.7.2-7
-- The latest lua doesn't work with ember, use 5.1 instead
-
-* Sat Jun 20 2015 Bruno Wolff III <bruno(a)wolff.to> - 0.7.2-6
-- Bring in upstream fix for boost version detection
-- Temporarily use autogen.sh to bring updated boost.m4 into configure.ac
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.7.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Feb 05 2015 Martin Preisler <mpreisle(a)redhat.com> - 0.7.2-4
-- Rebuilt for new boost
-
-* Wed Dec 31 2014 Kevin Fenzi <kevin(a)scrye.com> 0.7.2-3
-- Rebuild for new lua
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.7.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Jun 20 2014 Filipe Rosset <rosset.filipe(a)gmail.com> - 0.7.2-1
-- New upstream version, spec cleanup, fixes rhbz #925308, #1023695 and #1106214
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.7.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat May 31 2014 Bjrn Esser <bjoern.esser(a)gmail.com> - 0.7.0-12
-- rebuild for several so-name bumps
-- fix bogus dates in %%changelog
-
-* Fri May 23 2014 David Tardon <dtardon(a)redhat.com> - 0.7.0-11
-- rebuild for boost 1.55.0
-
-* Sat Aug 10 2013 Bruno Wolff III <bruno(a)wolff.to> - 0.7.0-10
-- Put documentation in non-versioned doc dir
-- Resolves FTBFS bug 991885
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.7.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Jul 29 2013 Petr Machata <pmachata(a)redhat.com> - 0.7.0-8
-- Rebuild for boost 1.54.0
-
-* Wed May 15 2013 Bruno Wolff III <bruno(a)wolff.to> - 0.7.0-7
-- Have ex-sear switch to ember
-
-* Tue May 14 2013 Tom Callaway <spot(a)fedoraproject.org> - 0.7.0-6
-- lua 5.2
-
-* Sun Feb 24 2013 Bruno Wolff III <bruno(a)wolff.to> - 0.7.0-5
-- Remove vendor prefix from desktop file
-
-* Tue Feb 12 2013 Petr Machata <pmachata(a)redhat.com> - 0.7.0-4
-- Patch one use of boost::shared_array::reset
-
-* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 0.7.0-3
-- Rebuild for Boost-1.53.0
-
-* Wed Jan 23 2013 Bruno Wolff III <bruno(a)wolff.to> - 0.7.0-2
-- Rebuild for cegui soname bump
-
-* Fri Jan 18 2013 Martin Preisler <mpreisle(a)redhat.com> - 0.7.0-1
-- Upstream 0.7.0
-
-* Thu Dec 06 2012 Martin Preisler <mpreisle(a)redhat.com> - 0.6.3-4
-- Rebuilt for Ogre 1.8.1
-
-* Sat Dec 01 2012 Bruno Wolff III <bruno(a)wolff.to> - 0.6.3-3
-- Rebuild for eris 1.3.21
-
-* Sat Nov 17 2012 Bruno Wolff III <bruno(a)wolff.to> - 0.6.3-2
-- Rebuild for varconf and skstream soname bumps
-
-* Tue Nov 13 2012 Tom Callaway <spot(a)fedoraproject.org> - 0.6.3-1
-- update to 0.6.3
-
-* Fri Aug 17 2012 Bruno Wolff III <bruno(a)wolff.to> - 0.6.2-12
-- Rebuild for boost 1.50
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.2-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Apr 01 2012 Bruno Wolff III <bruno(a)wolff.to> - 0.6.2-10
-- Rebuild for ogre 1.7.4
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.2-9
-- Rebuilt for c++ ABI breakage
-
-* Fri Feb 03 2012 Bruno Wolff III <bruno(a)wolff.to> - 0.6.2-8
-- Really fix start up script bz 786287
-
-* Wed Feb 01 2012 Bruno Wolff III <bruno(a)wolff.to> - 0.6.2-7
-- Fix start up script bz 786287
-
-* Tue Jan 24 2012 Bruno Wolff III <bruno(a)wolff.to> - 0.6.2-6
-- Rebuild for cegui soname bump
-
-* Mon Jan 23 2012 Bruno Wolff III <bruno(a)wolff.to> - 0.6.2-5
-- Fixes for gcc 4.7
-
-* Wed Jan 18 2012 Bruno Wolff III <bruno(a)wolff.to> - 0.6.2-4
-- Allow a small bit of version skew between ember and ember-media
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sat Nov 19 2011 Bruno Wolff III <bruno(a)wolff.to> - 0.6.2-2
-- Rebuild for boost soname bump
-
-* Sat Nov 19 2011 Bruno Wolff III <bruno(a)wolff.to> - 0.6.2-1
-- New upstream release
-- Release announcement: http://worldforgedev.org/archives/462
-
-* Fri Jul 22 2011 Bruno Wolff III <bruno(a)wolff.to> - 0.6.1.1-3
-- Rebuild for boost 1.47
-
-* Mon May 16 2011 Bruno Wolff III <bruno(a)wolff.to> - 0.6.1.1-2
-- Use ember-media 0.6.1 instead of requiring 0.6.1.1 which doesn't exist
-
-* Sun May 15 2011 Bruno Wolff III <bruno(a)wolff.to> - 0.6.1.1-1
-- Upstream update to 0.6.1.1
-
-* Sun May 01 2011 Bruno Wolff III <bruno(a)wolff.to> - 0.6.1-2
-- The startup shell script changed slightly, breaking a patch
-
-* Sun May 01 2011 Bruno Wolff III <bruno(a)wolff.to> - 0.6.1-1
-- Update to ember-0.6.1
-- Seems to be pretty much a bug fix release based on the changelog in the source archive.
-
-* Wed Apr 06 2011 Bruno Wolff III <bruno(a)wolff.to> - 0.6.0-6
-- Rebuild for boost soname bump to 1.46.1 in rawhide.
-
-* Sat Mar 12 2011 Bruno Wolff III <bruno(a)wolff.to> - 0.6.0-5
-- Fix low level security risk (CVE-2010-3355 bug 638381)
-- Avoid pointlessly munging LD_LIBRARY_PATH
-
-* Thu Mar 10 2011 Bruno Wolff III <bruno(a)wolff.to> - 0.6.0-4
-- Rebuild for new boost and ogre.
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Feb 07 2011 Thomas Spura <tomspur(a)fedoraproject.org> - 0.6.0-2
-- rebuild for new boost
-
-* Thu Jan 6 2011 Tom Callaway <spot(a)fedoraproject.org> - 0.6.0-1
-- update to 0.6.0
-
-* Sun Jul 4 2010 Michel Salim <salimma(a)fedoraproject.org> - 0.5.6-5
-- Fix implicit DSO bug (#565162)
-
-* Tue Oct 06 2009 Alexey Torkhov <atorkhov(a)gmail.com> - 0.5.6-4
-- Rebuild for varconf interface version bump
-
-* Mon Sep 28 2009 Alexey Torkhov <atorkhov(a)gmail.com> - 0.5.6-3
-- Rebuilt for new OGRE
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Apr 27 2009 Alexey Torkhov <atorkhov(a)gmail.com> - 0.5.6-1
-- Update to 0.5.6
-
-* Mon Mar 02 2009 Alexey Torkhov <atorkhov(a)gmail.com> - 0.5.5-5
-- Update for new OGRE
-
-* Sun Mar 01 2009 Alexey Torkhov <atorkhov(a)gmail.com> - 0.5.5-4
-- Adding unowned directory
-
-* Sat Feb 28 2009 Alexey Torkhov <atorkhov(a)gmail.com> - 0.5.5-3
-- Fixing build with recent compilers
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Dec 20 2008 Alexey Torkhov <atorkhov(a)gmail.com> 0.5.5-1
-- Update to 0.5.5
-
-* Wed Dec 03 2008 Alexey Torkhov <atorkhov(a)gmail.com> 0.5.4-5
-- Removed program name from description
-- Rebuild for new CEGUI
-
-* Tue Nov 04 2008 Alexey Torkhov <atorkhov(a)gmail.com> 0.5.4-4
-- Rebuild for new OGRE
-- Including lost entityrecipes and sounddefinitions to media
-- Running unit checks during build
-
-* Thu Oct 23 2008 Alexey Torkhov <atorkhov(a)gmail.com> 0.5.4-3
-- Workaround of crash in Caelum with new OGRE
-
-* Thu Oct 02 2008 Alexey Torkhov <atorkhov(a)gmail.com> 0.5.4-2
-- Update for new OGRE
-
-* Tue Sep 09 2008 Alexey Torkhov <atorkhov(a)gmail.com> 0.5.4-1
-- Update to 0.5.4.
-
-* Tue Jul 08 2008 Alexey Torkhov <atorkhov(a)gmail.com> 0.5.3-1
-- Update to 0.5.3.
-
-* Fri Jun 20 2008 Alexey Torkhov <atorkhov(a)gmail.com> 0.5.2-1
-- Inital spec for Fedora.
diff --git a/sources b/sources
deleted file mode 100644
index 222891f..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-5fa2cf860ebe66674d5e5e05c8e87009 ember-0.7.2.tar.bz2
4 years, 9 months
Architecture specific change in rpms/efivar.git
by githook-noreply@fedoraproject.org
The package rpms/efivar.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/efivar.git/commit/?id=6812dabd22d....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit 6812dabd22d49ecf74d22ea1c30fa059dde455c4
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:41:52 2019 +0000
efivar fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674840
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 2730b7d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.tar.*
-clog
-*.rpm
-efivar-*/
-bodhi.template
-.build*.log
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..27d4aa5
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+efivar fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674840
diff --git a/efivar.spec b/efivar.spec
deleted file mode 100644
index 0394864..0000000
--- a/efivar.spec
+++ /dev/null
@@ -1,293 +0,0 @@
-Name: efivar
-Version: 37
-Release: 3%{?dist}
-Summary: Tools to manage UEFI variables
-License: LGPLv2.1
-URL: https://github.com/rhboot/efivar
-Requires: %{name}-libs = %{version}-%{release}
-ExclusiveArch: %{efi}
-
-BuildRequires: gcc
-BuildRequires: efi-srpm-macros git glibc-static libabigail
-# please don't fix this to reflect github's incomprehensible url that goes
-# to a different tarball.
-Source0: https://github.com/rhboot/efivar/releases/download/%{version}/efivar-%{ve...
-
-%description
-efivar provides a simple command line interface to the UEFI variable facility.
-
-%package libs
-Summary: Library to manage UEFI variables
-
-%description libs
-Library to allow for the simple manipulation of UEFI variables.
-
-%package devel
-Summary: Development headers for libefivar
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-development headers required to use libefivar.
-
-%prep
-%setup -q -n %{name}-%{version}
-git init
-git config user.email "%{name}-owner(a)fedoraproject.org"
-git config user.name "Fedora Ninjas"
-git add .
-git commit -a -q -m "%{version} baseline."
-git am %{patches} </dev/null
-git config --unset user.email
-git config --unset user.name
-
-%build
-make LIBDIR=%{_libdir} BINDIR=%{_bindir} CFLAGS="$RPM_OPT_FLAGS -flto" LDFLAGS="$RPM_LD_FLAGS -flto"
-
-%install
-%makeinstall
-
-%check
-%ifarch x86_64
-make abicheck
-%endif
-
-%ldconfig_scriptlets libs
-
-%files
-%{!?_licensedir:%global license %%doc}
-%license COPYING
-%doc README.md
-%{_bindir}/efivar
-%exclude %{_bindir}/efivar-static
-%{_mandir}/man1/*
-
-%files devel
-%{_mandir}/man3/*
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-
-%files libs
-%{_libdir}/*.so.*
-
-%changelog
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 37-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 37-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Dec 05 2018 Peter Jones <pjones(a)redhat.com> - 37-1
-- Update to efivar 37:
- - Minor coverity fixes
- - Improve ACPI device path formatting
- - Add support for SOC devices that use FDT as their PCI root node
- - Make devices we can't parse the "device" sysfs link for use DEV_ABBREV_ONLY
- - Handle SCSI port numbers better
- - Don't require an EUI for NVMe
- - Fix the accidental requirement on ACPI UID nodes existing
- - Add support for EMMC devices
- - Add support for PCI root nodes without a device link in sysfs
- - Add support for partitioned MD devices
- - Fix partition number detection when the number isn't provided
- - Add support for ACPI Generic Container and Embedded Controller root nodes
- - Add limited support for SAS/SATA port expanders
-
-* Mon Sep 17 2018 Peter Jones <pjones(a)redhat.com> - 36-1
-- Update to efivar 36
-- Add NVDIMM support
-- Re-written linux interface parser to handle how devices are
- partitioned better, and for cleaner code, with one file per device
- type.
-- lots of verbosity updates
-- better CI
-- analysis with clang's analyzer as well as coverity
-- Better handling of immutable bits in sysfs
-- LIBEFIVAR_OPS=help
-- lots of code cleanups.
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 35-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri May 04 2018 Peter Jones <pjones(a)redhat.com> - 35-3
-- Rebuild for new efi-rpm-macros, now that it has settled down a bit.
-
-* Tue May 01 2018 Peter Jones <pjones(a)redhat.com> - 35-2
-- Use efi-rpm-macros instead of defining efi-related macros ourselves
-
-* Mon Apr 09 2018 Peter Jones <pjones(a)redhat.com> - 35-1
-- Update to efivar 35
-- fixes for older compilers
-- efi_get_variable_exists()
-- Lots of stuff to make CI work.
-- use usleep() to avoid hitting the kernel rate limiter on efivarfs
-- better EFI_GUID macro
-- add efi_guid_fwupdate (0abba7dc-e516-4167-bbf5-4d9d1c739416)
-
-* Tue Feb 27 2018 Peter Jones <pjones(a)redhat.com> - 34-1
-- Update to efivar 34, and include a patch to avoid upstream rate limiting.
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 33-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 30 2018 Peter Robinson <pbrobinson(a)fedoraproject.org> 33-2
-- Enable ARMv7, minor spec cleanups
-
-* Tue Jan 23 2018 Peter Jones <pjones(a)redhat.com> - 33-1
-- Add NVDIMM support
-- Bump version to 33
-
-* Tue Sep 12 2017 Peter Jones <pjones(a)redhat.com> - 32-2
-- Make efi_guid_ux_capsule actually get exported right.
-
-* Tue Sep 12 2017 Peter Jones <pjones(a)redhat.com> - 32-1
-- efivar 32
-- lots of coverity fixes; mostly leaked memory and fds and the like
-- fix sysfs pci path formats
-- handle device paths for dns, nfit, bluetooth, wifi, emmc, btle.
-- improved abi checking on releases
-- Fix failures on EDIT_WRITE in edit_variable() when the variable doesn't exist
-- Add efi_guid_ux_capsule_guid to our guids
-- Now with %%check
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 31-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 31-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Mar 06 2017 Peter Jones <pjones(a)redhat.com> - 31-1
-- Update to efivar 31
-- Work around NVMe EUI sysfs change
-- Provide some oldish version strings we should have kept.
-- lots of overflow checking on our pointer math in dp parsing
-- fix major/minor device number handling in the linux code
-- Do better formatting checks for MBR partitions
-- Fixes for gcc 7
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 30-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Oct 17 2016 Peter Jones <pjones(a)redhat.com> - 30-4
-- Handle NVMe device attributes paths moving around in sysfs.
-
-* Wed Sep 28 2016 Peter Jones <pjones(a)redhat.com> - 30-3
-- Maybe even provide the *right* old linker deps.
-
-* Tue Sep 27 2016 Peter Jones <pjones(a)redhat.com> - 30-2
-- Try not to screw up SONAME stuff quite so badly.
-
-* Tue Sep 27 2016 Peter Jones <pjones(a)redhat.com> - 30-1
-- Fix efidp_*() functions with __pure__ that break with some optimizations
-- Fix NVMe EUI parsing.
-
-* Tue Sep 27 2016 Peter Jones <pjones(a)redhat.com> - 29-1
-- Use -pie not -PIE in our linker config
-- Fix some overflow checks for gcc < 5.x
-- Make variable class probes other than the first one actually work
-- Move -flto to CFLAGS
-- Pack all of the efi device path headers
-- Fix redundant decl of efi_guid_zero()
-
-* Wed Aug 17 2016 Peter Jones <pjones(a)redhat.com> - 28-1
-- Make our sonames always lib$FOO.1 , not lib$FOO.$VERSION .
-
-* Tue Aug 16 2016 Peter Jones <pjones(a)redhat.com> - 27-1
-- Bug fix for 086eeb17 in efivar 26.
-
-* Wed Aug 10 2016 Peter Jones <pjones(a)redhat.com> - 26-1
-- Update to efivar-26 .
-
-* Thu Jun 30 2016 Peter Jones <pjones(a)redhat.com> - 0.24-1
-- Update to 0.24
-
-* Mon Feb 15 2016 Peter Jones <pjones(a)redhat.com> - 0.23-1
-- Update to 0.23
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.21-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Nov 02 2015 Peter Jones <pjones(a)redhat.com> - 0.21-2
-- Bump the release here so f22->f23->f24 updates work.
-
-* Mon Jul 13 2015 Peter Jones <pjones(a)redhat.com> - 0.21-1
-- Rename "make test" so packagers don't think it's a good idea to run it
- during builds.
-- Error check sizes in vars_get_variable()
-- Fix some file size comparisons
-- make SONAME reflect the correct values.
-- Fix some uses of "const"
-- Compile with -O2 by default
-- Fix some strict-aliasing violations
-- Fix some of the .pc files and how we do linking to work better.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Jun 02 2015 Peter Jones <pjones(a)redhat.com> - 0.20-1
-- Update to 0.20
-- Make sure tester is build with the right link order for libraries.
-- Adjust linker order for pkg-config
-- Work around LocateDevicePath() not grokking PcieRoot() devices properly.
-- Rectify some missing changelog entries
-
-* Thu May 28 2015 Peter Jones <pjones(a)redhat.com> - 0.19-1
-- Update to 0.19
-- add API from efibootmgr so fwupdate and other tools can use it.
-
-* Wed Oct 15 2014 Peter Jones <pjones(a)redhat.com> - 0.15-1
-- Update to 0.15
-- Make 32-bit builds set variables' DataSize correctly.
-
-* Wed Oct 08 2014 Peter Jones <pjones(a)redhat.com> - 0.14-1
-- Update to 0.14
-- add efi_id_guid_to_guid() and efi_guid_to_id_guid(), which support {ID GUID}
- as a concept.
-- Add some vendor specific guids to our guid list.
-- Call "empty" "zero" now, as many other places do. References to
- efi_guid_is_empty() and efi_guid_empty still exist for ABI compatibility.
-- add "efivar -L" to the man page.
-
-* Tue Oct 07 2014 Peter Jones <pjones(a)redhat.com> - 0.13-1
-- Update to 0.13:
-- add efi_symbol_to_guid()
-- efi_name_to_guid() will now fall back on efi_symbol_to_guid() as a last
- resort
-- "efivar -L" to list all the guids we know about
-- better namespacing on libefivar.so (rename well_known_* -> efi_well_known_*)
-
-* Thu Sep 25 2014 Peter Jones <pjones(a)redhat.com> - 0.12-1
-- Update to 0.12
-
-* Wed Aug 20 2014 Peter Jones <pjones(a)redhat.com> - 0.11-1
-- Update to 0.11
-
-* Fri May 02 2014 Peter Jones <pjones(a)redhat.com> - 0.10-1
-- Update package to 0.10.
-- Fixes a build error due to different cflags in the builders vs updstream
- makefile.
-
-* Fri May 02 2014 Peter Jones <pjones(a)redhat.com> - 0.9-0.1
-- Update package to 0.9.
-
-* Tue Apr 01 2014 Peter Jones <pjones(a)redhat.com> - 0.8-0.1
-- Update package to 0.8 as well.
-
-* Fri Oct 25 2013 Peter Jones <pjones(a)redhat.com> - 0.7-1
-- Update package to 0.7
-- adds --append support to the binary.
-
-* Fri Sep 06 2013 Peter Jones <pjones(a)redhat.com> - 0.6-1
-- Update package to 0.6
-- fixes to documentation from lersek
-- more validation of uefi guids
-- use .xz for archives
-
-* Thu Sep 05 2013 Peter Jones <pjones(a)redhat.com> - 0.5-0.1
-- Update to 0.5
-
-* Mon Jun 17 2013 Peter Jones <pjones(a)redhat.com> - 0.4-0.2
-- Fix ldconfig invocation
-
-* Mon Jun 17 2013 Peter Jones <pjones(a)redhat.com> - 0.4-0.1
-- Initial spec file
diff --git a/sources b/sources
deleted file mode 100644
index 5d6214d..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (efivar-37.tar.bz2) = 305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4
4 years, 9 months
Architecture specific change in rpms/dmtcp.git
by githook-noreply@fedoraproject.org
The package rpms/dmtcp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dmtcp.git/commit/?id=d8d59eae9a4b....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit d8d59eae9a4ba324ee65130a0c54c771a982d3ac
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:40:09 2019 +0000
dmtcp fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674820
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 55633ba..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/dmtcp-*.tar.gz
-/2*.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..a1afb66
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+dmtcp fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674820
diff --git a/dmtcp.spec b/dmtcp.spec
deleted file mode 100644
index f2e4bb5..0000000
--- a/dmtcp.spec
+++ /dev/null
@@ -1,229 +0,0 @@
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
-Name: dmtcp
-Version: 2.5.2
-Release: 6%{?dist}
-Summary: Checkpoint/Restart functionality for Linux processes
-License: LGPLv3+
-URL: http://dmtcp.sourceforge.net
-Source0: http://github.com/dmtcp/dmtcp/archive/%{version}/%{name}-%{version}.tar.gz
-BuildRequires: gcc-c++
-BuildRequires: gcc
-BuildRequires: python2
-
-# This package is functional on i386, x86_64 and aarch64 architectures.
-ExclusiveArch: %ix86 x86_64 aarch64
-
-%description
-DMTCP (Distributed MultiThreaded Checkpointing) is a tool to transparently
-checkpointing the state of an arbitrary group of programs including
-multi-threaded and distributed computations. It operates directly on the user
-binary executable, with no Linux kernel modules or other kernel mods.
-
-Among the applications supported by DMTCP are Open MPI, MATLAB, Python, Perl,
-and many programming languages and shell scripting languages. DMTCP also
-supports GNU screen sessions, including vim/cscope and emacs. With the use of
-TightVNC, it can also checkpoint and restart X-Windows applications, as long as
-they do not use extensions (e.g.: no OpenGL, no video).
-
-This package contains DMTCP binaries.
-
-%package -n dmtcp-devel
-Summary: DMTCP developer package
-Requires: dmtcp%{?_isa} = %{version}-%{release}
-
-%description -n dmtcp-devel
-This package provides files for developing DMTCP plugins.
-
-%prep
-%setup -q
-
-%build
-%configure --docdir=%{_pkgdocdir}
-%make_build
-
-%install
-%make_install
-
-%check
-%make_build tests
-
-# Test suite disabled for non-x86_64 architectures.
-%ifarch x86_64
-# Disable syscall-tester, file, and posix-mq tests until fixed upstream.
-sed -i -e's:\(runTest("syscall-tester"\):pass #\1:' test/autotest.py
-sed -i -e's:\(runTest("file\):pass #\1:' test/autotest.py
-sed -i -e's:\(runTest("posix-mq\):pass #\1:' test/autotest.py
-./test/autotest.py --retry-once || :
-%endif
-
-%files
-%license COPYING
-%{_bindir}/dmtcp_*
-%{_bindir}/mtcp_restart
-%{_libdir}/%{name}
-%dir %{_pkgdocdir}
-%{_pkgdocdir}
-%{_mandir}/man1/*gz
-
-%files -n dmtcp-devel
-%{_includedir}/dmtcp.h
-
-%changelog
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.5.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.5.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.5.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 15 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2.5.2-3
-- Update Python 2 dependency declarations to new packaging standards
- (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.5.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Dec 28 2017 Kapil Arya <kapil(a)ccs.neu.edu> - 2.5.2-1
-- Update to 2.5.2.
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Jun 17 2017 Filipe Rosset <rosset.filipe(a)gmail.com> - 2.5.0-1
-- Rebuilt for new upstream version, fixes FTBFS rhbz#1423335
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.4.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Oct 25 2016 Orion Poplawski <orion(a)cora.nwra.com> - 2.4.4-1
-= Update to 2.4.4
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Oct 26 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.4.2-1
-- Update to 2.4.2
-
-* Mon Sep 14 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.4.1-1
-- Update to 2.4.1 for newer kernel and glibc support (fix FTBFS)
-- ARMv7 and aarch64 now supported
-- Add COPYING license file
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon Mar 10 2014 Kapil Arya <kapil(a)ccs.neu.edu> - 2.2-1
-- Preparing for upstream release 2.2.
-- Remove libmtcp* packages.
-- Install all docs in _pkgdocdir
-- Added --retry-once flag to autotest.
-
-* Fri Jan 10 2014 Kapil Arya <kapil(a)ccs.neu.edu> - 2.1-1
-- Preparing for upstream release 2.1.
-
-* Thu Dec 12 2013 Ville Skytta <ville.skytta(a)iki.fi> - 1.2.8-2
-- Install docs to %%{_pkgdocdir} where available (#993726).
-- Own package level doc dir.
-
-* Tue Jul 30 2013 Kapil Arya <kapil(a)ccs.neu.edu> - 1.2.8-1
-- Preparing for upstream release 1.2.8.
-
-* Mon Mar 11 2013 Kapil Arya <kapil(a)ccs.neu.edu> - 1.2.7-1
-- Preparing for upstream release 1.2.7.
-- Use %%{_docdir} instead of %%doc for QUICK-START and COPYING.
-
-* Tue Oct 09 2012 Orion Poplawski <orion(a)cora.nwra.com> - 1.2.6-1
-- Update to 1.2.6
-- Use URL for Source0
-- Add patch to drop -fstack-protector on mtcp_maybebpt.c
-- Drop configure hack
-- Run tests
-
-* Sun Jul 08 2012 kapil(a)ccs.neu.edu
-- Preparing for upstream release 1.2.5.
-
-* Tue Jan 24 2012 kapil(a)ccs.neu.edu
-- Preparing for upstream release 1.2.4.
-
-* Mon Jan 23 2012 kapil(a)ccs.neu.edu
-- Updating to svn 1449.
-
-* Tue Oct 25 2011 kapil(a)ccs.neu.edu
-- Updating to svn 1321.
-- libdmtcpaware-devel-static renamed to libdmtcpaware-static
-- %%{_isa} added to Requires
-- disable_option_checking changed from "fatal" to "no"
-- QUICK_START and COPYING installed using %%{doc}
-
-* Tue Aug 9 2011 gene(a)ccs.neu.edu
-- Updating to upstream release 1.2.3-1.svn1247M.
-- svn revision 1246 adds objcopy to set section attribute in libmtcp.so
- (if debuginfo repo was present during build, limbtcp.so was missing a section)
-- dmtcp.spec and 'make install' changed for improved file layout
-
-* Tue Jul 26 2011 kapil(a)ccs.neu.edu
-- Top level configure files updated to fix configure error.
-
-* Fri Jul 22 2011 kapil(a)ccs.neu.edu
-- Updating to upstream release 1.2.3.
-
-* Sat Jul 2 2011 kapil(a)ccs.neu.edu
-- Updating to upstream release 1.2.2.
-
-* Wed Jun 22 2011 kapil(a)ccs.neu.edu
-- Exclude mtcp.c from installation.
-
-* Wed Jun 22 2011 kapil(a)ccs.neu.edu
-- Updating to upstream release 1.2.2.
-
-* Fri Jun 17 2011 kapil(a)ccs.neu.edu
-- libdmtcpaware.a moved to libdmtcpaware-devel-static package.
-- dmtcpaware examples moved to libdmtcpaware-doc package.
-
-* Fri Jun 10 2011 kapil(a)ccs.neu.edu
-- Build requirements updated.
-- Minor cleanup.
-
-* Tue Jun 7 2011 kapil(a)ccs.neu.edu
-- Added "ExclusiveArch %%ix86 x86_64" and removed ExcludeArch lines.
-- buildroot not cleaned in %%install section.
-
-* Sat May 14 2011 kapil(a)ccs.neu.edu
-- dependency on libc.a removed for mtcp_restart.
-- Several other bug fixes and improvements.
-
-* Sat Mar 12 2011 kapil(a)ccs.neu.edu
-- Updated to release 1.2.1
-
-* Fri Mar 11 2011 kapil(a)ccs.neu.edu
-- Remove debug flags.
-
-* Fri Mar 11 2011 kapil(a)ccs.neu.edu
-- Updated to revision 935.
-
-* Thu Mar 10 2011 kapil(a)ccs.neu.edu
-- Reverting tarball to prev version.
-
-* Thu Mar 10 2011 kapil(a)ccs.neu.edu
-- Testing fix for restart under 32-bit OSes.
-
-* Thu Mar 10 2011 kapil(a)ccs.neu.edu
-- Updated tarball with compiler warnings fixed.
-
-* Thu Mar 10 2011 kapil(a)ccs.neu.edu
-- Added python to dependency list for running make check.
-
-* Thu Mar 10 2011 kapil(a)ccs.neu.edu
-- Preparing for release 1.2.1. Pulled updates from the latest dmtcp svn.
diff --git a/sources b/sources
deleted file mode 100644
index b189e53..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (dmtcp-2.5.2.tar.gz) = 1641953f85b97d9818f77f60f3bb0c0069d8fad9150c7a9da86a06d596d74855489f6467de00a1d6cacf1814dad8b325e457ba80105c18672a8c53ed5285716d
4 years, 9 months
Architecture specific change in rpms/direnv.git
by githook-noreply@fedoraproject.org
The package rpms/direnv.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/direnv.git/commit/?id=bb306e78c92....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit bb306e78c92db008cc3a2f572c29fe72f3ceeb85
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:39:17 2019 +0000
direnv fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674811
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 20c0484..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.src.rpm
-/v2.9.0.tar.gz
-/v2.12.2.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..c4d3d6c
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+direnv fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674811
diff --git a/direnv.spec b/direnv.spec
deleted file mode 100644
index c37fa2d..0000000
--- a/direnv.spec
+++ /dev/null
@@ -1,101 +0,0 @@
-# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
-%global _dwz_low_mem_die_limit 0
-
-# Used by automated scanning tools to run tests
-# https://bugzilla.redhat.com/show_bug.cgi?id=1358215#c8
-%global provider github
-%global provider_tld com
-%global project direnv
-%global repo direnv
-# https://github.com/direnv/direnv
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-# Keep SHA in sync with tagged commits
-%global commit a49d542059b53dba71202d64a64f81e980868522
-
-Name: direnv
-Version: 2.12.2
-Release: 5%{?dist}
-Summary: Environment variable switcher for the shell
-License: MIT
-URL: http://direnv.net/
-Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-%description
-direnv is an environment switcher for the shell. It knows how to hook
-into bash, zsh, tcsh and fish shell to load or unload environment
-variables depending on the current directory. This allows
-project-specific environment variables without cluttering the
-"~/.profile" file.
-
-%prep
-%setup -q
-
-# Used like an external library, but shipped in-project
-mkdir -p gopath/src/%{import_path}
-mv dotenv gopath/src/%{import_path}
-
-%build
-export GOPATH=$(pwd)/gopath
-make %{?_smp_mflags} GO_LDFLAGS="-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')"
-
-%install
-install -d -p %{buildroot}%{_bindir}
-install -p -m 0755 direnv %{buildroot}%{_bindir}
-
-install -d -p %{buildroot}%{_mandir}/man1
-install -p -m 0644 man/*.1 %{buildroot}%{_mandir}/man1
-
-%check
-export GOPATH=$(pwd)/gopath
-make test
-
-%files
-%license LICENSE.md
-%doc CHANGELOG.md README.md
-%doc %{_mandir}/man1/%{name}.1*
-%doc %{_mandir}/man1/%{name}-stdlib.1*
-%{_bindir}/direnv
-
-%changelog
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.12.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.12.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.12.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.12.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Sep 10 2017 Dominic Cleal <dominic(a)cleal.org> - 2.12.2-1
-- Update to 2.12.2
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.9.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.9.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.9.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Aug 30 2016 Dominic Cleal <dominic(a)cleal.org> - 2.9.0-4
-- Use repo macros in Source0, add comments
-- Replace URL with correct homepage
-
-* Tue Aug 30 2016 Dominic Cleal <dominic(a)cleal.org> - 2.9.0-3
-- Add upstream commit and repo macros
-
-* Tue Aug 30 2016 Dominic Cleal <dominic(a)cleal.org> - 2.9.0-2
-- Fix make call to use parallel flag macro
-- Fix default values of EA/BRs when macros aren't defined
-
-* Wed Jul 20 2016 Dominic Cleal <dominic(a)cleal.org> - 2.9.0-1
-- Initial build for Fedora
diff --git a/sources b/sources
deleted file mode 100644
index 983f4df..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (v2.12.2.tar.gz) = 0df3b0c531500cd03db50f051ae2780f798410daa6ed9094a3de2a0ccd8f70c2e013a1277f9079a86083a380d2495bb0acc755307f224d5feedfe98987c74f08
4 years, 9 months
Architecture specific change in rpms/derelict.git
by githook-noreply@fedoraproject.org
The package rpms/derelict.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/derelict.git/commit/?id=7fa6cdb9f....
Change:
-ExclusiveArch: %{ldc_arches}
Thanks.
Full change:
============
commit 7fa6cdb9f9953652183d6e2da48705c6d6cd015d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:38:46 2019 +0000
derelict fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674802
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 414fd37..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,55 +0,0 @@
-/derelict-20111106svn593.tar.xz
-/derelict-20120923gitb4f810c.tar.xz
-/derelict-20130626gite70c293.tar.xz
-/derelict-20130804git90376ac.tar.xz
-/derelict-20130810git94eaed8.tar.xz
-/derelict-20131023git4ae13ab.tar.xz
-/derelict-201410303git9570453.tar.xz
-/derelict-AL-20140212gitbd5bd3b.tar.xz
-/derelict-ALURE-20140303git402884c.tar.xz
-/derelict-ASSIMP3-20131222git2300879.tar.xz
-/derelict-FI-20140127gitc5786f4.tar.xz
-/derelict-FT-20131222git8e46c9f.tar.xz
-/derelict-GL3-20140303git0ad2f17.tar.xz
-/derelict-GLFW3-20131222gitdc988f5.tar.xz
-/derelict-IL-20131222git8c70f90.tar.xz
-/derelict-Lua-20140508gita6d2f46.tar.xz
-/derelict-ODE-20140212gitf0138fb.tar.xz
-/derelict-Ogg-20131222gitd48d50d.tar.xz
-/derelict-PHYSFS-20131222git1405994.tar.xz
-/derelict-PQ-20131222gitebd72df.tar.xz
-/derelict-SDL2-20140502gitd549b0d.tar.xz
-/derelict-SFML2-20140413git26a3eda.tar.xz
-/derelict-Util-20140422git16940c7.tar.xz
-/derelict-Vorbis-20131222git64b26fc.tar.xz
-/derelict-AL-20140927gitd339322.tar.xz
-/derelict-ALURE-20140518git52eed1b.tar.xz
-/derelict-ASSIMP3-20140518git415831b.tar.xz
-/derelict-FI-20150118git7dc3401.tar.xz
-/derelict-FT-20150128git2b83825.tar.xz
-/derelict-GL3-20150116gitd8f4b52.tar.xz
-/derelict-GLFW3-20150124gite0d02a9.tar.xz
-/derelict-IL-20140929gitff159fe.tar.xz
-/derelict-Lua-20150105git888e7bd.tar.xz
-/derelict-ODE-20141102gita93b6de.tar.xz
-/derelict-Ogg-20150122git887f200.tar.xz
-/derelict-PHYSFS-20140929git469cbb7.tar.xz
-/derelict-PQ-20140925gitf9cb4df.tar.xz
-/derelict-SDL2-20150113gita998c8f.tar.xz
-/derelict-SFML2-20150122git5b5f207.tar.xz
-/derelict-Theora-20150122gitb4dc705.tar.xz
-/derelict-Util-20141022git7fc1714.tar.xz
-/derelict-Vorbis-20150122gitc5e47eb.tar.xz
-/fetchDerelictModules.sh
-/derelict-AL-20150825gitc74cdb9.tar.xz
-/derelict-ASSIMP3-20150224gitb8d9c67.tar.xz
-/derelict-FI-20150719git4e29ef3.tar.xz
-/derelict-FT-20150207git66dd3dd.tar.xz
-/derelict-GL3-20150803git262074e.tar.xz
-/derelict-GLFW3-20150713git3710cbc.tar.xz
-/derelict-Lua-20150727git8577bf9.tar.xz
-/derelict-ODE-20150326git60629cc.tar.xz
-/derelict-PQ-20150205git7fb7464.tar.xz
-/derelict-SDL2-20150821git4f2e6ea.tar.xz
-/derelict-SFML2-20150904git0f3351d.tar.xz
-/derelict-Util-20150730git10a517b.tar.xz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..6d7a5a3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+derelict fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674802
diff --git a/derelict.spec b/derelict.spec
deleted file mode 100644
index 2aa695b..0000000
--- a/derelict.spec
+++ /dev/null
@@ -1,844 +0,0 @@
-%global debug_package %{nil}
-
-# The source for this package was pulled from upstream's git.
-# Use the fetchDerelictModules.sh script to generate tarballs:
-
-%global snapdate 20150906
-
-%global AL_snapdate 20150825
-%global AL_revision c74cdb9
-%global AL_alphatag %{AL_snapdate}git%{AL_revision}
-
-%global ALURE_snapdate 20140518
-%global ALURE_revision 52eed1b
-%global ALURE_alphatag %{ALURE_snapdate}git%{ALURE_revision}
-
-%global ASSIMP3_snapdate 20150224
-%global ASSIMP3_revision b8d9c67
-%global ASSIMP3_alphatag %{ASSIMP3_snapdate}git%{ASSIMP3_revision}
-
-%global FI_snapdate 20150719
-%global FI_revision 4e29ef3
-%global FI_alphatag %{FI_snapdate}git%{FI_revision}
-
-%global FT_snapdate 20150207
-%global FT_revision 66dd3dd
-%global FT_alphatag %{FT_snapdate}git%{FT_revision}
-
-%global GL3_snapdate 20150803
-%global GL3_revision 262074e
-%global GL3_alphatag %{GL3_snapdate}git%{GL3_revision}
-
-%global GLFW3_snapdate 20150713
-%global GLFW3_revision 3710cbc
-%global GLFW3_alphatag %{GLFW3_snapdate}git%{GLFW3_revision}
-
-%global IL_snapdate 20140929
-%global IL_revision ff159fe
-%global IL_alphatag %{IL_snapdate}git%{IL_revision}
-
-%global Lua_snapdate 20150727
-%global Lua_revision 8577bf9
-%global Lua_alphatag %{Lua_snapdate}git%{Lua_revision}
-
-%global ODE_snapdate 20150326
-%global ODE_revision 60629cc
-%global ODE_alphatag %{ODE_snapdate}git%{ODE_revision}
-
-%global Ogg_snapdate 20150122
-%global Ogg_revision 887f200
-%global Ogg_alphatag %{Ogg_snapdate}git%{Ogg_revision}
-
-%global PHYSFS_snapdate 20140929
-%global PHYSFS_revision 469cbb7
-%global PHYSFS_alphatag %{PHYSFS_snapdate}git%{PHYSFS_revision}
-
-%global PQ_snapdate 20150205
-%global PQ_revision 7fb7464
-%global PQ_alphatag %{PQ_snapdate}git%{PQ_revision}
-
-%global SDL2_snapdate 20150821
-%global SDL2_revision 4f2e6ea
-%global SDL2_alphatag %{SDL2_snapdate}git%{SDL2_revision}
-
-%global SFML2_snapdate 20150904
-%global SFML2_revision 0f3351d
-%global SFML2_alphatag %{SFML2_snapdate}git%{SFML2_revision}
-
-%global Theora_snapdate 20150122
-%global Theora_revision b4dc705
-%global Theora_alphatag %{Theora_snapdate}git%{Theora_revision}
-
-%global Util_snapdate 20150730
-%global Util_revision 10a517b
-%global Util_alphatag %{Util_snapdate}git%{Util_revision}
-
-%global Vorbis_snapdate 20150122
-%global Vorbis_revision c5e47eb
-%global Vorbis_alphatag %{Vorbis_snapdate}git%{Vorbis_revision}
-
-
-
-%define add_subpackage(n:) \
-%package %{-n*} \
-Summary: Libraries to use %{-n*} \
-Summary(fr): Bibliothque pour utiliser %{-n*} \
-Requires: %{name}%{?_isa} = %{version}-%{release} \
-%if %# >= 2 \
-Requires: %* \
-%endif \
-%description %{-n*} \
-Libraries for %{-n*} to use in D programming language. \
-%description -l fr %{-n*} \
-Bibliothque pour %{-n*} utiliser en langage D. \
-%package %{-n*}-devel \
-Summary: Header files and libraries for %{-n*} \
-Summary(fr): Fichier d'entte et bibliothque pour %{-n*} \
-Requires: %{name}%{?_isa} = %{version}-%{release} \
-%if %# >= 2 \
-Requires: %* \
-%endif \
-%description %{-n*}-devel \
-Header files and libraries for %{-n*} to use in D programming language. \
-%description -l fr %{-n*}-devel \
-Fichier d'entte et bibliothque pour %{-n*} utiliser en langage D. \
-%{nil}
-
-%define build_plugins(n:) \
-pushd %{_builddir}/%{name}-%{Util_alphatag}/%1/source \
- mkdir ../object ../include ../lib \
- ldc2 %{_d_optflags} -relocation-model=pic -shared -L-ldl -I%{_builddir}/%{name}-%{Util_alphatag}/Util/include -Hd ../include/derelict/%2 -c $(find derelict -name '*.d') -od../object/ \
- ldc2 %{_d_optflags} -L-ldl -shared -soname libDerelict%1.so.3 -of../lib/libDerelict%1.so.3.0.0 $(find ../object -name '*.o') \
- geany -c %{_builddir}/%{name}-%{Util_alphatag}/geany_config -g derelict%1.d.tags $(find ../include/%{name} -name "*.di") \
-popd \
-%{nil}
-
-%define install_files(n:) \
-install -p -d %{buildroot}%{_d_includedir}/%{name}/%2/ \
-install -m0644 -D %{_builddir}/%{name}-%{snapdate}/%1/include/derelict/%2/*.di %{buildroot}%{_d_includedir}/%{name}/%2/ \
-install -D %{_builddir}/%{name}-%{snapdate}/%1/lib/libDerelict%1.so.3.0.0 %{buildroot}%{_libdir}/ \
-install -m0644 %{_builddir}/%{name}-%{snapdate}/%1/derelict%1.d.tags %{buildroot}/%{_datadir}/geany/tags/ \
-pushd %{buildroot}%{_libdir}/ \
-ln -s libDerelict%1.so.3.0.0 libDerelict%1.so.3 \
-ln -s libDerelict%1.so.3 libDerelict%1.so \
-popd \
-%{nil}
-
-%define add_files(n:) \
-%ldconfig_scriptlets %{-n*} \
-%files %{-n*} \
-%{_libdir}/libDerelict%1.so.3 \
-%{_libdir}/libDerelict%1.so.3.0.0 \
-%files %{-n*}-devel \
-%{_libdir}/libDerelict%1.so \
-%{_d_includedir}/%{name}/%2 \
-%{_datadir}/geany/tags/derelict%1.d.tags \
-%{nil}
-
-
-Name: derelict
-Version: 3
-Release: 49.%{Util_alphatag}%{?dist}
-
-Summary: Collection of D bindings to C shared libraries
-Summary(fr): Collection de bibliothque en D interfaant des bibliothques dynamiques en C
-
-License: Boost
-URL: http://www.dsource.org/projects/
-Source0: %{name}-Util-%{Util_alphatag}.tar.xz
-Source1: %{name}-AL-%{AL_alphatag}.tar.xz
-Source2: %{name}-ALURE-%{ALURE_alphatag}.tar.xz
-Source3: %{name}-ASSIMP3-%{ASSIMP3_alphatag}.tar.xz
-Source4: %{name}-FI-%{FI_alphatag}.tar.xz
-Source5: %{name}-FT-%{FT_alphatag}.tar.xz
-Source6: %{name}-GL3-%{GL3_alphatag}.tar.xz
-Source7: %{name}-GLFW3-%{GLFW3_alphatag}.tar.xz
-Source8: %{name}-IL-%{IL_alphatag}.tar.xz
-Source9: %{name}-Lua-%{Lua_alphatag}.tar.xz
-Source10: %{name}-ODE-%{ODE_alphatag}.tar.xz
-Source11: %{name}-Ogg-%{Ogg_alphatag}.tar.xz
-Source12: %{name}-PHYSFS-%{PHYSFS_alphatag}.tar.xz
-Source13: %{name}-PQ-%{PQ_alphatag}.tar.xz
-Source14: %{name}-SDL2-%{SDL2_alphatag}.tar.xz
-Source15: %{name}-SFML2-%{SFML2_alphatag}.tar.xz
-Source16: %{name}-Theora-%{Theora_alphatag}.tar.xz
-Source17: %{name}-Vorbis-%{Vorbis_alphatag}.tar.xz
-
-ExclusiveArch: %{ldc_arches}
-
-BuildRequires: ldc, ldc-phobos-devel, libcurl-devel
-
-%description
-derelict supports some useful features for project development, including:
-- Cross-Platform Consistency
-derelict loads shared libraries manually at run-time and throws an exception
-when the library, or any symbol in the library, fails to load. This gives you
-complete control over how to handle the case of a missing shared library. You
-can fall back to a different code path, give your users a helpful error message
-or take any action you want. Regardless, you have consistent behavior across
-multiple platforms.
-- Selective Symbol Loading - This feature allows you to override exceptions
-thrown by derelict when a shared library symbol fails to load. It is a goal of
-the project that each derelict package be updated from time-to-time to load the
-latest version of each library. Often, new library versions include new
-functions. If a user has an older version of the library installed, one that is
-missing the new function symbols, derelict will notice and throw an exception.
-By making use of Selective Symbol Loading, you can override this behavior and
-allow the older library version to load successfully.
-
-%description -l fr
-derelict soutient quelques dispositifs utiles pour le dveloppement de projet
-incluant :
-- Uniformit du code portable sur plusieurs plates-formes
-Derelict charge les bibliothques partages manuellement au temps d'excution
-et
-renvoie une exception quand une bibliothque, ou n'importe quel symbole dans la
-bibliothque, ne charge pas. Ceci vous donne le contrle complet sur la faon
-de traiter le cas o une bibliothque partage ne chargerait pas. Vous pouvez
-retomber un chemin diffrent de code, donner vos utilisateurs un message
-d'erreur utile ou prendre n'importe quelle mesure que vous voulez. Sans avoir
- vous soucier d'un comportement identique travers de multiples
-plates-formes.
-- Chargement slectif de symbole - ce dispositif vous permet de surcharger des
-exceptions renvoyes par derelict quand un symbole de bibliothque partage ne
-charge pas. C'est un but du projet que le paquet derelict soit mis jour afin
-de charger la dernire version de chaque bibliothque. Souvent, les nouvelles
-versions de bibliothque incluent de nouvelles fonctions. Si un utilisateur a
-une version plus ancienne de la bibliothque installe, ou une laquelle il
-manque les nouveaux symboles d'une fonction, derelict le notera et renverra une
-exception. En se servant du chargement slectif des symboles, vous pouvez
-dpasser
-ce comportement et permettre la version la plus ancienne de derelict de se
-charger avec succs.
-
-%package devel
-Summary: Header files and libraries for derelict
-Summary(fr): Fichier d'entte et bibliothque pour derelict
-Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: geany
-
-%description devel
-Header files and libraries for derelict to use in D programming language.
-%description -l fr devel
-Fichier d'entte et bibliothque pour derelict utiliser en langage D.
-
-%add_subpackage -n AL openal-soft
-%add_subpackage -n ALURE alure
-%add_subpackage -n ASSIMP3 assimp
-%add_subpackage -n FI freeimage
-%add_subpackage -n FT freetype
-%add_subpackage -n GL3 mesa-libGL mesa-libGLU mesa-libGLw
-%add_subpackage -n GLFW3 glfw
-%add_subpackage -n IL DevIL DevIL-ILUT
-%add_subpackage -n LUA lua
-%add_subpackage -n ODE ode
-%add_subpackage -n Ogg
-%add_subpackage -n PHYSFS physfs
-%add_subpackage -n PQ postgresql
-%add_subpackage -n SDL2 SDL SDL_image SDL_mixer SDL_net SDL_sound SDL_ttf SDL_gfx
-%add_subpackage -n SFML2 SFML
-%add_subpackage -n Vorbis
-
-%prep
-%setup -q -b 0 -n %{name}-%{snapdate}
-%setup -q -T -D -b 1 -n %{name}-%{snapdate}
-%setup -q -T -D -b 2 -n %{name}-%{snapdate}
-%setup -q -T -D -b 3 -n %{name}-%{snapdate}
-%setup -q -T -D -b 4 -n %{name}-%{snapdate}
-%setup -q -T -D -b 5 -n %{name}-%{snapdate}
-%setup -q -T -D -b 6 -n %{name}-%{snapdate}
-%setup -q -T -D -b 7 -n %{name}-%{snapdate}
-%setup -q -T -D -b 8 -n %{name}-%{snapdate}
-%setup -q -T -D -b 9 -n %{name}-%{snapdate}
-%setup -q -T -D -b 10 -n %{name}-%{snapdate}
-%setup -q -T -D -b 11 -n %{name}-%{snapdate}
-%setup -q -T -D -b 12 -n %{name}-%{snapdate}
-%setup -q -T -D -b 13 -n %{name}-%{snapdate}
-%setup -q -T -D -b 14 -n %{name}-%{snapdate}
-%setup -q -T -D -b 15 -n %{name}-%{snapdate}
-%setup -q -T -D -b 16 -n %{name}-%{snapdate}
-%setup -q -T -D -b 17 -n %{name}-%{snapdate}
-
-
-# temp geany config directory for allow geany to generate tags
-mkdir -p geany_config
-
-%build
-
-pushd %{_builddir}/%{name}-%{snapdate}/Util/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/util \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictUtil.so.3 \
- -of../lib/libDerelictUtil.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictUtil.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/AL/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/openal \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictAL.so.3 \
- -of../lib/libDerelictAL.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictAL.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/ALURE/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -I%{_builddir}/%{name}-%{snapdate}/AL/include \
- -Hd ../include/derelict/alure \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictALURE.so.3 \
- -of../lib/libDerelictALURE.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictALURE.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/ASSIMP3/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/assimp3 \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictASSIMP3.so.3 \
- -of../lib/libDerelictASSIMP3.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictASSIMP3.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/FI/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/freeimage \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictFI.so.3 \
- -of../lib/libDerelictFI.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictFI.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/FT/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/freetype \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictFT.so.3 \
- -of../lib/libDerelictFT.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictFT.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/GL3/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/opengl3 \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictGL3.so.3 \
- -of../lib/libDerelictGL3.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictGL3.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/GLFW3/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/glfw3 \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictGLFW3.so.3 \
- -of../lib/libDerelictGLFW3.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictGLFW3.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/IL/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/devil \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictIL.so.3 \
- -of../lib/libDerelictIL.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictIL.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/Lua/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/lua \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictLua.so.3 \
- -of../lib/libDerelictLua.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictLua.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/ODE/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/ode \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictODE.so.3 \
- -of../lib/libDerelictODE.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictODE.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/Ogg/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/ogg \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictOgg.so.3 \
- -of../lib/libDerelictOgg.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictOgg.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/PHYSFS/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/physfs \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictPHYSFS.so.3 \
- -of../lib/libDerelictPHYSFS.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictPHYSFS.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/PQ/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/pq \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictPQ.so.3 \
- -of../lib/libDerelictPQ.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictPQ.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/SDL2/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/sdl2 \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictSDL2.so.3 \
- -of../lib/libDerelictSDL2.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictSDL2.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/SFML2/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/sfml2 \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictSFML2.so.3 \
- -of../lib/libDerelictSFML2.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictSFML2.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-pushd %{_builddir}/%{name}-%{snapdate}/Vorbis/source
- mkdir ../object ../include ../lib
- ldc2 %{_d_optflags} \
- -relocation-model=pic \
- -shared \
- -L-ldl \
- -I%{_builddir}/%{name}-%{snapdate}/Util/include \
- -Hd ../include/derelict/vorbis \
- -I%{_builddir}/%{name}-%{snapdate}/Ogg/include \
- -c $(find derelict -name '*.d') \
- -od../object/
- ldc2 %{_d_optflags} \
- -L-ldl \
- -shared -soname libDerelictVorbis.so.3 \
- -of../lib/libDerelictVorbis.so.3.0.0 $(find ../object -name '*.o')
- geany -c %{_builddir}/%{name}-%{snapdate}/geany_config -g ../derelictVorbis.d.tags $(find ../include/%{name} -name "*.di")
-popd
-
-
-%install
-install -p -d %{buildroot}%{_datadir}/geany/tags/
-install -p -d %{buildroot}%{_d_includedir}/%{name}
-install -p -d %{buildroot}%{_libdir}
-
-# install derelict headers and derelict libs
-
-%install_files AL openal
-%install_files ALURE alure
-%install_files ASSIMP3 assimp3
-%install_files FI freeimage
-%install_files FT freetype
-%install_files GL3 opengl3
-%install_files GLFW3 glfw3
-%install_files IL devil
-%install_files Lua lua
-%install_files ODE ode
-%install_files Ogg ogg
-%install_files PHYSFS physfs
-%install_files PQ pq
-%install_files SDL2 sdl2
-%install_files SFML2 sfml2
-%install_files Util util
-%install_files Vorbis vorbis
-
-
-%ldconfig_scriptlets
-
-%files
-#%doc README.markdown
-%{_d_includedir}/%{name}
-%{_datadir}/geany/tags/
-%{_libdir}/libDerelictUtil.so.3
-%{_libdir}/libDerelictUtil.so.3.0.0
-%files devel
-%{_libdir}/libDerelictUtil.so
-%{_d_includedir}/%{name}/util
-
-%add_files -n AL AL openal
-%add_files -n ALURE ALURE alure
-%add_files -n ASSIMP3 ASSIMP3 assimp3
-%add_files -n FI FI freeimage
-%add_files -n FT FT freetype
-%add_files -n GL3 GL3 opengl3
-%add_files -n GLFW3 GLFW3 glfw3
-%add_files -n IL IL devil
-%add_files -n LUA Lua lua
-%add_files -n ODE ODE ode
-%add_files -n Ogg Ogg ogg
-%add_files -n PHYSFS PHYSFS physfs
-%add_files -n PQ PQ pq
-%add_files -n SDL2 SDL2 sdl2
-%add_files -n SFML2 SFML2 sfml2
-%add_files -n Vorbis Vorbis vorbis
-
-%changelog
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3-49.20150730git10a517b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3-48.20150730git10a517b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Aug 21 2018 Peter Robinson <pbrobinson(a)fedoraproject.org> 3-47.20150730git10a517b
-- Rebuild for aarch64 enablement
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3-46.20150730git10a517b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 09 2018 Kalev Lember <klember(a)redhat.com> - 3-45.20150730git10a517b
-- Rebuilt for ldc 1.11
-
-* Mon Feb 19 2018 Kalev Lember <klember(a)redhat.com> - 3-44.20150730git10a517b
-- Rebuilt for ldc 1.8
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3-43.20150730git10a517b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Sep 13 2017 Kalev Lember <klember(a)redhat.com> - 3-42.20150730git10a517b
-- Rebuilt for ldc 1.4
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3-41.20150730git10a517b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3-40.20150730git10a517b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jun 13 2017 Kalev Lember <klember(a)redhat.com> - 3-39.20150730git10a517b
-- Rebuilt for new ldc compiler
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3-38.20150730git10a517b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Nov 30 2016 Kalev Lember <klember(a)redhat.com> - 3-37.20150730git10a517b
-- Rebuilt for new ldc compiler
-
-* Sun Oct 30 2016 Kalev Lember <klember(a)redhat.com> - 3-36.20150730git10a517b
-- Use new ldc_arches macro
-
-* Mon Oct 24 2016 Kalev Lember <klember(a)redhat.com> - 3-35.20150730git10a517b
-- Enable arm architecture now that ldc is available there
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3-34.20150730git10a517b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sun Sep 06 2015 Jonathan MERCIER <bioinfornatics(a)gmail.com> - 3-33.20150730git10a517b
-- update to latest release
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3-32.20141022git7fc1714
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-
-* Tue Sep 16 2014 bioinfornatics - 3-30.20140710gita786b4b
-- Update to latest revision
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3-29.20140422git16940c7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Jun 13 2014 Hans de Goede <hdegoede(a)redhat.com> - 3-28.20140422git16940c7
-- Rebuild for new SDL_gfx
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3-27.20140422git16940c7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Mar 09 2014 jonathan MERCIER <bioinfornatics(a)gmail.com> - 3-26.20140422git16940c7
-- Update to latest rev
-
-* Mon Feb 17 2014 Hans de Goede <hdegoede(a)redhat.com> - 3-25.20131023git4ae13ab
-- Bump release to be newer then f20
- Note to fellow packagers: *Always* make changes in rawhide first!
-
-* Sun Feb 16 2014 Hans de Goede <hdegoede(a)redhat.com> - 3-24.20131023git4ae13ab
-- Rebuild for SFML-2.1 (rhbz#1033924)
-- There is no ldc on arm, so add "ExcludeArch: %%{arm}" for now (rhbz#1065725),
- (rhbz#992124)
-
-* Thu Oct 24 2013 Jonathan MERCIER <bioinfornatics(a)gmail.com> - 3-23.20131023git4ae13ab
-- Update to rev 4ae13ab
-
-* Sat Aug 10 2013 "Jonathan Mercier" <"Jonathan Mercier at gmail dot org"> - 3-22.20130810git94eaed8
-- Update to rev 94eaed8
-
-* Sun Aug 04 2013 "Jonathan Mercier" <"Jonathan Mercier at gmail dot org"> - 3-21.20130804git90376ac
-- Update to rev 90376ac
-
-* Wed Jun 26 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-20.20130626gite70c293
-- Update to rev e70c293
-
-* Mon Jun 24 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-19.20130624gitdd0de49
-- Update to rev dd0de49
-
-* Sun Jun 23 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-18.20130619gitd31fbbb
-- Update to rev d31fbbb
-
-* Sat May 25 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-17.20130524gita5c9387
-- fix GLFW3
-
-* Fri May 24 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-16.20130524gita5c9387
-- No debug
-
-* Fri May 24 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-15.20130524gita5c9387
-- Update to rev a5c9387
-
-* Fri May 24 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-14.20130516gitd8aa11d
-- fix spec file
-
-* Sat May 18 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-13.20130516gitd8aa11d
-- remove debug
-
-* Sat May 18 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-12.20130516gitd8aa11d
-- Fix bogus date
-
-* Fri May 17 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-11.20130516gitd8aa11d
-- Update to rev d8aa11d
-
-* Thu May 16 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-10.20130516gitd8aa11d
-- spec file enhancement
-
-* Thu May 16 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-9.20130516gitd8aa11d
-- Update to rev d8aa11d
-
-* Thu May 16 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-8.20130516gitd8aa11d
-- spec file enhancement
-
-* Thu May 16 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-7.20130516gitd8aa11d
-- Update to rev d8aa11d
-
-* Wed May 15 2013 Jonathan MERCIER <bioinfornatics at fedoraproject dot org> - 3-6.20130515git2f12c63
-- Update to rev 2f12c63
-
-* Fri May 10 2013 Jonathan MERCIER <bioinfornatics at gmail.com> - 3-5.20130510git59da161
-- Update to rev 59da161
-
-* Thu May 09 2013 Jonathan MERCIER <bioinfornatics at gmail.com> - 3-4.20130429gitefd9081
-- Update to rev efd9081
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3-3.20120923gitb4f810c
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Aug 14 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 3-2.20120811git8bcc53b
-- update to newest release Derelict 3
-
-* Wed Feb 01 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-22.20111106svn593
-- rebuild dmdfe 2.059
-
-* Wed Feb 01 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-21.20111106svn593
-- fix broken dependencies
-
-* Thu Jan 19 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-20.20111106svn593
-- Fix summary
-
-* Thu Jan 12 2012 Jonathan MERCIER <bioinfornatics at gmail.com> 2-19.20111106svn593
-- merge static subpackage with corresponding dvel subpackage for follow Packaging Static Libraries Guidelines
-
-* Sat Jan 7 2012 Jonathan MERCIER <bioinfornatics at gmail.com> 2-18.20111106svn593
-- Fix misspellling in description
-- put devel dependencies for devel subpackage
-- Fix end of line in css file
-
-* Fri Jan 6 2012 Jonathan MERCIER <bioinfornatics at gmail.com> 2-17.20111106svn593
-- fix license in spec file (Boost not GPLv3+)
-
-* Sat Dec 31 2011 Jonathan MERCIER <bioinfornatics at gmail.com> 2-16.20111106svn593
-- fix typo in spec file
-
-* Mon Dec 19 2011 Jonathan MERCIER <bioinfornatics at gmail.com> 2-15.20111106svn593
-- Remove BuildRoot Tag
-- Remove extra target DerelictFT for make they are already DerelictFT_ALL
-- Remove DdocTodevhelp
-- %%doc owns doc/*
-- fix changelog
-
-* Wed Dec 14 2011 Jonathan MERCIER <bioinfornatics at gmail.com> 2-14.20111106svn593
-- Remove devhelp package it is useless
-- Update to revision 593
-
-* Sun Dec 11 2011 Jonathan MERCIER <bioinfornatics at gmail.com> 2-13.20111031svn591
-- fix buildrequires and require
-- remove %%defattr and Group section
-
-* Fri Dec 9 2011 Jonathan MERCIER <bioinfornatics at gmail.com> 2-12.20111031svn591
-- Add doc for devhelp
-- Add tag for geany
-
-* Sat Nov 12 2011 Jonathan MERCIER <bioinfornatics at gmail.com> 2-11.20111031svn591
-- Update to revision 591
-
-* Sat Aug 06 2011 Jonathan MERCIER <bioinfornatics at gmail.com> 2-11.20111024svn590
-- Update to revision 590
-
-* Sat Aug 06 2011 Jonathan MERCIER <bioinfornatics at gmail.com> 2-10.20110806svn582
-- Update to revision 582
-
-* Wed Dec 08 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-9.20101207svn521
-- Update to revision 521
-
-* Mon Dec 06 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-8.20101201svn519
-- Update to revision 519
-
-* Wed Sep 15 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-7.20100824svn513
-- remove \x0a character by a real newline
-
-* Mon Sep 13 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-6.20100824svn513
-- Fix spec add require and build require
-
-* Sun Sep 12 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-5.20100824svn513
-- Fix spec
-
-* Thu Aug 26 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-4.20100824svn513
-- update to release 513
-
-* Wed Aug 11 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-3.20100801svn499
-- remove debuginfo package because it is a static librarie
-- Update to new revision 499
-
-* Tue Aug 03 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-2.20100801svn495
-- Update to new revision 495
-
-* Sun Aug 01 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-2.20100801svn493
-- Update to new revision 493
-
-* Sat Jul 31 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-2.20100407svn490
-- use %%{_libdir}
-
-* Sun Jul 04 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 2-1.20100407svn490
-- Initial release
-
diff --git a/fetchDerelictModules.sh b/fetchDerelictModules.sh
deleted file mode 100644
index 0ad185c..0000000
--- a/fetchDerelictModules.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-declare baseRepoUrl='https://github.com/DerelictOrg/'
-declare -a subProjects=( DerelictAL DerelictALURE DerelictASSIMP3 DerelictFI DerelictFT DerelictGL3 DerelictGLFW3 DerelictIL DerelictLua DerelictODE DerelictOgg DerelictPHYSFS DerelictPQ DerelictSDL2 DerelictSFML2 DerelictTheora DerelictUtil DerelictVorbis)
-declare -i timestamp
-declare -i lastCommit
-declare hashRevision
-declare moduleName
-declare needToPull=false
-
-pushd ~/rpmbuild/SOURCES > /dev/null
- echo '%global snapdate '$(date +'%Y%m%d')
- echo ''
-
- for subProject in ${subProjects[@]}; do
- if [[ ! -e ${subProject} ]]; then
- git clone https://github.com/DerelictOrg/${subProject}.git &> /dev/null
- else
- needToPull=true
- fi
- pushd ${subProject} > /dev/null
- [[ ${needToPull} ]] && git pull &> /dev/null
- timestamp=$(git log -1 --date=short --pretty='format:%at')
- lastCommit=$(date -d @${timestamp} +'%Y%m%d')
- hashRevision=$(git rev-parse --short HEAD)
- moduleName=${subProject/Derelict}
- (git archive --prefix=derelict-$(date +'%Y%m%d')/${moduleName}/ HEAD --format=tar | xz > ../derelict-${moduleName}-${lastCommit}git${hashRevision}.tar.xz) &> /dev/null
- echo '%global '${moduleName}'_snapdate '${lastCommit}
- echo '%global '${moduleName}'_revision '${hashRevision}
- echo '%global '${moduleName}'_alphatag %{'${moduleName}'_snapdate}git%{'${moduleName}'_revision}'
- echo ""
- popd > /dev/null
- done
-
-popd > /dev/null
-
diff --git a/sources b/sources
deleted file mode 100644
index c93ae2b..0000000
--- a/sources
+++ /dev/null
@@ -1,18 +0,0 @@
-eea0f19521692e6b717777917700a78f derelict-AL-20150825gitc74cdb9.tar.xz
-b075478f58c8813ba5e45bf5cc8d8e2a derelict-ALURE-20140518git52eed1b.tar.xz
-605e9684c350aade1fa095e4afc64b11 derelict-ASSIMP3-20150224gitb8d9c67.tar.xz
-49e41c259e3e886940cb57323f858942 derelict-FI-20150719git4e29ef3.tar.xz
-d4665da37583184f24167afd4a178d0c derelict-FT-20150207git66dd3dd.tar.xz
-57521910e43920ba511853c1a11bb804 derelict-GL3-20150803git262074e.tar.xz
-a9647330c1b1cd8f08dce6cfa0d789e3 derelict-GLFW3-20150713git3710cbc.tar.xz
-4c8d047354fe7e2844dbee28336f685c derelict-IL-20140929gitff159fe.tar.xz
-174106ce2ff817824b5173f2fcf9f871 derelict-Lua-20150727git8577bf9.tar.xz
-bb666fdd8ac38be34fb6260d650e440c derelict-ODE-20150326git60629cc.tar.xz
-cb998e1dc27d1ea6c98dcba9b7539690 derelict-Ogg-20150122git887f200.tar.xz
-c6dbdc500b06609287aecb501af73dbf derelict-PHYSFS-20140929git469cbb7.tar.xz
-fb40028890ff152056d4b6ee240de646 derelict-PQ-20150205git7fb7464.tar.xz
-a9e88668e834a6b3f9fac09d66e83f11 derelict-SDL2-20150821git4f2e6ea.tar.xz
-f1d6f75011a5ca78f62096c1d0e3d02e derelict-SFML2-20150904git0f3351d.tar.xz
-0737509ec6f08a6b8340d064d49090c3 derelict-Theora-20150122gitb4dc705.tar.xz
-e11ffd8a4d9aa5c0637c311988e64fcb derelict-Util-20150730git10a517b.tar.xz
-c5a113a39445e1e2e538fda3debce218 derelict-Vorbis-20150122gitc5e47eb.tar.xz
4 years, 9 months