Architecture specific change in rpms/libflatarray.git
by githook-noreply@fedoraproject.org
The package rpms/libflatarray.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/libflatarray.git/commit/?id=47740....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit 47740ef1be0489c0acb28c710c96de88167bdd07
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 15:47:50 2019 +0000
libflatarray fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675272
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index dbf6c54..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/libflatarray-0.1.1.tar.bz2
-/libflatarray-0.2.0.tar.bz2
diff --git a/1.patch b/1.patch
deleted file mode 100644
index 56cf7a5..0000000
--- a/1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 263547958ee750e12bbc8264c295dbfbd1ae80de Mon Sep 17 00:00:00 2001
-From: Christopher Meng <i(a)cicku.me>
-Date: Thu, 12 Feb 2015 11:04:16 +0800
-Subject: [PATCH] Correctly install files on 64-bit system
-
-Red Hat/Fedora/CentOS and some other derivatives use /udr/lib64 on 64-bit platform, thus .cmake files are also put underneath /usr/lib64/cmake.
-
-I didn't package libflatarray as a noarch package in Fedora, that means the package is arch-dependant although this "lib" only provides headers currently. But I don't know the feature of this package, I guess you will turn this into a shared library in the future, so I still install *Config.cmake to /usr/lib64 still.
-
-Any opinions?
----
- CMakeLists.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a5d4922..7eb6d5a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -82,7 +82,9 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PACKAGE_NAME})
-
- include(CPack)
-
--set(ConfigPackageLocation lib/cmake/${PACKAGE_NAME})
-+set(LIB_SUFFIX "" CACHE STRING "Define suffix of LIB_INSTALL_DIR" )
-+set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE STRING "Libraries will be installed to")
-+set(ConfigPackageLocation ${LIB_INSTALL_DIR}/cmake/${PACKAGE_NAME})
-
- if(CMAKE_VERSION VERSION_GREATER 2.8.10)
- include(CMakePackageConfigHelpers)
-@@ -103,7 +105,7 @@ get_filename_component(LIBFLATARRAY_CMAKE_DIR \${CMAKE_CURRENT_LIST_FILE} PATH)
- set(libflatarray_INCLUDE_DIR \"\${LIBFLATARRAY_CMAKE_DIR}/../../../include\")
- ")
-
--set(ConfigPackageLocation lib/cmake/${PACKAGE_NAME})
-+set(ConfigPackageLocation ${LIB_INSTALL_DIR}/cmake/${PACKAGE_NAME})
- install(
- FILES "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}Config.cmake"
- DESTINATION "${ConfigPackageLocation}")
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..4a25033
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+libflatarray fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675272
diff --git a/libflatarray.spec b/libflatarray.spec
deleted file mode 100644
index 3032025..0000000
--- a/libflatarray.spec
+++ /dev/null
@@ -1,127 +0,0 @@
-%global debug_package %{nil}
-
-Name: libflatarray
-Version: 0.2.0
-Release: 16%{?dist}
-Summary: C++ library for highly efficient multi-dimensional arrays
-License: Boost
-URL: http://www.libgeodecomp.org/libflatarray.html
-Source0: http://www.libgeodecomp.org/archive/libflatarray-%{version}.tar.bz2
-Patch0: https://github.com/gentryx/libflatarray/pull/1.patch
-BuildRequires: gcc-c++
-BuildRequires: boost-devel
-BuildRequires: cmake
-ExclusiveArch: %{ix86} x86_64
-
-%description
-LibFlatArray acts as a highly efficient multi-dimensional array of
-arbitrary objects (array of structs, AoS), but really uses a struct of
-arrays (SoA) memory layout. It's great for writing vectorized code and
-its lightning-fast iterators give you access to neighboring elements
-with zero address generation overhead.
-
-Use cases include:
-- computer simulations (e.g. stencil codes such as Lattice Boltzmann Methods)
-- image processing (e.g. Gaussian filters)
-- numerical methods (e.g. multiplication of complex matrices)
-
-The library is written in C++ and uses templates to shift the burden
-of address computation from runtime to compile time. It shares some
-infrastructure with its parent project LibGeoDecomp.
-
-%package devel
-Summary: Development files for %{name}
-#Requires: %{name}%{?_isa} = %{version}-%{release}
-Provides: %{name}-static = %{version}-%{release}
-
-%description devel
-#This package contains libraries and header files for
-This package contains header files for
-developing applications that use %{name}.
-
-%prep
-%setup -q
-%patch0 -p1
-# Don't build examples.
-sed -i '/examples/d' CMakeLists.txt
-
-%build
-# nVIDIA is what kind of open source?
-%cmake -DWITH_CUDA=OFF .
-%make_build
-
-%install
-%make_install
-
-%check
-make check
-
-%files devel
-%doc AUTHORS README
-%doc examples/
-%license LICENSE
-%{_includedir}/libflatarray/
-%{_libdir}/cmake/libflatarray/
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 23 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 0.2.0-14
-- Append curdir to CMake invokation. (#1668512)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 0.2.0-7
-- Rebuilt for Boost 1.59
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com> - 0.2.0-5
-- rebuild for Boost 1.58
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Feb 01 2015 Christopher Meng <rpm(a)cicku.me> - 0.2.0-3
-- Rework %%files section
-- Turn off debuginfo
-- Only build this for i686 and x86_64 due to Intel intrinsics
-
-* Mon Jan 26 2015 Petr Machata <pmachata(a)redhat.com> - 0.2.0-2
-- Rebuild for boost 1.57.0
-
-* Sat Nov 15 2014 Christopher Meng <rpm(a)cicku.me> - 0.2.0-1
-- Update to 0.2.0
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.1.1-4
-- 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.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu May 22 2014 Petr Machata <pmachata(a)redhat.com> - 0.1.1-2
-- Rebuild for boost 1.55.0
-
-* Sun Jan 26 2014 Christopher Meng <rpm(a)cicku.me> - 0.1.1-1
-- Initial Package.
diff --git a/sources b/sources
deleted file mode 100644
index 9e5023d..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-2bcf8b8c33a3d729155be48e47be3d04 libflatarray-0.2.0.tar.bz2
4 years, 10 months
Architecture specific change in rpms/libcint.git
by githook-noreply@fedoraproject.org
The package rpms/libcint.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/libcint.git/commit/?id=e4f6e029ee....
Change:
-ExcludeArch: %{power64}
Thanks.
Full change:
============
commit e4f6e029eec1a1137e938940c5297a2477bb2764
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 15:47:18 2019 +0000
libcint fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675260
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a5a4607..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/v2.8.7.tar.gz
-/v3.0.0.tar.gz
-/v3.0.1.tar.gz
-/v3.0.2.tar.gz
-/v3.0.3.tar.gz
-/v3.0.4.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..1b017a6
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+libcint fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675260
diff --git a/libcint.spec b/libcint.spec
deleted file mode 100644
index 78e8dd1..0000000
--- a/libcint.spec
+++ /dev/null
@@ -1,109 +0,0 @@
-Name: libcint
-Version: 3.0.4
-Release: 6%{?dist}
-Summary: General Gaussian-type orbitals integrals for quantum chemistry
-
-License: BSD
-URL: https://github.com/sunqm/libcint
-Source0: https://github.com/sunqm/libcint/archive/v%{version}.tar.gz
-
-# qcint is a drop-in replacement of the same library with architecture dependent optimizations
-Conflicts: qcint
-
-BuildRequires: gcc-gfortran
-BuildRequires: atlas-devel
-BuildRequires: cmake
-BuildRequires: python2-devel
-BuildRequires: numpy
-
-# ppc64 doesn't appear to have floats beyond 64 bits, so ppc64 is
-# disabled as per upstream's request
-ExcludeArch: %{power64}
-
-%description
-libcint is an open source library for analytical Gaussian integrals.
-It provides C/Fortran API to evaluate one-electron / two-electron
-integrals for Cartesian / real-spherical / spinor Gaussian type functions.
-
-%package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-%prep
-%setup -q
-
-%build
-mkdir build
-cd build
-export CFLAGS="%{optflags} -Wl,--as-needed"
-%cmake -DENABLE_EXAMPLE=1 -DWITH_F12=1 -DWITH_COULOMB_ERF=1 -DWITH_RANGE_COULOMB=1 -DENABLE_TEST=1 -DQUICK_TEST=1 -DBLAS_LIBRARIES=%{_libdir}/atlas/libtatlas.so ..
-make %{?_smp_mflags} VERBOSE=1
-
-%install
-make -C build install DESTDIR=%{buildroot}
-
-%check
-make -C build test ARGS=-V
-
-%ldconfig_scriptlets
-
-%files
-%doc README ChangeLog
-%license LICENSE
-%{_libdir}/libcint.so.*
-
-%files devel
-%{_includedir}/cint.h
-%{_libdir}/libcint.so
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Oct 09 2017 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.0.4-2
-- Disable build on ppc64.
-
-* Mon Oct 09 2017 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.0.4-1
-- Update to 3.0.4.
-
-* Thu Oct 05 2017 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.0.3-1
-- Update to 3.0.3.
-
-* Wed Oct 04 2017 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.0.2-1
-- Update to 3.0.2.
-
-* Wed Sep 27 2017 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.0.1-1
-- Update to 3.0.1.
-
-* Tue Sep 26 2017 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.0.0-1
-- Update to libcint version 3, based on patch sent by Qiming Sun.
-- Enabled F12 integrals.
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.7-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Sep 19 2016 Matt Chan <talcite(a)gmail.com> - 2.8.7-3
-- Disable aarch64 builds because of missing dependency
-* Mon Sep 19 2016 Matt Chan <talcite(a)gmail.com> - 2.8.7
-- Disable ppc64(LE) builds because of missing dependency
-* Tue Jul 19 2016 Matt Chan <talcite(a)gmail.com> - 2.8.6
-- Initial build
diff --git a/sources b/sources
deleted file mode 100644
index d1a8fa6..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (v3.0.4.tar.gz) = 977702f3ef7ef357024e446921a3ade0e1075e9476b217f8718e8c993b812709eb38cf126fc9be61c002a59a6b9184e0b0dadcf9bbe4fa04b294bd9e8d48e257
4 years, 10 months
Architecture specific change in rpms/latrace.git
by githook-noreply@fedoraproject.org
The package rpms/latrace.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/latrace.git/commit/?id=db58bb6576....
Change:
-ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
Thanks.
Full change:
============
commit db58bb6576a6f33dda4abe1c8f6898fea78d4c49
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 15:46:39 2019 +0000
latrace fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675250
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a04bdd9..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-latrace-0.5.7.tar.bz2
-/latrace-0.5.10.tar.bz2
-/latrace-0.5.11.tar.bz2
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..bb1c383
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+latrace fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675250
diff --git a/latrace-PRINT-format.patch b/latrace-PRINT-format.patch
deleted file mode 100644
index ebfb35f..0000000
--- a/latrace-PRINT-format.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Avoid a non-literal format string by using string token pasting.
-
-diff --git a/src/config.h b/src/config.h
-index 278771a35999a126..0346f0dcb9ccbc11 100644
---- a/src/config.h
-+++ b/src/config.h
-@@ -386,13 +386,11 @@ void tty_close(struct lt_config_app *cfg);
-
- #define PRINT(fmt, args...) \
- do { \
-- char lpbuf[1024]; \
-- sprintf(lpbuf, "[%d %s:%05d] %s", \
-+ printf("[%d %s:%05d] " fmt, \
- (pid_t) syscall(SYS_gettid), \
- __FUNCTION__, \
- __LINE__, \
-- fmt); \
-- printf(lpbuf, ## args); \
-+ ## args); \
- fflush(NULL); \
- } while(0)
-
diff --git a/latrace-aarch64-basic-audit.patch b/latrace-aarch64-basic-audit.patch
deleted file mode 100644
index 85113c0..0000000
--- a/latrace-aarch64-basic-audit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/audit.h b/src/audit.h
-index 2633944..efe056a 100644
---- a/src/audit.h
-+++ b/src/audit.h
-@@ -46,6 +46,13 @@
- # define sp_reg lr_sp
- # define La_retval La_arm_retval
- # define int_retval lrv_reg[0]
-+#elif defined __aarch64__
-+# define pltenter la_aarch64_gnu_pltenter
-+# define pltexit la_aarch64_gnu_pltexit
-+# define La_regs La_aarch64_regs
-+# define sp_reg lr_sp
-+# define La_retval La_aarch64_retval
-+# define int_retval lrv_xreg[0]
- #elif defined __powerpc__ && __WORDSIZE == 32
- # define pltenter la_ppc32_gnu_pltenter
- # define pltexit la_ppc32_gnu_pltexit
diff --git a/latrace-ppc64-basic-audit.patch b/latrace-ppc64-basic-audit.patch
deleted file mode 100644
index 7bf7625..0000000
--- a/latrace-ppc64-basic-audit.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/audit.h b/src/audit.h
-index efe056a..eea60d8 100644
---- a/src/audit.h
-+++ b/src/audit.h
-@@ -59,12 +59,18 @@
- # define La_regs La_ppc32_regs
- # define La_retval La_ppc32_retval
- # define int_retval lrv_r3
--#elif defined __powerpc__ && __WORDSIZE == 64
-+#elif defined __powerpc__ && __WORDSIZE == 64 && _CALL_ELF != 2
- # define pltenter la_ppc64_gnu_pltenter
- # define pltexit la_ppc64_gnu_pltexit
- # define La_regs La_ppc64_regs
- # define La_retval La_ppc64_retval
- # define int_retval lrv_r3
-+#elif defined __powerpc__ && __WORDSIZE == 64 && _CALL_ELF == 2
-+# define pltenter la_ppc64v2_gnu_pltenter
-+# define pltexit la_ppc64v2_gnu_pltexit
-+# define La_regs La_ppc64v2_regs
-+# define La_retval La_ppc64v2_retval
-+# define int_retval lrv_r3
- #elif defined __sh__
- # define pltenter la_sh_gnu_pltenter
- # define pltexit la_sh_gnu_pltexit
-diff --git a/src/stack.c b/src/stack.c
-index 3aa55d1..0d5c2ed 100644
---- a/src/stack.c
-+++ b/src/stack.c
-@@ -6,6 +6,13 @@
-
- #include "config.h"
-
-+#if defined __powerpc__
-+/* check the current stack pointer and check its boundaries */
-+int lt_stack_framesize(struct lt_config_audit *cfg, La_regs *regs)
-+{
-+ return lt_sh(cfg, framesize);
-+}
-+#else
- static __thread void *stack_start = NULL;
- static __thread void *stack_end = NULL;
-
-@@ -124,3 +131,4 @@ int lt_stack_framesize(struct lt_config_audit *cfg, La_regs *regs)
-
- return framesize;
- }
-+#endif
diff --git a/latrace.spec b/latrace.spec
deleted file mode 100644
index d9f2bb7..0000000
--- a/latrace.spec
+++ /dev/null
@@ -1,124 +0,0 @@
-Name: latrace
-Version: 0.5.11
-Release: 18%{?dist}
-Summary: LD_AUDIT feature frontend for glibc 2.4+
-License: GPLv3+
-
-URL: http://people.redhat.com/jolsa/latrace
-Source: http://people.redhat.com/jolsa/latrace/dl/%{name}-%{version}.tar.bz2
-Patch0: latrace-aarch64-basic-audit.patch
-Patch1: latrace-ppc64-basic-audit.patch
-Patch2: latrace-PRINT-format.patch
-ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
-BuildRequires: gcc
-BuildRequires: autoconf bison asciidoc xmlto binutils-devel binutils-static
-
-%description
-allows you to trace library calls and get their statistics in a
-manner similar to the strace utility (syscall tracing)
-
-%prep
-%setup -q
-%patch0 -p1 -b .aarch64
-%patch1 -p1 -b .ppc64
-%patch2 -p1
-
-%build
-autoconf
-%configure
-make V=1
-
-%install
-make install ROOTDIR=%{buildroot} V=1
-chmod 0755 %{buildroot}/%{_libdir}/libltaudit.so.%{version}
-
-%ldconfig_scriptlets
-
-%files
-%doc README ReleaseNotes TODO COPYING
-%config(noreplace) %{_sysconfdir}/*
-%{_libdir}/libltaudit.so.%{version}
-%{_bindir}/latrace
-%{_bindir}/latrace-ctl
-%{_mandir}/man1/*
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.11-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.11-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Aug 22 2018 Florian Weimer <fweimer(a)redhat.com> - 0.5.11-16
-- Fix FTBFS caused by non-literal format string (#1604539)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.11-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.11-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.11-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.11-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.11-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.11-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.11-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Nov 26 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.5.11-8
-- Add support for power64 and aarch64
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.11-7
-- 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.5.11-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.11-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sun Mar 10 2013 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.5.11-4
-- Enable building on ARM as it's supported, cleanup spec
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.11-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.11-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Jul 28 2011 Jiri Olsa <olsajiri(a)gmail.com> - 0.5.11-0
-- updated to new version
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.10-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Oct 13 2010 Jiri Olsa <olsajiri(a)gmail.com> 0.5.10-0
-- updated to new version
-
-* Thu Aug 5 2010 Jiri Olsa <olsajiri(a)gmail.com> 0.5.9-0
-- updated to new version
-- BZ 609860 - adding binutils-static to BuildRequires
-
-* Tue Sep 08 2009 Jiri Olsa <olsajiri(a)gmail.com> 0.5.7
-- updated to new version
-- upstream download moved
-
-* Sun Jul 05 2009 Jiri Olsa <olsajiri(a)gmail.com> 0.5.6-1
-- updates based on the Fedora review comments
-
-* Thu Jul 02 2009 Jiri Olsa <olsajiri(a)gmail.com> 0.5.5-2
-- minor updates based on the Fedora review comments
-
-* Sat Jun 13 2009 Jiri Olsa <olsajiri(a)gmail.com> 0.5.5-1
-- initial spec file
diff --git a/sources b/sources
deleted file mode 100644
index d4700b4..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-138457c7b9eaf3246eddb7856702cddf latrace-0.5.11.tar.bz2
4 years, 10 months
Architecture specific change in rpms/js.git
by githook-noreply@fedoraproject.org
The package rpms/js.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/js.git/commit/?id=e69aa4ef2ae0e5a....
Change:
-%ifnarch armv7hl
Thanks.
Full change:
============
commit e69aa4ef2ae0e5a814091efca297aa8338bc5ade
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 15:43:54 2019 +0000
js fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675212
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 591aa7f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-js-1.7.0.tar.gz
-/js185-1.0.0.tar.gz
-/js185-destdir.patch
diff --git a/0001-Make-js-config.h-multiarch-compatible.patch b/0001-Make-js-config.h-multiarch-compatible.patch
deleted file mode 100644
index 5f68e6f..0000000
--- a/0001-Make-js-config.h-multiarch-compatible.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 5017afb14474ef104719aaf56992f7c86475c42e Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters(a)verbum.org>
-Date: Mon, 17 Mar 2014 13:48:01 -0400
-Subject: [PATCH] Move JS_BYTES_PER_WORD out of config.h
-
-Instead define it in terms of the already extant GNU C extension
-__SIZEOF_POINTER__. This avoids multiarch conflicts when 32 and 64
-bit packages of js are co-installed.
----
- js/src/configure.in | 9 ---------
- js/src/js-config.h.in | 1 -
- js/src/jstypes.h | 12 ++++++++++++
- 3 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/js/src/configure.in b/js/src/configure.in
-index 0bf9b75..daf53d2 100644
---- a/js/src/configure.in
-+++ b/js/src/configure.in
-@@ -3134,15 +3134,6 @@ else
- [int long 'long long' short])
- fi
-
--MOZ_SIZE_OF_TYPE(JS_BYTES_PER_WORD, void*, 4 8)
--if test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "4"; then
-- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 5)
--elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then
-- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 6)
--else
-- AC_MSG_ERROR([Unexpected JS_BYTES_PER_WORD])
--fi
--
- MOZ_ALIGN_OF_TYPE(JS_ALIGN_OF_POINTER, void*, 2 4 8 16)
- MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 12 14)
-
-diff --git a/js/src/js-config.h.in b/js/src/js-config.h.in
-index e3a5f74..f30d5c3 100644
---- a/js/src/js-config.h.in
-+++ b/js/src/js-config.h.in
-@@ -81,7 +81,6 @@
- #undef JS_INT32_TYPE
- #undef JS_INT64_TYPE
- #undef JS_INTPTR_TYPE
--#undef JS_BYTES_PER_WORD
-
- /* Some mozilla code uses JS-friend APIs that depend on JS_TRACER and
- JS_METHODJIT being correct. */
-diff --git a/js/src/jstypes.h b/js/src/jstypes.h
-index c2103d8..84d402e 100644
---- a/js/src/jstypes.h
-+++ b/js/src/jstypes.h
-@@ -56,6 +56,18 @@
-
- #include <stddef.h>
- #include "js-config.h"
-+#ifndef JS_BYTES_PER_WORD
-+#define JS_BYTES_PER_WORD __SIZEOF_POINTER__
-+#endif
-+#ifndef JS_BITS_PER_WORD_LOG2
-+#if JS_BYTES_PER_WORD == 8
-+#define JS_BITS_PER_WORD_LOG2 6
-+#elif JS_BYTES_PER_WORD == 4
-+#define JS_BITS_PER_WORD_LOG2 5
-+#else
-+#error Unhandled JS_BYTES_PER_WORD
-+#endif
-+#endif
-
- /***********************************************************************
- ** MACROS: JS_EXTERN_API
---
-1.8.3.1
-
diff --git a/aarch64.patch b/aarch64.patch
deleted file mode 100644
index 19d261d..0000000
--- a/aarch64.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/js/src/Makefile.in
-+++ a/js/src/Makefile.in
-@@ -382,7 +382,7 @@ CPPSRCS += checks.cc \
- # END enclude sources for V8 dtoa
- #############################################
-
--ifeq (,$(filter-out powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU)))
-+ifeq (,$(filter-out aarch64 powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU)))
-
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
---- a/js/src/assembler/jit/ExecutableAllocator.h
-+++ a/js/src/assembler/jit/ExecutableAllocator.h
-@@ -391,6 +391,12 @@ public:
- {
- CacheRangeFlush(code, size, CACHE_SYNC_ALL);
- }
-+#elif WTF_CPU_AARCH64 && WTF_PLATFORM_LINUX
-+ static void cacheFlush(void* code, size_t size)
-+ {
-+ intptr_t end = reinterpret_cast<intptr_t>(code) + size;
-+ __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end));
-+ }
- #else
- #error "The cacheFlush support is missing on this platform."
- #endif
---- a/js/src/assembler/wtf/Platform.h
-+++ a/js/src/assembler/wtf/Platform.h
-@@ -292,6 +292,10 @@
-
- #endif /* ARM */
-
-+/* CPU(AArch64) - 64-bit ARM */
-+#if defined(__aarch64__)
-+#define WTF_CPU_AARCH64 1
-+#endif
-
-
- /* Operating systems - low-level dependencies */
---- a/js/src/configure.in
-+++ a/js/src/configure.in
-@@ -1534,6 +1534,10 @@ arm*)
- CPU_ARCH=arm
- ;;
-
-+aarch64)
-+ CPU_ARCH=aarch64
-+ ;;
-+
- mips|mipsel)
- CPU_ARCH="mips"
- ;;
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..da6acc9
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+js fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675212
diff --git a/js-1.5-va_copy.patch b/js-1.5-va_copy.patch
deleted file mode 100644
index cf64d3a..0000000
--- a/js-1.5-va_copy.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- js/src/config/Linux_All.mk.vacopy 2009-05-29 10:35:14.000000000 +0200
-+++ js/src/config/Linux_All.mk 2009-05-29 10:44:55.000000000 +0200
-@@ -91,8 +91,17 @@ endif
- JS_EDITLINE = 1
-
- ifeq ($(CPU_ARCH),x86_64)
--# Use VA_COPY() standard macro on x86-64
--# FIXME: better use it everywhere
-+# Use va_copy() standard macro on x86-64
-+OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
-+endif
-+
-+ifeq ($(CPU_ARCH),ppc)
-+# Use va_copy() standard macro on ppc too
-+OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
-+endif
-+
-+ifeq (s390,$(findstring s390,$(CPU_ARCH)))
-+# Use va_copy() standard macro on s390/s390x too
- OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
- endif
-
-diff -Naupr js.orig/src/jsprf.c js/src/jsprf.c
---- js.orig/src/jsprf.c 2004-09-24 05:31:15.000000000 +0200
-+++ js/src/jsprf.c 2006-01-26 11:34:52.000000000 +0100
-@@ -55,7 +55,7 @@
- ** and requires array notation.
- */
- #ifdef HAVE_VA_COPY
--#define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar)
-+#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar)
- #elif defined(HAVE_VA_LIST_AS_ARRAY)
- #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0]
- #else
diff --git a/js-1.60-ncurses.patch b/js-1.60-ncurses.patch
deleted file mode 100644
index 6002715..0000000
--- a/js-1.60-ncurses.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
---- js.orig/src/Makefile.ref 2006-08-21 20:58:45.000000000 +0200
-+++ js/src/Makefile.ref 2007-02-02 12:59:06.000000000 +0100
-@@ -132,7 +132,7 @@ endif
- ifdef JS_READLINE
- # For those platforms with the readline library installed.
- DEFINES += -DEDITLINE
--PROG_LIBS += -lreadline -ltermcap
-+PROG_LIBS += -lreadline -lncurses
- else
- ifdef JS_EDITLINE
- # Use the editline library, built locally.
diff --git a/js-1.7.0-threadsafe.patch b/js-1.7.0-threadsafe.patch
deleted file mode 100644
index 55611c6..0000000
--- a/js-1.7.0-threadsafe.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
---- js.orig/src/Makefile.ref 2006-07-26 21:16:47.000000000 +0200
-+++ js/src/Makefile.ref 2007-11-20 22:03:59.000000000 +0100
-@@ -63,11 +63,11 @@ INCLUDES += -I$(OBJDIR)
-
- ifdef JS_THREADSAFE
- DEFINES += -DJS_THREADSAFE
--INCLUDES += -I$(DIST)/include/nspr
-+INCLUDES += $(shell nspr-config --cflags)
- ifdef USE_MSVC
- OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
- else
--OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
-+OTHER_LIBS += $(shell nspr-config --libs)
- endif
- endif
-
diff --git a/js-1.8.5-537701.patch b/js-1.8.5-537701.patch
deleted file mode 100644
index add3e6d..0000000
--- a/js-1.8.5-537701.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up js-1.8.5/js/src/jsval.h.pad-the-structs-and-asserts js-1.8.5/js/src/jsval.h
---- js-1.8.5/js/src/jsval.h.pad-the-structs-and-asserts 2011-11-28 12:46:32.811556132 -0600
-+++ js-1.8.5/js/src/jsval.h 2011-11-28 12:46:43.493448233 -0600
-@@ -343,11 +343,11 @@ typedef union jsval_layout
- uint64 payload47 : 47;
- } debugView;
- struct {
-+ uint32 padding;
- union {
- int32 i32;
- uint32 u32;
- JSWhyMagic why;
-- jsuword word;
- } payload;
- } s;
- double asDouble;
-diff -up js-1.8.5/js/src/jsvalue.h.pad-the-structs-and-asserts js-1.8.5/js/src/jsvalue.h
---- js-1.8.5/js/src/jsvalue.h.pad-the-structs-and-asserts 2011-11-28 12:46:37.246509255 -0600
-+++ js-1.8.5/js/src/jsvalue.h 2011-11-28 12:46:43.495448203 -0600
-@@ -291,7 +291,6 @@ JSVAL_EXTRACT_NON_DOUBLE_TAG_IMPL(jsval_
- }
-
- #ifdef __cplusplus
--JS_STATIC_ASSERT(offsetof(jsval_layout, s.payload) == 0);
- JS_STATIC_ASSERT((JSVAL_TYPE_NONFUNOBJ & 0xF) == JSVAL_TYPE_OBJECT);
- JS_STATIC_ASSERT((JSVAL_TYPE_FUNOBJ & 0xF) == JSVAL_TYPE_OBJECT);
- #endif
-@@ -729,7 +728,11 @@ class Value
- }
-
- const jsuword *payloadWord() const {
-+#if JS_BITS_PER_WORD == 32
- return &data.s.payload.word;
-+#elif JS_BITS_PER_WORD == 64
-+ return &data.asBits;
-+#endif
- }
-
- private:
diff --git a/js-1.8.5-64bit-big-endian.patch b/js-1.8.5-64bit-big-endian.patch
deleted file mode 100644
index 8cf3fc9..0000000
--- a/js-1.8.5-64bit-big-endian.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=627664
-
-diff -up xulrunner-2.0/mozilla-central/js/src/jsval.h.64bit-big-endian xulrunner-2.0/mozilla-central/js/src/jsval.h
---- xulrunner-2.0/mozilla-central/js/src/jsval.h.64bit-big-endian 2011-01-20 15:59:49.000000000 +0100
-+++ xulrunner-2.0/mozilla-central/js/src/jsval.h 2011-01-20 16:00:21.000000000 +0100
-@@ -347,6 +347,7 @@ typedef union jsval_layout
- int32 i32;
- uint32 u32;
- JSWhyMagic why;
-+ jsuword word;
- } payload;
- } s;
- double asDouble;
diff --git a/js-1.8.5-array-recursion.patch b/js-1.8.5-array-recursion.patch
deleted file mode 100644
index 463eb4e..0000000
--- a/js-1.8.5-array-recursion.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ur js-1.8.5.orig/js/src/jsarray.cpp js-1.8.5/js/src/jsarray.cpp
---- js-1.8.5.orig/js/src/jsarray.cpp 2011-03-31 23:08:36.000000000 +0400
-+++ js-1.8.5/js/src/jsarray.cpp 2015-04-15 01:10:10.662544828 +0300
-@@ -1223,8 +1223,6 @@
- array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
- JSString *sepstr, Value *rval)
- {
-- JS_CHECK_RECURSION(cx, return false);
--
- /* Get characters to use for the separator. */
- static const jschar comma = ',';
- const jschar *sep;
-@@ -1323,6 +1321,8 @@
- static JSBool
- array_toString(JSContext *cx, uintN argc, Value *vp)
- {
-+ JS_CHECK_RECURSION(cx, return false);
-+
- JSObject *obj = ToObject(cx, &vp[1]);
- if (!obj)
- return false;
-@@ -1357,6 +1357,8 @@
- static JSBool
- array_toLocaleString(JSContext *cx, uintN argc, Value *vp)
- {
-+ JS_CHECK_RECURSION(cx, return false);
-+
- JSObject *obj = ToObject(cx, &vp[1]);
- if (!obj)
- return false;
-@@ -1454,6 +1456,8 @@
- static JSBool
- array_join(JSContext *cx, uintN argc, Value *vp)
- {
-+ JS_CHECK_RECURSION(cx, return false);
-+
- JSString *str;
- if (argc == 0 || vp[2].isUndefined()) {
- str = NULL;
-diff --git a/js/src/tests/ecma_5/extensions/array-toString-recursion.js b/js/src/tests/ecma_5/extensions/array-toString-recursion.js
-new file mode 100644
---- /dev/null
-+++ b/js/src/tests/ecma_5/extensions/array-toString-recursion.js
-@@ -0,0 +1,46 @@
-+/*
-+ * Any copyright is dedicated to the Public Domain.
-+ * http://creativecommons.org/licenses/publicdomain/
-+ */
-+
-+//-----------------------------------------------------------------------------
-+var BUGNUMBER = 635389;
-+var summary = 'Infinite recursion via [].{toString,toLocaleString,join}';
-+
-+print(BUGNUMBER + ": " + summary);
-+
-+/**************
-+ * BEGIN TEST *
-+ **************/
-+
-+try
-+{
-+ var x = [];
-+ x.join = Array.prototype.toString;
-+ "" + x;
-+ throw new Error("should have thrown");
-+}
-+catch (e)
-+{
-+ assertEq(e instanceof InternalError, true,
-+ "should have thrown for over-recursion");
-+}
-+
-+try
-+{
-+ var x = { toString: Array.prototype.toString, join: Array.prototype.toString };
-+ "" + x;
-+ throw new Error("should have thrown");
-+}
-+catch (e)
-+{
-+ assertEq(e instanceof InternalError, true,
-+ "should have thrown for over-recursion");
-+}
-+
-+/******************************************************************************/
-+
-+if (typeof reportCompare === "function")
-+ reportCompare(true, true);
-+
-+print("All tests passed!");
-diff -ur js-1.8.5.orig/js/src/tests/ecma_5/extensions/jstests.list js-1.8.5/js/src/tests/ecma_5/extensions/jstests.list
---- js-1.8.5.orig/js/src/tests/ecma_5/extensions/jstests.list 2011-03-31 23:08:36.000000000 +0400
-+++ js-1.8.5/js/src/tests/ecma_5/extensions/jstests.list 2015-04-15 01:15:08.784740028 +0300
-@@ -9,6 +9,7 @@
- script bug472534.js
- script bug496985.js
- script bug566661.js
-+script array-toString-recursion.js
- script eval-native-callback-is-indirect.js
- script extension-methods-reject-null-undefined-this.js
- skip-if(!xulRuntime.shell) script function-definition-with.js # needs evaluate()
diff --git a/js-1.8.5-c++11.patch b/js-1.8.5-c++11.patch
deleted file mode 100644
index ab2181f..0000000
--- a/js-1.8.5-c++11.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -upr a/js/src/jsapi.cpp b/js/src/jsapi.cpp
---- a/js/src/jsapi.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsapi.cpp 2016-02-29 18:10:49.302307353 -0600
-@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob
- AutoIdVector props(cx);
- JSIdArray *ida;
- if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida))
-- return false;
-+ return NULL;
- for (size_t n = 0; n < size_t(ida->length); ++n)
- JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]);
- return ida;
-diff -upr a/js/src/jsfun.cpp b/js/src/jsfun.cpp
---- a/js/src/jsfun.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsfun.cpp 2016-02-29 18:21:45.249674890 -0600
-@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje
-
- JSString *str = JS_DecompileFunction(cx, fun, indent);
- if (!str)
-- return false;
-+ return NULL;
-
- if (!indent)
- cx->compartment->toSourceCache.put(fun, str);
-@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon
- const Shape *shape = funobj->nativeLookup(id);
- if (!shape) {
- if (!ResolveInterpretedFunctionPrototype(cx, funobj))
-- return false;
-+ return NULL;
- shape = funobj->nativeLookup(id);
- }
- JS_ASSERT(!shape->configurable());
-diff -upr a/js/src/jsiter.cpp b/js/src/jsiter.cpp
---- a/js/src/jsiter.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsiter.cpp 2016-02-29 18:24:22.494659919 -0600
-@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f
- */
- JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
- if (!obj)
-- return false;
-+ return NULL;
- obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
- obj->setMap(cx->compartment->emptyEnumeratorShape);
- return obj;
-diff -upr a/js/src/jsparse.cpp b/js/src/jsparse.cpp
---- a/js/src/jsparse.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsparse.cpp 2016-02-29 18:29:03.997437475 -0600
-@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun
- if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
- JS_ASSERT(pn->pn_cookie.isFree());
- if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
-- return false;
-+ return NULL;
- }
-
- pn->pn_blockid = outertc->blockid();
-diff -upr a/js/src/jsstr.cpp b/js/src/jsstr.cpp
---- a/js/src/jsstr.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsstr.cpp 2016-02-29 19:01:45.857779836 -0600
-@@ -1734,7 +1734,7 @@ class RegExpGuard
- if (flat) {
- patstr = flattenPattern(cx, fm.patstr);
- if (!patstr)
-- return false;
-+ return NULL;
- } else {
- patstr = fm.patstr;
- }
-@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObje
- UndefinedValue(), NULL, NULL,
- JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
- NULL)) {
-- return JS_FALSE;
-+ return NULL;
- }
-
- return proto;
-diff -upr a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
---- a/js/src/jstypedarray.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jstypedarray.cpp 2016-02-29 19:08:53.541136191 -0600
-@@ -1334,7 +1334,7 @@ class TypedArrayTemplate
- if (size != 0 && count >= INT32_MAX / size) {
- JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
- JSMSG_NEED_DIET, "size and count");
-- return false;
-+ return NULL;
- }
-
- int32 bytelen = size * count;
-@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint
-
- default:
- JS_NOT_REACHED("shouldn't have gotten here");
-- return false;
-+ return NULL;
- }
- }
-
-diff -upr a/js/src/jsxml.cpp b/js/src/jsxml.cpp
---- a/js/src/jsxml.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsxml.cpp 2016-02-29 19:17:10.363279731 -0600
-@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS
-
- obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass);
- if (!obj)
-- return JS_FALSE;
-+ return NULL;
- JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal()));
- JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal()));
- JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared()));
-@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb
- size_t length = str->length();
- jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
- if (!chars)
-- return JS_FALSE;
-+ return NULL;
- *chars = '@';
- const jschar *strChars = str->getChars(cx);
- if (!strChars) {
-diff -upr a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
---- a/js/src/methodjit/InvokeHelpers.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/methodjit/InvokeHelpers.cpp 2016-02-29 20:34:14.496983346 -0600
-@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx)
- {
- JSStackFrame *fp = cx->fp();
- if (fp->hasImacropc())
-- return false;
-+ return NULL;
-
- JSScript *script = fp->script();
- return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc);
-diff -upr a/js/src/nanojit/NativeX64.cpp b/js/src/nanojit/NativeX64.cpp
---- a/js/src/nanojit/NativeX64.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/nanojit/NativeX64.cpp 2016-02-29 20:19:56.487934808 -0600
-@@ -1899,7 +1899,7 @@ namespace nanojit
- }
- }
-
-- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
-+ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {int64_t(0x8000000000000000LL),0};
-
- void Assembler::asm_fneg(LIns *ins) {
- Register rr, ra;
diff --git a/js-1.8.5-secondary-jit.patch b/js-1.8.5-secondary-jit.patch
deleted file mode 100644
index 4656129..0000000
--- a/js-1.8.5-secondary-jit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=627668
-
-diff -up xulrunner-2.0/mozilla-central/js/src/Makefile.in.big-endian-jit xulrunner-2.0/mozilla-central/js/src/Makefile.in
---- xulrunner-2.0/mozilla-central/js/src/Makefile.in.big-endian-jit 2010-11-04 21:05:48.000000000 +0100
-+++ xulrunner-2.0/mozilla-central/js/src/Makefile.in 2010-11-15 14:17:39.000000000 +0100
-@@ -371,7 +371,7 @@ CPPSRCS += checks.cc \
- # END enclude sources for V8 dtoa
- #############################################
-
--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter-out powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU)))
-
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
diff --git a/js-ldflags.patch b/js-ldflags.patch
deleted file mode 100644
index 99ffa0c..0000000
--- a/js-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.ref.orig 2005-04-19 22:14:17.000000000 +0300
-+++ src/Makefile.ref 2005-04-19 22:14:49.000000000 +0300
-@@ -108,7 +108,7 @@
- PERLLDFLAGS := $(subst -rdynamic,-export-dynamic,$(PERLLDFLAGS))
-
- CFLAGS += $(PERLCFLAGS)
--#LDFLAGS += $(PERLLDFLAGS) #PH removed this assgnment
-+LDFLAGS += $(PERLLDFLAGS)
- INCLUDES += -I. #needed for perlconnect/jsperl.c
- endif
-
diff --git a/js-perlconnect.patch b/js-perlconnect.patch
deleted file mode 100644
index 2d84e95..0000000
--- a/js-perlconnect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/perlconnect/jsperl.c.orig
-+++ src/perlconnect/jsperl.c
-@@ -218,7 +218,9 @@
- {
- PerlInterpreter *perl = JS_GetPrivate(cx, obj);
-
-- perl_destruct(perl);
-- perl_free(perl);
-+ if (perl) {
-+ perl_destruct(perl);
-+ perl_free(perl);
-+ }
- /* return JS_TRUE; */
- }
diff --git a/js-shlib.patch b/js-shlib.patch
deleted file mode 100644
index 9a24d20..0000000
--- a/js-shlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Use gcc for linking because of -Wl,... from "perl -MExtUtils::Embed -e ldopts".
-
---- src/config/Linux_All.mk.orig 2003-05-16 02:21:08.000000000 +0200
-+++ src/config/Linux_All.mk 2004-03-02 03:56:15.000000000 +0100
-@@ -42,7 +42,7 @@
- OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
-
- RANLIB = echo
--MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
-+MKSHLIB = $(CC) -shared -lc -Wl,-soname,libjs.so.1 $(XMKSHLIBOPTS)
-
- #.c.o:
- # $(CC) -c -MD $*.d $(CFLAGS) $<
diff --git a/js.spec b/js.spec
deleted file mode 100644
index 080cb2c..0000000
--- a/js.spec
+++ /dev/null
@@ -1,382 +0,0 @@
-#% global hgdate 51702867d932
-
-Summary: JavaScript interpreter and libraries
-Name: js
-Epoch: 1
-Version: 1.8.5
-Release: 34%{?hgdate:.hg%{hgdate}}%{?dist}
-License: GPLv2+ or LGPLv2+ or MPLv1.1
-URL: http://www.mozilla.org/js/
-Source0: http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-Patch0: js-1.8.5-64bit-big-endian.patch
-Patch1: js-1.8.5-secondary-jit.patch
-Patch2: js185-destdir.patch
-Patch3: js-1.8.5-537701.patch
-Patch4: js185-arm-nosoftfp.patch
-Patch5: js185-libedit.patch
-Patch6: 0001-Make-js-config.h-multiarch-compatible.patch
-Patch7: aarch64.patch
-# bz#1096135
-Patch8: ppc64le.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1178141 (http://hg.mozilla.org/mozilla-central/rev/a7b220e7425a)
-Patch9: js-1.8.5-array-recursion.patch
-Patch10: js-1.8.5-c++11.patch
-# update for 48-bit VA
-Patch11: mozjs1.8.5-tag.patch
-Provides: libjs = %{version}-%{release}
-Buildrequires: nspr-devel >= 4.7
-Buildrequires: perl-devel
-BuildRequires: python2
-BuildRequires: zip
-Buildrequires: libedit-devel
-BuildRequires: ncurses-devel
-BuildRequires: autoconf213
-
-
-%description
-JavaScript is the Netscape-developed object scripting language used in millions
-of web pages and server applications worldwide. Netscape's JavaScript is a
-superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
-with only mild differences from the published standard.
-
-
-%package devel
-Summary: Header files, libraries and development documentation for %{name}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: pkgconfig
-Requires: ncurses-devel readline-devel
-Provides: libjs-devel = %{version}-%{release}
-
-%description devel
-This package contains the header files, static libraries and development
-documentation for %{name}. If you like to develop programs using %{name},
-you will need to install %{name}-devel.
-
-
-%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p2 -b .64bit-big-endian
-%patch1 -p2 -b .secondary-jit
-%patch2 -p0 -b .destdir
-%patch3 -p1 -b .537701
-%patch4 -p1 -b .armhfp
-%patch5 -p1 -b .libedit
-%patch6 -p1 -b .multiarch
-%patch7 -p1 -b .aarch64
-%patch8 -p1 -b .ppc64le
-%patch9 -p1 -b .array-recursion
-%patch10 -p1 -b .c++11
-%patch11 -p1 -b .tag
-
-cd js
-
-# Rm parts with spurios licenses, binaries
-# Some parts under BSD (but different suppliers): src/assembler
-#rm -rf src/assembler src/yarr/yarr src/yarr/pcre src/yarr/wtf src/v8-dtoa
-rm -rf src/ctypes/libffi src/t src/tests/src/jstests.jar src/tracevis src/v8
-
-pushd src
-autoconf-2.13
-popd
-
-# Create pkgconfig file
-cat > libjs.pc << 'EOF'
-prefix=%{_prefix}
-exec_prefix=%{_prefix}
-libdir=%{_libdir}
-includedir=%{_includedir}
-
-Name: libjs
-Description: JS library
-Requires: nspr >= 4.7
-Version: %{version}
-Libs: -L${libdir} -ljs
-Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -I${includedir}/js
-EOF
-
-
-%build
-cd js/src
-CPPFLAGS="$(pkg-config --cflags libedit)" \
-%configure \
- --with-system-nspr \
- --enable-threadsafe \
- --enable-readline \
- --disable-optimize
-make %{?_smp_mflags}
-
-
-%install
-cd js
-make -C src install DESTDIR=%{buildroot}
-# We don't want this
-rm -f %{buildroot}%{_bindir}/js-config
-install -m 0755 src/jscpucfg src/shell/js \
- %{buildroot}%{_bindir}/
-rm -rf %{buildroot}%{_libdir}/*.a
-rm -rf %{buildroot}%{_libdir}/*.la
-
-# For compatibility
-# XXX do we really need libjs?!?!?!
-pushd %{buildroot}%{_libdir}
-ln -s libmozjs185.so.1.0 libmozjs.so.1
-ln -s libmozjs185.so.1.0 libjs.so.1
-ln -s libmozjs185.so libmozjs.so
-ln -s libmozjs185.so libjs.so
-popd
-
-install -m 0644 libjs.pc %{buildroot}%{_libdir}/pkgconfig/
-
-%ldconfig_scriptlets
-
-%check
-# Unfortunately it fail on arm and I have no machines where I could debug it unfortunately, so just do not test on it and hope on the best
-%ifnarch armv7hl
-# it fails in strange way initially, so remove
-rm js/src/jit-test/tests/sunspider/check-date-format-tofte.js
-make -C js/src check
-%endif
-
-%files
-%doc js/src/README.html
-%{_bindir}/js
-%{_libdir}/*.so.*
-
-%files devel
-%{_bindir}/jscpucfg
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.so
-%{_includedir}/js
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.5-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.5-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.5-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 15 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 1:1.8.5-31
-- 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> - 1:1.8.5-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.5-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.5-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Mar 10 2017 Dan Hork <dan[at]danny.cz> - 1:1.8.5-27
-- add patch for 48-bit VA (#1423793)
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.5-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Apr 05 2016 Than Ngo <than(a)redhat.com> - 1:1.8.5-25
-- Disable optimizations which caused regressions with new gcc
- Use fedora default -O2 instead of mozjs -O3
-
-* Tue Mar 01 2016 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:1.8.5-24
-- Fix FTBFS with C++11 (#1307665)
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.5-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.8.5-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Apr 15 2015 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1:1.8.5-21
-- Skip test on arm - it failed in strange way and I have no machines to debug
-- Some cleanup
-
-* Wed Apr 15 2015 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1:1.8.5-20
-- Add Patch9: js-1.8.5-array-recursion.patch (bz#1178141 - http://hg.mozilla.org/mozilla-central/rev/a7b220e7425a)
-- Add %%check section
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.8.5-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.8.5-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed May 14 2014 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1:1.8.5-17
-- Fix bogus dates in changelog.
-- Add Patch8: ppc64le.patch (bz#1096135) to fix compilation on ppc64le arch.
-
-* Wed Mar 26 2014 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 1:1.8.5-16
-- Add patch for AArch64.
-
-* Mon Mar 17 2014 Colin Walters <walters(a)redhat.com> - 1:1.8.5-15
-- Add patch to fix multilib conflict with devel packages
- I am not aware of anyone who actually needs this, but it checks
- a checkbox.
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.8.5-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.8.5-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Jan 18 2013 Dennis Gilmore <dennis(a)ausil.us> - 1:1.8.5-12
-- make sure -march=armv7-a is not hardcoded in arm builds
-
-* Sat Nov 17 2012 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1:1.8.5-11
-- Thanks to Ville Skytt (bz#875343) build against libedit instead of readline
- what simplify licensing apparently without any loss of functionality
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.8.5-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jan 10 2012 Dennis Gilmore <dennis(a)ausil.us> - 1.8.5-9
-- add patch to enable js to build on both hard and soft floating point arm distros
-
-* Fri Dec 02 2011 Karsten Hopp <karsten(a)redhat.com> 1.8.5-8
-- add patch from bugzilla 749604, fixes PPC failures
-
-* Wed Jun 22 2011 Colin Walters <walters(a)verbum.org> - 1:1.8.5-6
-- Include mozjs185.pc, clean up build
-- Based on work from Christopher Aillon <caillon(a)redhat.com>
-- Switch to using make install DESTDIR=, instead of hardcoding build rules.
-- Add DESTDIR= patch from GNOME 3.2 jhbuild
-- Make mozjs185 the canonical target for both libmozjs and libmozjs185.
-
-* Fri May 27 2011 Dan Hork <dan[at]danny.cz> - 1.8.5-5
-- add secondary arch patches from xulrunner
-
-* Tue Apr 12 2011 Christopher Aillon <caillon(a)redhat.com> - 1.8.5-4
-- devel subpackage needs to ask for the newly added epoch
-
-* Tue Apr 12 2011 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.8.5-3
-- Add Epoch: 1 to allow update of 1.70-13 version.
-
-* Sat Apr 9 2011 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.8.5-2
-- Correct symlink to provide backward capabiliies libjs.so.1
-
-* Wed Apr 6 2011 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.8.5-1
-- Update to release.
-- Remove unneeded anymore patches.
-- Add backward capability symlink.
-
-* Sat Feb 12 2011 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.8.5-0.hg51702867d932
-- Build version 1.8.5 by update request - BZ#676441 from Firefox 4.0 mercurial repository.
-- Gone -DJS_C_STRINGS_ARE_UTF8
-- Add BR autoconf213, change build system to use configure.
-- Adopt patch0 (js-1.7.0-make.patch -> js-1.8.5-make.patch)
-- Adopt patch1 (js-shlib.patch -> js-1.8.5-shlib.patch)
-- Remove Patch2 (js-1.5-va_copy.patch) and Patch3 (js-ldflags.patch)
-- Add BR python, zip.
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.70-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Jun 16 2010 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.70-12
-- Add UTF-8 support (add -DJS_C_STRINGS_ARE_UTF8 ) by request Peter Halliday: BZ#576585
-
-* Mon Jun 14 2010 Dan Hork <dan[at]danny.cz> - 1.70-11
-- updated the va_copy patch for s390
-
-* Mon Jan 25 2010 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.70-10
-- Remove static library from -devel - %%{_libdir}/*.a (bz#556057) to meet guidelines.
-
-* Sun Aug 2 2009 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.70-8
-- Reformat spec with tabs.
-- By report of Thomas Sondergaard (BZ#511162) Add -DXP_UNIX=1 -DJS_THREADSAFE=1 flags and nspr requires into libjs.pc
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.70-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri May 29 2009 Dan Horak <dan[at]danny.cz> 1.70-6
-- update the va_copy patch for s390x
-
-* Thu Apr 9 2009 Matthias Saou <http://freshrpms.net/> 1.70-5
-- Update description (#487903).
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Jun 4 2008 Jon McCann <jmccann(a)redhat.com> - 1.70-3
-- Add two missing files (#449715)
-
-* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 1.70-2
-- Rebuild for perl 5.10 (again)
-
-* Sun Feb 3 2008 Matthias Saou <http://freshrpms.net/> 1.70-1
-- Update to 1.7.0, as 1.70 to avoid introducing an epoch for now...
-- Remove no longer provided perlconnect parts.
-
-* Thu Jan 24 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.60-6
-- BR: perl(ExtUtils::Embed)
-
-* Sun Jan 20 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.60-5
-- rebuild for new perl
-
-* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.60-4
-- Rebuild for new BuildID feature.
-
-* Mon Aug 6 2007 Matthias Saou <http://freshrpms.net/> 1.60-3
-- Update License field.
-- Add perl(ExtUtils::MakeMaker) build requirement to pull in perl-devel.
-
-* Fri Feb 2 2007 Matthias Saou <http://freshrpms.net/> 1.60-2
-- Include jsopcode.tbl and js.msg in devel (#235481).
-- Install static lib mode 644 instead of 755.
-
-* Fri Feb 2 2007 Matthias Saou <http://freshrpms.net/> 1.60-1
-- Update to 1.60.
-- Rebuild in order to link against ncurses instead of termcap (#226773).
-- Add ncurses-devel build requirement and patch s/termcap/ncurses/ in.
-- Change mode of perl library from 555 to 755 (#224603).
-
-* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.5-6
-- Fix pkgconfig file (#204232 & dupe #204236).
-
-* Mon Jul 24 2006 Matthias Saou <http://freshrpms.net/> 1.5-5
-- FC6 rebuild.
-- Enable JS_THREADSAFE in the build (#199696), add patch and nspr build req.
-
-* Mon Mar 6 2006 Matthias Saou <http://freshrpms.net/> 1.5-4
-- FC5 rebuild.
-
-* Thu Feb 9 2006 Matthias Saou <http://freshrpms.net/> 1.5-3
-- Rebuild for new gcc/glibc.
-
-* Mon Jan 30 2006 Matthias Saou <http://freshrpms.net/> 1.5-2
-- Fix .pc file.
-
-* Thu Jan 26 2006 Matthias Saou <http://freshrpms.net/> 1.5-1
-- Update to 1.5.0 final.
-- Spec file cleanups.
-- Move docs from devel to main, since we need the license there.
-- Remove no longer needed js-perlconnect.patch.
-- Update js-1.5-va_copy.patch.
-- Include a pkgconfig file (#178993).
-
-* Tue Apr 19 2005 Ville Skytt <ville.skytta at iki.fi> - 1.5-0.rc6a.6
-- Link shared lib with libperl.
-
-* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* Mon Feb 14 2005 David Woodhouse <dwmw2(a)infradead.org> - 1.5-0.rc6a.4
-- Take js-va_copy.patch out of %%ifarch x86_64 so it fixes the PPC build too
-
-* Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 1.5-0.rc6a.3
-- Add js-va_copy.patch to fix x86_64; Patch was found in a Mandrake srpm
-
-* Sat Dec 11 2004 Ville Skytt <ville.skytta at iki.fi> - 1.5-0.rc6a.2
-- Include perlconnect.
-- Include readline support, rebuild using "--without readline" to disable.
-- Add libjs* provides for upstream compatibility.
-- Install header files in %%{_includedir} instead of %%{_includedir}/js.
-
-* Tue Jun 15 2004 Matthias Saou <http://freshrpms.net> 1.5-0.rc6a
-- Update to 1.5rc6a.
-
-* Tue Mar 02 2004 Dag Wieers <dag(a)wieers.com> - 1.5-0.rc6
-- Initial package. (using DAR)
-
diff --git a/js185-arm-nosoftfp.patch b/js185-arm-nosoftfp.patch
deleted file mode 100644
index e971a48..0000000
--- a/js185-arm-nosoftfp.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -r -U 2 -p a/js/src/configure b/js/src/configure
---- a/js/src/configure 2011-10-14 18:27:00.000000000 -0400
-+++ b/js/src/configure 2011-10-14 18:37:07.264794994 -0400
-@@ -10741,5 +10741,5 @@ _SAVE_CFLAGS="$CFLAGS"
- if test "$GNU_CC"; then
- # gcc needs -mfpu=neon to recognize NEON instructions
-- CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
-+ CFLAGS="$CFLAGS -mfpu=neon"
- fi
- cat > conftest.$ac_ext <<EOF
-@@ -13407,7 +13407,7 @@ EOF
- EOF
-
-- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+ CFLAGS="$CFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
-+ CXXFLAGS="$CXXFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
-+ ASFLAGS="$ASFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
- else
- { echo "configure: error: --enable-thumb2 is not supported for non-GNU toolchains" 1>&2; exit 1; }
-@@ -13426,7 +13426,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
- EOF
-
-- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+ CFLAGS="$CFLAGS $MOZ_ARM_VFP_FLAGS"
-+ CXXFLAGS="$CXXFLAGS $MOZ_ARM_VFP_FLAGS"
-+ ASFLAGS="$ASFLAGS $MOZ_ARM_VFP_FLAGS"
- else
- { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-GNU toolchains" 1>&2; exit 1; }
-diff -r -U 2 -p a/js/src/configure.in b/js/src/configure.in
---- a/js/src/configure.in 2011-03-31 15:08:36.000000000 -0400
-+++ b/js/src/configure.in 2011-10-14 18:37:40.496180956 -0400
-@@ -3551,5 +3551,5 @@ _SAVE_CFLAGS="$CFLAGS"
- if test "$GNU_CC"; then
- # gcc needs -mfpu=neon to recognize NEON instructions
-- CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
-+ CFLAGS="$CFLAGS -mfpu=neon"
- fi
- AC_TRY_COMPILE([],
-@@ -4688,7 +4688,7 @@ if test -n "$MOZ_THUMB2"; then
- AC_DEFINE(MOZ_THUMB2)
- AC_DEFINE(MOZ_ARM_ARCH)
-- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+ CFLAGS="$CFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
-+ CXXFLAGS="$CXXFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
-+ ASFLAGS="$ASFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
- else
- AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
-@@ -4704,7 +4704,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
- if test "$GNU_CC"; then
- AC_DEFINE(MOZ_ARM_ARCH)
-- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+ CFLAGS="$CFLAGS $MOZ_ARM_VFP_FLAGS"
-+ CXXFLAGS="$CXXFLAGS $MOZ_ARM_VFP_FLAGS"
-+ ASFLAGS="$ASFLAGS $MOZ_ARM_VFP_FLAGS"
- else
- AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
diff --git a/js185-destdir.patch b/js185-destdir.patch
deleted file mode 100644
index e28baed..0000000
--- a/js185-destdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# See discussion in https://bugzilla.mozilla.org/show_bug.cgi?id=628723
-# Patch created by Colin Walters <walters(a)verbum.org>
-
---- js/src/Makefile.in.orig 2011-06-15 19:40:27.447770306 -0400
-+++ js/src/Makefile.in 2011-06-15 19:40:57.013770299 -0400
-@@ -888,8 +888,8 @@
- ifeq (,$(HOST_BIN_SUFFIX))
- mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
-- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
-- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
-+ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
-+ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
- endif
- endif
- ifneq (,$(IMPORT_LIBRARY))
diff --git a/js185-libedit.patch b/js185-libedit.patch
deleted file mode 100644
index 195bdae..0000000
--- a/js185-libedit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- js-1.8.5/js/src/configure.in 2011-03-31 22:08:36.000000000 +0300
-+++ js-1.8.5/js/src/configure.in~ 2012-11-10 17:59:02.222497367 +0200
-@@ -5615,8 +5615,8 @@ esac
-
- if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then
- if test -n "$JS_WANT_READLINE"; then
-- AC_CHECK_LIB(readline, readline,
-- EDITLINE_LIBS="-lreadline",
-+ AC_CHECK_LIB(edit, readline,
-+ EDITLINE_LIBS="$(pkg-config --libs libedit)",
- AC_MSG_ERROR([No system readline library found.]))
- else
- dnl By default, we use editline
diff --git a/mozjs1.8.5-tag.patch b/mozjs1.8.5-tag.patch
deleted file mode 100644
index f4fd188..0000000
--- a/mozjs1.8.5-tag.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up js-1.8.5/js/src/jsval.h.tag js-1.8.5/js/src/jsval.h
---- js-1.8.5/js/src/jsval.h.tag 2017-03-10 16:27:06.000000000 +0100
-+++ js-1.8.5/js/src/jsval.h 2017-03-10 16:30:39.000000000 +0100
-@@ -66,7 +66,7 @@ JS_BEGIN_EXTERN_C
- #endif
-
- #if JS_BITS_PER_WORD == 64
--# define JSVAL_TAG_SHIFT 47
-+# define JSVAL_TAG_SHIFT 48
- #endif
-
- /*
-@@ -135,7 +135,8 @@ JS_STATIC_ASSERT(sizeof(JSValueTag) == 4
- /* Remember to propagate changes to the C defines below. */
- JS_ENUM_HEADER(JSValueTag, uint32)
- {
-- JSVAL_TAG_MAX_DOUBLE = 0x1FFF0,
-+ JSVAL_TAG_DUMMY = 0xFFFFFFFF, /* Make sure the enums cannot fit 16-bits. */
-+ JSVAL_TAG_MAX_DOUBLE = 0xFFF8,
- JSVAL_TAG_INT32 = JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_INT32,
- JSVAL_TAG_UNDEFINED = JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_UNDEFINED,
- JSVAL_TAG_STRING = JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_STRING,
-@@ -196,7 +197,7 @@ typedef uint32 JSValueTag;
- #elif JS_BITS_PER_WORD == 64
-
- typedef uint32 JSValueTag;
--#define JSVAL_TAG_MAX_DOUBLE ((uint32)(0x1FFF0))
-+#define JSVAL_TAG_MAX_DOUBLE ((uint32)(0xFFF8))
- #define JSVAL_TAG_INT32 (uint32)(JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_INT32)
- #define JSVAL_TAG_UNDEFINED (uint32)(JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_UNDEFINED)
- #define JSVAL_TAG_STRING (uint32)(JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_STRING)
-@@ -236,8 +237,8 @@ typedef uint64 JSValueShiftedTag;
-
- #elif JS_BITS_PER_WORD == 64
-
--#define JSVAL_PAYLOAD_MASK 0x00007FFFFFFFFFFFLL
--#define JSVAL_TAG_MASK 0xFFFF800000000000LL
-+#define JSVAL_PAYLOAD_MASK 0x0000FFFFFFFFFFFFLL
-+#define JSVAL_TAG_MASK 0xFFFF000000000000LL
- #define JSVAL_TYPE_TO_TAG(type) ((JSValueTag)(JSVAL_TAG_MAX_DOUBLE | (type)))
- #define JSVAL_TYPE_TO_SHIFTED_TAG(type) (((uint64)JSVAL_TYPE_TO_TAG(type)) << JSVAL_TAG_SHIFT)
-
-@@ -297,8 +298,8 @@ typedef union jsval_layout
- #if (!defined(_WIN64) && defined(__cplusplus))
- /* MSVC does not pack these correctly :-( */
- struct {
-- uint64 payload47 : 47;
-- JSValueTag tag : 17;
-+ uint64 payload48 : 48;
-+ JSValueTag tag : 16;
- } debugView;
- #endif
- struct {
-@@ -339,8 +340,8 @@ typedef union jsval_layout
- {
- uint64 asBits;
- struct {
-- JSValueTag tag : 17;
-- uint64 payload47 : 47;
-+ JSValueTag tag : 16;
-+ uint64 payload48 : 48;
- } debugView;
- struct {
- uint32 padding;
-diff -up js-1.8.5/js/src/jsvalue.h.tag js-1.8.5/js/src/jsvalue.h
---- js-1.8.5/js/src/jsvalue.h.tag 2017-03-10 16:27:06.000000000 +0100
-+++ js-1.8.5/js/src/jsvalue.h 2017-03-10 16:27:06.000000000 +0100
-@@ -255,7 +255,7 @@ JSVAL_SAME_TYPE_IMPL(jsval_layout lhs, j
- {
- uint64 lbits = lhs.asBits, rbits = rhs.asBits;
- return (lbits <= JSVAL_TAG_MAX_DOUBLE && rbits <= JSVAL_TAG_MAX_DOUBLE) ||
-- (((lbits ^ rbits) & 0xFFFF800000000000LL) == 0);
-+ (((lbits ^ rbits) & 0xFFFF000000000000LL) == 0);
- }
-
- static JS_ALWAYS_INLINE jsval_layout
-@@ -277,7 +277,7 @@ JSVAL_TO_PRIVATE_UINT32_IMPL(jsval_layou
- static JS_ALWAYS_INLINE JSValueType
- JSVAL_EXTRACT_NON_DOUBLE_TYPE_IMPL(jsval_layout l)
- {
-- uint64 type = (l.asBits >> JSVAL_TAG_SHIFT) & 0xF;
-+ uint64 type = (l.asBits >> JSVAL_TAG_SHIFT) & 0x7;
- JS_ASSERT(type > JSVAL_TYPE_DOUBLE);
- return (JSValueType)type;
- }
-diff -up js-1.8.5/js/src/methodjit/MethodJIT.cpp.tag js-1.8.5/js/src/methodjit/MethodJIT.cpp
---- js-1.8.5/js/src/methodjit/MethodJIT.cpp.tag 2011-03-31 21:08:36.000000000 +0200
-+++ js-1.8.5/js/src/methodjit/MethodJIT.cpp 2017-03-10 16:27:06.000000000 +0100
-@@ -186,8 +186,8 @@ JS_STATIC_ASSERT(sizeof(VMFrame) % 16 ==
- JS_STATIC_ASSERT(offsetof(VMFrame, savedRBX) == 0x58);
- JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38);
-
--JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF800000000000LL);
--JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x00007FFFFFFFFFFFLL);
-+JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF000000000000LL);
-+JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x0000FFFFFFFFFFFFLL);
-
- asm volatile (
- ".text\n"
diff --git a/ppc64le.patch b/ppc64le.patch
deleted file mode 100644
index 129997e..0000000
--- a/ppc64le.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naur js-1.8.5.orig/js/src/assembler/wtf/Platform.h js-1.8.5/js/src/assembler/wtf/Platform.h
---- js-1.8.5.orig/js/src/assembler/wtf/Platform.h
-+++ js-1.8.5/js/src/assembler/wtf/Platform.h
-@@ -129,16 +129,22 @@
- || defined(__POWERPC__) \
- || defined(_M_PPC) \
- || defined(__PPC)
-+#if !defined(__ppc64__) && !defined(__PPC64__)
- #define WTF_CPU_PPC 1
-+#endif
-+#if !defined(__LITTLE_ENDIAN__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
-+#endif
-
- /* CPU(PPC64) - PowerPC 64-bit */
- #if defined(__ppc64__) \
- || defined(__PPC64__)
- #define WTF_CPU_PPC64 1
-+#if !defined(__LITTLE_ENDIAN__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
-+#endif
-
- /* CPU(SH4) - SuperH SH-4 */
- #if defined(__SH4__)
-diff -Naur js-1.8.5.orig/js/src/configure.in js-1.8.5/js/src/configure.in
---- js-1.8.5.orig/js/src/configure.in
-+++ js-1.8.5/js/src/configure.in
-@@ -1498,7 +1498,7 @@
- CPU_ARCH=x86
- ;;
-
--powerpc64 | ppc64)
-+powerpc64 | ppc64 | powerpc64le | ppc64le)
- CPU_ARCH=ppc64
- ;;
-
-diff -Naur js-1.8.5/js/src/Makefile.in.ori js-1.8.5/js/src/Makefile.in
---- js-1.8.5/js/src/Makefile.in.ori
-+++ js-1.8.5/js/src/Makefile.in
-@@ -382,7 +382,7 @@ CPPSRCS += checks.cc \
- # END enclude sources for V8 dtoa
- #############################################
-
--ifeq (,$(filter-out aarch64 powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU)))
-+ifeq (,$(filter-out aarch64 powerpc powerpc64 powerpc64le sparc sparc64 s390 s390x,$(TARGET_CPU)))
-
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
diff --git a/sources b/sources
deleted file mode 100644
index 7927220..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-a4574365938222adca0a6bd33329cb32 js185-1.0.0.tar.gz
-4676f1699cbcfbde4087ff8fd337ccfc js185-destdir.patch
4 years, 10 months
Architecture specific change in rpms/fwts.git
by githook-noreply@fedoraproject.org
The package rpms/fwts.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/fwts.git/commit/?id=4cdb15c21063d....
Change:
+ExclusiveArch: x86_64 %{arm} aarch64 s390x %{power64}
Thanks.
Full change:
============
commit 4cdb15c21063dbb3057ecf30c97b7b5deb7d7847
Author: Benjamin Berg <bberg(a)redhat.com>
Date: Thu Aug 8 16:16:41 2019 +0200
Drop i686 support as it requires an i686 kernel build (#1735231)
diff --git a/fwts.spec b/fwts.spec
index 939ded5..286d187 100644
--- a/fwts.spec
+++ b/fwts.spec
@@ -2,7 +2,7 @@ Summary: Firmware Test Suite
Name: fwts
Version: 19.02.00
-Release: 2%{?dist}
+Release: 3%{?dist}
# Asked upstream for inclusion of full license texts:
# https://bugs.launchpad.net/bugs/1712604
# The ACPICA code is licensed under both GPLv2 and Intel ACPI, a few
@@ -17,7 +17,7 @@ Patch2: 0002-fwts-test-sync-up-output-to-new-IASL-output-defaults.patch
BuildRequires: acpica-tools glib-devel glib2-devel glib json-c-devel libtool automake autoconf dkms kernel-devel git bison flex
BuildRequires: libbsd-devel
# The tests in this package only make sense on the below architectures.
-ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x %{power64}
+ExclusiveArch: x86_64 %{arm} aarch64 s390x %{power64}
%description
Firmware Test Suite (FWTS) is a test suite that performs sanity checks on
@@ -56,6 +56,9 @@ make check
%doc debian/copyright
%changelog
+* Thu Aug 08 2019 Benjamin Berg <bberg(a)redhat.com> - 19.02.00-3
+- Drop i686 support as it requires an i686 kernel build (#1735231)
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 19.02.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 10 months
Architecture specific change in rpms/iwyu.git
by githook-noreply@fedoraproject.org
The package rpms/iwyu.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/iwyu.git/commit/?id=d1b9a4c378e55....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit d1b9a4c378e557e91c7363b6900ad32ca84fb9df
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:55:20 2019 +0000
iwyu fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675163
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7ec4b9a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/include-what-you-use-3.4.src.tar.gz
-/include-what-you-use-3.5.src.tar.gz
-/include-what-you-use-0.4.src.tar.gz
-/include-what-you-use-98f3e62d371ae602061951115efc3b75ff255824.tar.gz
-/include-what-you-use-e1fc7722673fd665c105d0aaed1dab1aeefce8c1.tar.gz
-/include-what-you-use-f09b88aaa0b7bb88a7b36da2ba1cab233659df6e.tar.gz
-/include-what-you-use-136736fca90ad10e20b2ef728f0d52286e93ca46.tar.gz
-/iwyu-23253ec.tar.gz
-/include-what-you-use-953970c487b004050d44925bfcc5133be9fa0d7f.tar.gz
-/include-what-you-use-c6c4520c0b0a0ad2ba22218ef2aa3f0b81ecbc6f.tar.gz
-/include-what-you-use-576e80f7f37ce2daa59120c40f38735b3fbc7422.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..9ca25d5
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+iwyu fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675163
diff --git a/iwyu.spec b/iwyu.spec
deleted file mode 100644
index 20b0717..0000000
--- a/iwyu.spec
+++ /dev/null
@@ -1,158 +0,0 @@
-%global longname include-what-you-use
-%global owner %{longname}
-%global commit 576e80f7f37ce2daa59120c40f38735b3fbc7422
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name: iwyu
-Version: 0.9
-Release: 0.5.20171001git%{shortcommit}%{?dist}
-Summary: C/C++ source files #include analyzer based on clang
-
-License: NCSA
-URL: https://github.com/%{owner}/%{longname}
-Source0: https://github.com/%{owner}/%{longname}/archive/%{commit}.tar.gz#/%{longn...
-
-BuildRequires: cmake
-BuildRequires: clang-devel >= 4.0
-# NOTE: This should probably listed as a dependency for clang-devel but it's
-# not, so make it explicit here
-BuildRequires: llvm-devel
-# Some of the Clang libraries are only available statically and the use of the
-# static library was approved (see https://fedorahosted.org/fesco/ticket/1370 )
-BuildRequires: llvm-static
-BuildRequires: zlib-devel
-# Scripts are Python 2
-BuildRequires: python2-devel
-BuildRequires: ncurses-devel
-
-# Virtual provide the long name
-Provides: include-what-you-use = %{version}-%{release}
-Provides: include-what-you-use%{?_isa} = %{version}-%{release}
-
-# It isn't building on ARM, so just exclude it for now (see https://bugzilla.redhat.com/show_bug.cgi?id=1192713 )
-# Also, the tests use x86 assembly right now (see https://groups.google.com/forum/#!topic/include-what-you-use/lEuN5tr-0y0 )
-ExclusiveArch: %{ix86} x86_64
-
-
-%description
-"Include what you use" means this: for every symbol (type, function, variable,
-or macro) that you use in foo.cc (or foo.cpp), either foo.cc or foo.h
-should #include a .h file that exports the declaration of that symbol. The
-include-what-you-use tool is a program that can be built with the clang
-libraries in order to analyze #includes of source files to find
-include-what-you-use violations, and suggest fixes for them.
-
-
-%prep
-%autosetup -n %{longname}-%{commit}
-
-
-%build
-mkdir build
-cd build
-# NOTE: Have to specify both lib and include dir for it to work
-%cmake -DIWYU_LLVM_LIB_PATH=%{_libdir}/llvm -DIWYU_LLVM_INCLUDE_PATH=%{_includedir} ..
-%make_build
-
-
-%install
-%make_install -C build
-cd %{buildroot}%{_bindir}
-ln -s include-what-you-use iwyu
-ln -s fix_includes.py fix_includes
-ln -s iwyu_tool.py iwyu_tool
-
-
-%check
-# Need to have the clang header's at the correct relative path (see https://github.com/include-what-you-use/include-what-you-use/issues/100 )
-ln -s %{_libdir} %{_lib}
-cd build
-PATH=$PWD:$PATH
-ln -s ../fix_includes.py
-ln -s ../fix_includes_test.py
-ln -s ../iwyu_test_util.py
-ln -s ../run_iwyu_tests.py
-ln -s ../tests
-%{__python2} run_iwyu_tests.py
-%{__python2} fix_includes_test.py
-
-
-%files
-%{_bindir}/include-what-you-use
-%{_bindir}/iwyu
-%{_bindir}/fix_includes
-%{_bindir}/fix_includes.py
-%{_bindir}/iwyu_tool
-%{_bindir}/iwyu_tool.py
-%dir %{_datadir}/include-what-you-use
-%{_datadir}/include-what-you-use/*.imp
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9-0.5.20171001git576e80f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9-0.4.20171001git576e80f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9-0.3.20171001git576e80f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9-0.2.20171001git576e80f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Oct 04 2017 Tom Stellard <tstellar(a)redhat.com> - 0.9-0.1.20171001git576e80f
-- Update to git snapshot that works with LLVM 5
-
-* Wed Aug 02 2017 Dave Johansen <davejohansen(a)gmail.com> - 0.8-4
-- Official 0.8/LLVM 4.0 release
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sun Jul 02 2017 Dave Johansen <davejohansen(a)gmail.com> - 0.8-1
-- Use 0.8 to work with LLVM 4.0
-
-* Thu Mar 30 2017 Tom Stellard <tstellar(a)redhat.com> - 0.7-3.20130330git.23253ec
-- Update to git snapshot that works with LLVM4
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 05 2016 Dave Johansen <davejohansen(a)gmail.com> - 0.7-1
-- Upstream release
-
-* Thu May 12 2016 Dave Johansen <davejohansen(a)gmail.com> - 0.6-1
-- Upstream release
-
-* Wed Feb 24 2016 Dave Johansen <davejohansen(a)gmail.com> - 0.6-0.2
-- Remove use of rand() in badinc test
-
-* Wed Feb 24 2016 Dave Johansen <davejohansen(a)gmail.com> - 0.6-0.1
-- Test build against 3.8
-
-* Thu Feb 04 2016 Dave Johansen <davejohansen(a)gmail.com> - 0.5-3
-- Changes for new llvm cmake build system
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Sep 30 2015 Dave Johansen <davejohansen(a)gmail.com> - 0.5-1
-- Upstream release
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Jun 04 2015 Dave Johansen <davejohansen(a)gmail.com> - 0.4-2
-- Added iwyu_tool
-
-* Mon Jun 01 2015 Dave Johansen <davejohansen(a)gmail.com> - 0.4-1
-- Update to 0.4 based on clang 3.6.0
-
-* Tue Jan 27 2015 Dave Johansen <davejohansen(a)gmail.com> - 0.3-1
-- Update to 0.3 based on clang 3.5.0
-
-* Fri Apr 25 2014 Dave Johansen <davejohansen(a)gmail.com> - 0.2-1
-- Initial RPM release
diff --git a/sources b/sources
deleted file mode 100644
index f0ba466..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (include-what-you-use-576e80f7f37ce2daa59120c40f38735b3fbc7422.tar.gz) = 254f3f98aa40f2d7107d5cf06e6b783e8295d4c4b91751fcf0c998b16b1a330119b2c3e2d232e4c9083029b2c4ec5297c9ea0074e52726346385fb15f31c0e28
4 years, 10 months
Architecture specific change in rpms/hop.git
by githook-noreply@fedoraproject.org
The package rpms/hop.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/hop.git/commit/?id=e59ed9334b2f2e....
Change:
-ExcludeArch: ppc64
Thanks.
Full change:
============
commit e59ed9334b2f2ed9f3c83d7b6937abe6a33623a0
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:52:46 2019 +0000
hop fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675110
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 5c6e817..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/hop-*.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..b55fb26
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+hop fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675110
diff --git a/hop.spec b/hop.spec
deleted file mode 100644
index aca4160..0000000
--- a/hop.spec
+++ /dev/null
@@ -1,220 +0,0 @@
-# find-debuginfo.sh cannot find Scheme source files
-%global debug_package %{nil}
-
-%global prerel pre2.git20180515
-%global fullver %{version}%{?prerel:-%{prerel}}
-
-Name: hop
-Version: 3.1.0
-Release: %{?prerel:0.}2%{?prerel:.%{prerel}}%{?dist}.3
-Summary: A web development kit
-
-License: GPLv2+
-URL: http://hop.inria.fr/
-# The latest hop release does not build with the current version of bigloo.
-# Until a new hop release is made, we build from git, as follows:
-# 1. git clone https://github.com/manuel-serrano/hop
-# 2. cd hop
-# 3. git reset --hard 3c8be186cb537b1bb6536500ea88856c7d687bf8
-# 4. rm -fr .git* .hg*
-# 5. cd ..
-# 6. mv hop hop-%%{fullver}
-# 7. tar czf hop-%%{fullver}.tar.gz
-Source0: %{name}-%{fullver}.tar.gz
-#Source0: ftp://ftp-sop.inria.fr/indes/fp/Hop/%%{name}-%%{fullver}.tar.gz
-
-# Bigloo is not available on ppc64
-ExcludeArch: ppc64
-
-BuildRequires: bigloo >= 4.3a
-BuildRequires: avahi-devel
-# The emacs version of etags is required
-BuildRequires: emacs-common
-BuildRequires: mailcap
-BuildRequires: openssl-devel
-BuildRequires: pcre-devel
-BuildRequires: sqlite-devel
-
-%description
-Hop is a new programming language designed for the Web 2.0. It is a
-higher-order language for programming interactive web applications
-such as web agendas, web galleries, music players, etc. Hop can be
-viewed as a replacement for traditional graphical toolkits. HOP is
-implemented as a Web broker, i.e., a Web server that may act
-indifferently as a regular Web server or Web proxy.
-
-HOP features:
-
- * an extensive set of widgets for programming fancy GUIs.
- * an extensive set of libraries for:
- o handling database accesses.
- o dealing with network connections.
- o parsing wiki documents.
- o supporting various protocols such as IMAP, ICALENDAR, ...
- o supporting various formats such as EXIF, ID3, ...
- o parsing and generating XML documents.
- o ...
-
-
-%prep
-%setup -q -n %{name}-%{fullver}
-
-# fix encodings
-for fil in share/aes.js share/sha1.js \
- weblets/home/articles/hop-lang/article.html \
- weblets/home/articles/hop-multimedia/article.html \
- weblets/home/articles/hop-perfs/article.html; do
- iconv -f ISO-8859-1 -t UTF-8 $fil > $fil.utf8
- touch -r $fil $fil.utf8
- mv -f $fil.utf8 $fil
-done
-
-
-%build
-# optflags inherited from Bigloo
-./configure \
- --prefix=%{_prefix} \
- --libdir=%{_libdir} \
- --mandir=%{_mandir} \
- --etcdir=%{_sysconfdir}
-# Use of %%{?_smp_mflags} sometimes fails
-make
-
-# We need to rebuild the .swf files with haxe, something like this:
-# pushd share/flash
-# for fil in HopAudio HopServevt HopVideo JavaScriptFlashGateway; do
-# haxe -swf $fil.swf -main $fil -cp %%{_datadir}/haxe/std
-# done
-# popd
-
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT
-# remove
-# mark sofiles executable so they are detected by find-debuginfo.sh
-# http://fedoraproject.org/wiki/Packaging:Debuginfo#Useless_or_incomplete_d...
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/hop/*/*.so.*
-# remove static archives
-rm $RPM_BUILD_ROOT%{_libdir}/hop/*/*.a
-
-# manually strip binaries and libraries, since find-debuginfo.sh is not run
-strip $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libdir}/hop/*/lib*.so.* \
- $RPM_BUILD_ROOT%{_libdir}/hop/*/node_modules/*/lib/.libs/*/*/*/*.so.* \
- $RPM_BUILD_ROOT%{_libdir}/hop/*/node_modules/*/lib/o/*.so.*
-
-# fix permissions
-chmod 0644 \
- $RPM_BUILD_ROOT%{_datadir}/hop/site-lisp/hopjs.el \
- $RPM_BUILD_ROOT%{_libdir}/hop/*/node_modules/*/package.json \
- $RPM_BUILD_ROOT%{_libdir}/hop/*/node_modules/*/doc/*.md \
- $RPM_BUILD_ROOT%{_libdir}/hop/*/node_modules/*/hss/*.hss \
- $RPM_BUILD_ROOT%{_libdir}/hop/*/node_modules/*/lib/{.afile,Makefile} \
- $RPM_BUILD_ROOT%{_libdir}/hop/*/node_modules/*/lib/*.{hop,js,sch}
-
-# Add to the documentation
-cp -p README $RPM_BUILD_ROOT%{_docdir}/%{name}
-
-
-%files
-%license LICENSE
-%{_docdir}/%{name}/
-%{_bindir}/hop*
-%{_libdir}/hop/
-%{_datadir}/hop/
-%{_mandir}/man1/hop*.1*
-%config(noreplace) %{_sysconfdir}/hop*rc.hop
-
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.0-0.2.pre2.git20180515.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.0-0.2.pre2.git20180515.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.0-0.2.pre2.git20180515.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sat Jun 16 2018 Jerry James <loganjerry(a)gmail.com> - 3.1.0-0.2.pre2.git20180515
-- Update to latest git snapshot for bigloo 4.3b
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.0-0.1.pre2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sat Aug 19 2017 Jerry James <loganjerry(a)gmail.com> - 3.1.0-0.1.pre2
-- Update to 3.1.0-pre2 for bigloo 4.3a
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.0-0.1.rc9.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.0-0.1.rc9.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.0-0.1.rc9.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.0-0.1.rc9.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Dec 23 2015 Jerry James <loganjerry(a)gmail.com> - 3.0.0-0.1.rc9
-- Update to 3.0.0-rc9 for bigloo 4.2c
-- Drop obsoletes for long dead versions of Fedora
-
-* Wed Oct 28 2015 Jerry James <loganjerry(a)gmail.com> - 3.0.0-0.1.rc4
-- Update to 3.0.0-rc4 for bigloo 4.2b (bz 966006)
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.5.0-1.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Sep 04 2014 Pdraig Brady <pbrady(a)redhat.com> - 2.5.0-1.3
-- rebuild for libunistring soname bump
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.5.0-1.2
-- 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.5.0-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Mar 4 2014 Jerry James <loganjerry(a)gmail.com> - 2.5.0-1
-- Update to 2.5.0
-
-* Thu Feb 20 2014 Jerry James <loganjerry(a)gmail.com> - 2.4.2-1
-- Update to 2.4.2
-
-* Fri Aug 2 2013 Jerry James <loganjerry(a)gmail.com> - 2.4.1-2
-- Rebuild for Bigloo 4.0b
-
-* Fri Jun 14 2013 Michel Salim <salimma(a)fedoraproject.org> - 2.4.1-1
-- Update to 2.4.1
-
-* Mon Feb 18 2013 Jerry James <loganjerry(a)gmail.com> - 2.4.0-1
-- Update to final 2.4.0 release
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4.0-0.3.rc4.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Nov 19 2012 Michel Salim <salimma(a)fedoraproject.org> - 2.4.0-0.3.rc4
-- Update to 2.4.0-rc4
-
-* Thu Oct 25 2012 Michel Salim <salimma(a)fedoraproject.org> - 2.4.0-0.2.rc3
-- Update to 2.4.0-rc3
-
-* Thu Oct 25 2012 Michel Salim <salimma(a)fedoraproject.org> - 2.4.0-0.1.rc2
-- Update to 2.4.0-rc2
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jul 3 2012 Michel Salim <salimma(a)fedoraproject.org> - 2.3.0-2
-- Rebuild for Bigloo 3.8c
-
-* Thu May 3 2012 Michel Salim <salimma(a)fedoraproject.org> - 2.3.0-1
-- Update to final 2.3.0 release
-- ExcludeArch ppc64, matching Bigloo
-- Add BR on sqlite-devel
-- %%prep: Explicitly specify encoding conversion target
-- no longer redundantly clean buildroot in %%install
-- Disable debuginfo generation for now
-
-* Sat Apr 7 2012 Michel Salim <salimma(a)fedoraproject.org> - 2.3.0-0.rc2.1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index d26f391..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (hop-3.1.0-pre2.git20180515.tar.gz) = d056d340b4ae05b2abee6b90f97480fb46a7853d365b96e555cbae04df49e920f4034b09836134d209610bd282d81bc8c893adaf005e001cdac45d57874e6fb6
4 years, 10 months
Architecture specific change in rpms/hadoop.git
by githook-noreply@fedoraproject.org
The package rpms/hadoop.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/hadoop.git/commit/?id=ab640cf8c93....
Change:
-%ifarch s390x ppc64le
Thanks.
Full change:
============
commit ab640cf8c93d60016a8846c19840a5c121fb7c73
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:51:42 2019 +0000
hadoop fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675096
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 9b4440d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/tarballs/
-/clog
-/hadoop-2.7.6-src.tar.gz
diff --git a/backport-CVE-2018-8009.patch b/backport-CVE-2018-8009.patch
deleted file mode 100644
index 8591912..0000000
--- a/backport-CVE-2018-8009.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-commit 45a1c680c276c4501402f7bc4cebcf85a6fbc7f5
-Author: Akira Ajisaka <aajisaka(a)apache.org>
-Date: Wed May 23 17:21:46 2018 +0900
-
- Additional check when unpacking archives. Contributed by Jason Lowe and Akira Ajisaka.
-
-diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
-index 23fb9462449..00381fee278 100644
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
-@@ -587,16 +587,21 @@ public static long getDU(File dir) {
- public static void unZip(File inFile, File unzipDir) throws IOException {
- Enumeration<? extends ZipEntry> entries;
- ZipFile zipFile = new ZipFile(inFile);
-+ String targetDirPath = unzipDir.getCanonicalPath() + File.separator;
-
- try {
- entries = zipFile.entries();
- while (entries.hasMoreElements()) {
- ZipEntry entry = entries.nextElement();
- if (!entry.isDirectory()) {
-+ File file = new File(unzipDir, entry.getName());
-+ if (!file.getCanonicalPath().startsWith(targetDirPath)) {
-+ throw new IOException("expanding " + entry.getName()
-+ + " would create file outside of " + unzipDir);
-+ }
- InputStream in = zipFile.getInputStream(entry);
- try {
-- File file = new File(unzipDir, entry.getName());
-- if (!file.getParentFile().mkdirs()) {
-+ if (!file.getParentFile().mkdirs()) {
- if (!file.getParentFile().isDirectory()) {
- throw new IOException("Mkdirs failed to create " +
- file.getParentFile().toString());
-@@ -705,6 +710,13 @@ private static void unTarUsingJava(File inFile, File untarDir,
-
- private static void unpackEntries(TarArchiveInputStream tis,
- TarArchiveEntry entry, File outputDir) throws IOException {
-+ String targetDirPath = outputDir.getCanonicalPath() + File.separator;
-+ File outputFile = new File(outputDir, entry.getName());
-+ if (!outputFile.getCanonicalPath().startsWith(targetDirPath)) {
-+ throw new IOException("expanding " + entry.getName()
-+ + " would create entry outside of " + outputDir);
-+ }
-+
- if (entry.isDirectory()) {
- File subDir = new File(outputDir, entry.getName());
- if (!subDir.mkdirs() && !subDir.isDirectory()) {
-@@ -719,7 +731,6 @@ private static void unpackEntries(TarArchiveInputStream tis,
- return;
- }
-
-- File outputFile = new File(outputDir, entry.getName());
- if (!outputFile.getParentFile().exists()) {
- if (!outputFile.getParentFile().mkdirs()) {
- throw new IOException("Mkdirs failed to create tar internal dir "
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
-index 41794b85314..7712535c669 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
-@@ -25,8 +25,9 @@
- import java.io.FileReader;
- import java.io.IOException;
- import java.io.OutputStream;
--import java.net.URI;
- import java.io.PrintWriter;
-+import java.net.URI;
-+import java.nio.charset.StandardCharsets;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Collections;
-@@ -40,6 +41,7 @@
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.apache.hadoop.conf.Configuration;
-+import org.apache.hadoop.test.GenericTestUtils;
- import org.apache.hadoop.util.Shell;
- import org.apache.hadoop.util.StringUtils;
- import org.apache.tools.tar.TarEntry;
-@@ -708,10 +710,8 @@ public void testCreateLocalTempFile() throws IOException {
-
- @Test (timeout = 30000)
- public void testUnZip() throws IOException {
-- // make sa simple zip
- setupDirs();
--
-- // make a simple tar:
-+ // make a simple zip
- final File simpleZip = new File(del, FILE);
- OutputStream os = new FileOutputStream(simpleZip);
- ZipOutputStream tos = new ZipOutputStream(os);
-@@ -728,7 +728,7 @@ public void testUnZip() throws IOException {
- tos.close();
- }
-
-- // successfully untar it into an existing dir:
-+ // successfully unzip it into an existing dir:
- FileUtil.unZip(simpleZip, tmp);
- // check result:
- assertTrue(new File(tmp, "foo").exists());
-@@ -743,8 +743,36 @@ public void testUnZip() throws IOException {
- } catch (IOException ioe) {
- // okay
- }
-- }
--
-+ }
-+
-+ @Test (timeout = 30000)
-+ public void testUnZip2() throws IOException {
-+ setupDirs();
-+ // make a simple zip
-+ final File simpleZip = new File(del, FILE);
-+ OutputStream os = new FileOutputStream(simpleZip);
-+ try (ZipOutputStream tos = new ZipOutputStream(os)) {
-+ // Add an entry that contains invalid filename
-+ ZipEntry ze = new ZipEntry("../foo");
-+ byte[] data = "some-content".getBytes(StandardCharsets.UTF_8);
-+ ze.setSize(data.length);
-+ tos.putNextEntry(ze);
-+ tos.write(data);
-+ tos.closeEntry();
-+ tos.flush();
-+ tos.finish();
-+ }
-+
-+ // Unzip it into an existing dir
-+ try {
-+ FileUtil.unZip(simpleZip, tmp);
-+ Assert.fail("unZip should throw IOException.");
-+ } catch (IOException e) {
-+ GenericTestUtils.assertExceptionContains(
-+ "would create file outside of", e);
-+ }
-+ }
-+
- @Test (timeout = 30000)
- /*
- * Test method copy(FileSystem srcFS, Path src, File dst, boolean deleteSource, Configuration conf)
-commit eaa2b8035b584dfcf7c79a33484eb2dffd3fdb11
-Author: Kihwal Lee <kihwal(a)apache.org>
-Date: Tue May 29 14:47:55 2018 -0500
-
- Additional check when unpacking archives. Contributed by Wilfred Spiegelenburg.
-
-diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
-index 4b26b7611d6..a3b5b0bbd94 100644
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
-@@ -93,6 +93,7 @@ public static void unJar(File jarFile, File toDir, Pattern unpackRegex)
- throws IOException {
- JarFile jar = new JarFile(jarFile);
- try {
-+ String targetDirPath = toDir.getCanonicalPath() + File.separator;
- Enumeration<JarEntry> entries = jar.entries();
- while (entries.hasMoreElements()) {
- final JarEntry entry = entries.nextElement();
-@@ -102,6 +103,10 @@ public static void unJar(File jarFile, File toDir, Pattern unpackRegex)
- try {
- File file = new File(toDir, entry.getName());
- ensureDirectory(file.getParentFile());
-+ if (!file.getCanonicalPath().startsWith(targetDirPath)) {
-+ throw new IOException("expanding " + entry.getName()
-+ + " would create file outside of " + toDir);
-+ }
- OutputStream out = new FileOutputStream(file);
- try {
- IOUtils.copyBytes(in, out, 8192);
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java
-index f592d0400a4..b2a65379eda 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java
-@@ -17,6 +17,7 @@
- */
- package org.apache.hadoop.util;
-
-+import static org.junit.Assert.fail;
- import static org.mockito.Mockito.spy;
- import static org.mockito.Mockito.when;
-
-@@ -25,6 +26,8 @@
- import java.io.FileOutputStream;
- import java.io.IOException;
- import java.io.InputStream;
-+import java.nio.charset.StandardCharsets;
-+import java.util.jar.JarEntry;
- import java.util.jar.JarOutputStream;
- import java.util.regex.Pattern;
- import java.util.zip.ZipEntry;
-@@ -32,6 +35,7 @@
- import junit.framework.TestCase;
-
- import org.apache.hadoop.fs.FileUtil;
-+import org.apache.hadoop.test.GenericTestUtils;
- import org.junit.After;
- import org.junit.Before;
- import org.junit.Test;
-@@ -169,4 +173,37 @@ private File makeClassLoaderTestJar(String... clsNames) throws IOException {
-
- return jarFile;
- }
--}
-\ No newline at end of file
-+
-+ @Test
-+ public void testUnJar2() throws IOException {
-+ // make a simple zip
-+ File jarFile = new File(TEST_ROOT_DIR, TEST_JAR_NAME);
-+ JarOutputStream jstream =
-+ new JarOutputStream(new FileOutputStream(jarFile));
-+ JarEntry je = new JarEntry("META-INF/MANIFEST.MF");
-+ byte[] data = "Manifest-Version: 1.0\nCreated-By: 1.8.0_1 (Manual)"
-+ .getBytes(StandardCharsets.UTF_8);
-+ je.setSize(data.length);
-+ jstream.putNextEntry(je);
-+ jstream.write(data);
-+ jstream.closeEntry();
-+ je = new JarEntry("../outside.path");
-+ data = "any data here".getBytes(StandardCharsets.UTF_8);
-+ je.setSize(data.length);
-+ jstream.putNextEntry(je);
-+ jstream.write(data);
-+ jstream.closeEntry();
-+ jstream.close();
-+
-+ File unjarDir = new File(TEST_ROOT_DIR, "unjar-path");
-+
-+ // Unjar everything
-+ try {
-+ RunJar.unJar(jarFile, unjarDir);
-+ fail("unJar should throw IOException.");
-+ } catch (IOException e) {
-+ GenericTestUtils.assertExceptionContains(
-+ "would create file outside of", e);
-+ }
-+ }
-+}
diff --git a/classpath.patch b/classpath.patch
deleted file mode 100644
index 43706bb..0000000
--- a/classpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
-index b82267d..9d1ad5e 100644
---- a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
-+++ b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
-@@ -40,6 +40,7 @@ for f in $HADOOP_HOME/contrib/capacity-scheduler/*.jar; do
- export HADOOP_CLASSPATH=$f
- fi
- done
-+export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/usr/share/java/netty/netty-common.jar:/usr/share/java/netty/netty-transport.jar:/usr/share/java/jctools/jctools-core.jar:/usr/share/java/netty/netty-buffer.jar
-
- # The maximum amount of heap to use, in MB. Default is 1000.
- #export HADOOP_HEAPSIZE=
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..464d165
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+hadoop fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675096
diff --git a/fix-container-executor-cmake.patch b/fix-container-executor-cmake.patch
deleted file mode 100644
index 7d5c95e..0000000
--- a/fix-container-executor-cmake.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
-index ba2eae2..76daaab 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
-@@ -57,24 +57,12 @@ include_directories(
- )
- CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
-
--add_library(container
-+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+add_executable(container-executor
-+ main/native/container-executor/impl/main.c
- main/native/container-executor/impl/configuration.c
- main/native/container-executor/impl/container-executor.c
- main/native/container-executor/impl/get_executable.c
- )
--
--add_executable(container-executor
-- main/native/container-executor/impl/main.c
--)
--target_link_libraries(container-executor
-- container
--)
- output_directory(container-executor target/usr/local/bin)
-
--add_executable(test-container-executor
-- main/native/container-executor/test/test-container-executor.c
--)
--target_link_libraries(test-container-executor
-- container ${EXTRA_LIBS}
--)
--output_directory(test-container-executor target/usr/local/bin)
diff --git a/hadoop-2.4.1-disable-doclint.patch b/hadoop-2.4.1-disable-doclint.patch
deleted file mode 100644
index adc7001..0000000
--- a/hadoop-2.4.1-disable-doclint.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nru hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-common-project/hadoop-auth/pom.xml hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/hadoop-common-project/hadoop-auth/pom.xml
---- hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-common-project/hadoop-auth/pom.xml 2015-09-10 04:55:53.847449606 +0200
-+++ hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/hadoop-common-project/hadoop-auth/pom.xml 2015-09-10 04:51:14.215139934 +0200
-@@ -153,6 +153,9 @@
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
-+ <configuration>
-+ <additionalparam>-Xdoclint:none</additionalparam>
-+ </configuration>
- <executions>
- <execution>
- <phase>package</phase>
-diff -Nru hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-hdfs-project/hadoop-hdfs/pom.xml hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/hadoop-hdfs-project/hadoop-hdfs/pom.xml
---- hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-hdfs-project/hadoop-hdfs/pom.xml 2015-09-10 04:55:57.175286681 +0200
-+++ hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/hadoop-hdfs-project/hadoop-hdfs/pom.xml 2015-09-10 04:53:49.675528855 +0200
-@@ -519,6 +519,7 @@
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>org.apache.hadoop.hdfs.protocol.proto</excludePackageNames>
-+ <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- <plugin>
-diff -Nru hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
---- hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml 2015-09-10 04:55:57.176286632 +0200
-+++ hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml 2015-09-10 04:54:17.100186189 +0200
-@@ -329,6 +329,7 @@
- <packages>*</packages>
- </group>
- </groups>
-+ <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </execution>
- </executions>
-diff -Nru hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-project/pom.xml hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/hadoop-project/pom.xml
---- hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-project/pom.xml 2015-09-10 04:55:57.177286583 +0200
-+++ hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/hadoop-project/pom.xml 2015-09-10 04:52:44.609714367 +0200
-@@ -1115,6 +1115,7 @@
- </goals>
- <configuration>
- <destDir>${project.build.directory}</destDir>
-+ <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </execution>
- </executions>
-diff -Nru hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-project-dist/pom.xml hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/hadoop-project-dist/pom.xml
---- hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-project-dist/pom.xml 2015-09-10 04:55:56.732308368 +0200
-+++ hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/hadoop-project-dist/pom.xml 2015-09-10 04:49:12.634092337 +0200
-@@ -118,6 +118,7 @@
- <charset>${maven.compile.encoding}</charset>
- <reportOutputDirectory>${project.build.directory}/site</reportOutputDirectory>
- <destDir>api</destDir>
-+ <additionalparam>-Xdoclint:none</additionalparam>
- <groups>
- <group>
- <title>${project.name} API</title>
-diff -Nru hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/pom.xml hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/pom.xml
---- hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/pom.xml 2015-09-10 04:55:56.705309690 +0200
-+++ hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.doclint/pom.xml 2015-09-10 04:48:22.464552422 +0200
-@@ -289,7 +289,7 @@
- </docletArtifact>
- </docletArtifacts>
- <useStandardDocletOptions>true</useStandardDocletOptions>
--
-+ <additionalparam>-Xdoclint:none</additionalparam>
- <!-- switch on dependency-driven aggregation -->
- <includeDependencySources>false</includeDependencySources>
-
-@@ -398,6 +398,7 @@
- </goals>
- <configuration>
- <overview>hadoop-common-project/hadoop-common/src/main/java/overview.html</overview>
-+ <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </execution>
- </executions>
diff --git a/hadoop-armhfp.patch b/hadoop-armhfp.patch
deleted file mode 100644
index f88e44a..0000000
--- a/hadoop-armhfp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-common-project/hadoop-common/src/JNIFlags.cmake.orig 2014-07-20 15:03:30.473576587 +0100
-+++ hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-common-project/hadoop-common/src/JNIFlags.cmake 2014-07-20 15:06:13.811115845 +0100
-@@ -45,22 +45,22 @@
- OUTPUT_VARIABLE JVM_ELF_ARCH
- ERROR_QUIET)
- if (NOT JVM_ELF_ARCH MATCHES "Tag_ABI_VFP_args: VFP registers")
-- message("Soft-float JVM detected")
-+ message("Hard-float JVM detected")
-
-- # Test compilation with -mfloat-abi=softfp using an arbitrary libc function
-+ # Test compilation with -mfloat-abi=hard using an arbitrary libc function
- # (typically fails with "fatal error: bits/predefs.h: No such file or directory"
-- # if soft-float dev libraries are not installed)
-+ # if hard-float dev libraries are not installed)
- include(CMakePushCheckState)
- cmake_push_check_state()
-- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -mfloat-abi=softfp")
-+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -mfloat-abi=hard")
- include(CheckSymbolExists)
-- check_symbol_exists(exit stdlib.h SOFTFP_AVAILABLE)
-- if (NOT SOFTFP_AVAILABLE)
-- message(FATAL_ERROR "Soft-float dev libraries required (e.g. 'apt-get install libc6-dev-armel' on Debian/Ubuntu)")
-- endif (NOT SOFTFP_AVAILABLE)
-+ check_symbol_exists(exit stdlib.h HARDFP_AVAILABLE)
-+ if (NOT HARDFP_AVAILABLE)
-+ message(FATAL_ERROR "Hard-float dev libraries required (e.g. 'apt-get install libc6-dev-armel' on Debian/Ubuntu)")
-+ endif (NOT HARDFP_AVAILABLE)
- cmake_pop_check_state()
-
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfloat-abi=softfp")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfloat-abi=hard")
- endif ()
- endif (READELF MATCHES "NOTFOUND")
- endif (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/hadoop-aws.patch b/hadoop-aws.patch
deleted file mode 100644
index e7d985f..0000000
--- a/hadoop-aws.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
-index 901f89b..3a44a01 100644
---- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
-+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
-@@ -91,17 +91,10 @@ class Jets3tFileSystemStore implements FileSystemStore {
-
- S3Credentials s3Credentials = new S3Credentials();
- s3Credentials.initialize(uri, conf);
-- try {
- AWSCredentials awsCredentials =
- new AWSCredentials(s3Credentials.getAccessKey(),
- s3Credentials.getSecretAccessKey());
- this.s3Service = new RestS3Service(awsCredentials);
-- } catch (S3ServiceException e) {
-- if (e.getCause() instanceof IOException) {
-- throw (IOException) e.getCause();
-- }
-- throw new S3Exception(e);
-- }
- bucket = new S3Bucket(uri.getHost());
-
- this.bufferSize = conf.getInt(
-diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
-index 429c272..411bd53 100644
---- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
-+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
-@@ -117,7 +117,6 @@ public class MigrationTool extends Configured implements Tool {
-
-
-
-- try {
- String accessKey = null;
- String secretAccessKey = null;
- String userInfo = uri.getUserInfo();
-@@ -158,12 +157,6 @@ public class MigrationTool extends Configured implements Tool {
- AWSCredentials awsCredentials =
- new AWSCredentials(accessKey, secretAccessKey);
- this.s3Service = new RestS3Service(awsCredentials);
-- } catch (S3ServiceException e) {
-- if (e.getCause() instanceof IOException) {
-- throw (IOException) e.getCause();
-- }
-- throw new S3Exception(e);
-- }
- bucket = new S3Bucket(uri.getHost());
- }
-
-diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
-index a10d6f2..3e2fa38 100644
---- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
-+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
-@@ -83,7 +83,7 @@ class Jets3tNativeFileSystemStore implements NativeFileSystemStore {
- new AWSCredentials(s3Credentials.getAccessKey(),
- s3Credentials.getSecretAccessKey());
- this.s3Service = new RestS3Service(awsCredentials);
-- } catch (S3ServiceException e) {
-+ } catch (Exception e) {
- handleException(e);
- }
- multipartEnabled =
diff --git a/hadoop-build.patch b/hadoop-build.patch
deleted file mode 100644
index cde6942..0000000
--- a/hadoop-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml
-index bd3c555..c89a237 100644
---- a/hadoop-project-dist/pom.xml
-+++ b/hadoop-project-dist/pom.xml
-@@ -58,13 +58,6 @@
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
-- <id>prepare-jar</id>
-- <phase>prepare-package</phase>
-- <goals>
-- <goal>jar</goal>
-- </goals>
-- </execution>
-- <execution>
- <id>prepare-test-jar</id>
- <phase>prepare-package</phase>
- <goals>
diff --git a/hadoop-core-site.xml b/hadoop-core-site.xml
deleted file mode 100644
index ea2b852..0000000
--- a/hadoop-core-site.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<configuration>
- <property>
- <name>fs.default.name</name>
- <value>hdfs://localhost:8020</value>
- </property>
-
- <!-- HTTPFS proxy user setting -->
- <property>
- <name>hadoop.proxyuser.tomcat.hosts</name>
- <value>*</value>
- </property>
- <property>
- <name>hadoop.proxyuser.tomcat.groups</name>
- <value>*</value>
- </property>
-
-</configuration>
diff --git a/hadoop-dlopen-libjvm.patch b/hadoop-dlopen-libjvm.patch
deleted file mode 100644
index 6871e0b..0000000
--- a/hadoop-dlopen-libjvm.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-diff --git a/hadoop-common-project/hadoop-common/src/CMakeLists.txt b/hadoop-common-project/hadoop-common/src/CMakeLists.txt
-index dec63c4..de21bab 100644
---- a/hadoop-common-project/hadoop-common/src/CMakeLists.txt
-+++ b/hadoop-common-project/hadoop-common/src/CMakeLists.txt
-@@ -205,7 +205,6 @@ ENDIF()
-
- target_link_dual_libraries(hadoop
- ${LIB_DL}
-- ${JAVA_JVM_LIBRARY}
- )
- SET(LIBHADOOP_VERSION "1.0.0")
- SET_TARGET_PROPERTIES(hadoop PROPERTIES
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt b/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt
-index 82d1a32..2151bb8 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt
-@@ -147,7 +147,6 @@ if (NEED_LINK_DL)
- endif(NEED_LINK_DL)
-
- target_link_dual_libraries(hdfs
-- ${JAVA_JVM_LIBRARY}
- ${LIB_DL}
- ${OS_LINK_LIBRARIES}
- )
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/CMakeLists.txt b/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/CMakeLists.txt
-index dd3f1e6..68ba422 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/CMakeLists.txt
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/CMakeLists.txt
-@@ -68,7 +68,6 @@ IF(FUSE_FOUND)
- )
- target_link_libraries(fuse_dfs
- ${FUSE_LIBRARIES}
-- ${JAVA_JVM_LIBRARY}
- hdfs
- m
- pthread
-@@ -77,16 +77,6 @@ IF(FUSE_FOUND)
- pthread
- rt
- )
-- add_executable(test_fuse_dfs
-- test/test_fuse_dfs.c
-- test/fuse_workload.c
-- )
-- target_link_libraries(test_fuse_dfs
-- ${FUSE_LIBRARIES}
-- native_mini_dfs
-- posix_util
-- pthread
-- )
- ELSE(FUSE_FOUND)
- IF(REQUIRE_FUSE)
- MESSAGE(FATAL_ERROR "Required component fuse_dfs could not be built.")
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/jni_helper.c b/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/jni_helper.c
-index 878289f..62686b3 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/jni_helper.c
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/jni_helper.c
-@@ -24,6 +24,7 @@
- #include "os/mutexes.h"
- #include "os/thread_local_storage.h"
-
-+#include <dlfcn.h>
- #include <stdio.h>
- #include <string.h>
-
-@@ -373,6 +374,12 @@ static JNIEnv* getGlobalJNIEnv(void)
- jint rv = 0;
- jint noVMs = 0;
- jthrowable jthr;
-+ void *jvmHandle = NULL;
-+ jint JNICALL (*getCreatedJavaJVMsPtr)(JavaVM **, jsize, jsize *);
-+ getCreatedJavaJVMsPtr = NULL;
-+ jint JNICALL (*createJavaVMPtr)(JavaVM **, void **, void *);
-+ createJavaVMPtr = NULL;
-+ char *dlsym_error = NULL;
- char *hadoopClassPath;
- const char *hadoopClassPathVMArg = "-Djava.class.path=";
- size_t optHadoopClassPathLen;
-@@ -384,10 +391,75 @@ static JNIEnv* getGlobalJNIEnv(void)
- JavaVMInitArgs vm_args;
- JavaVM *vm;
- JavaVMOption *options;
-+ //Get JAVA_HOME to use appropriate libjvm
-+ char *javaHome = getenv("JAVA_HOME");
-+ if (javaHome == NULL) {
-+ javaHome = "/usr/lib/jvm";
-+ }
-+
-+#if defined(__x86_64__) && defined (__LP64__)
-+ const char *arch="amd64";
-+#elif defined(__x86_64__) && defined (__ILP32__)
-+ const char *arch="x32";
-+#elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)
-+ const char *arch="ppc64le";
-+#elif defined(__powerpc64__)
-+ const char *arch="ppc64";
-+#elif defined(__powerpc__)
-+ const char *arch="ppc";
-+#elif defined(__i386__)
-+ const char *arch="i386";
-+#elif defined(__ia64__)
-+ const char *arch="ia64";
-+#elif defined(__s390x__)
-+ const char *arch="s390x";
-+#elif defined(__s390__)
-+ const char *arch="s390";
-+#elif defined(__armel__)
-+ const char *arch="arm";
-+#elif defined(__arm__)
-+ const char *arch="arm";
-+#elif defined(__aarch64__)
-+ const char *arch="aarch64";
-+#elif defined(__sparc__) && defined(__arch64__)
-+ const char *arch="sparcv9";
-+#elif defined(__sparc__)
-+ const char *arch="sparc";
-+#elif defined(__alpha__)
-+ const char *arch="alpha";
-+#elif defined(__mips__) && defined(__MIPSEL__) && _MIPS_SIM==_ABIO32
-+ const char *arch="mipsel";
-+#elif defined(__mips__) && defined(__MIPSEL__)
-+ const char *arch="mips64el";
-+#elif defined(__mips__) && _MIPS_SIM==_ABIO32
-+ const char *arch="mips";
-+#elif defined(__mips__)
-+ const char *arch="mips64";
-+#else
-+#error Unknown JVM architecture
-+#endif
-+
-+ //Load the appropriate libjvm
-+ char libjvmPath[strlen(javaHome)+35];
-+ snprintf(libjvmPath, sizeof(libjvmPath), "%s/jre/lib/%s/server/libjvm.so", javaHome, arch);
-+ jvmHandle = dlopen(libjvmPath, RTLD_NOW|RTLD_LOCAL);
-+ if (jvmHandle == NULL) {
-+ fprintf(stderr, "Failed to load libjvm.so!\n");
-+ return NULL;
-+ }
-
-- rv = JNI_GetCreatedJavaVMs(&(vmBuf[0]), VM_BUF_LENGTH, &noVMs);
-+ //Load the JNI_GetCreatedJavaVMs function from the libjvm library
-+ getCreatedJavaJVMsPtr = (jint JNICALL (*)(JavaVM **, jsize, jsize *)) dlsym(jvmHandle, "JNI_GetCreatedJavaVMs");
-+ dlsym_error = dlerror();
-+ if (dlsym_error) {
-+ fprintf(stderr, "Can not load symbol JNI_GetCreatedJavaVMs: %s\n", dlsym_error);
-+ dlclose(jvmHandle);
-+ return NULL;
-+ }
-+ rv = (*getCreatedJavaJVMsPtr)(&(vmBuf[0]), VM_BUF_LENGTH, &noVMs);
- if (rv != 0) {
- fprintf(stderr, "JNI_GetCreatedJavaVMs failed with error: %d\n", rv);
-+ dlclose(jvmHandle);
- return NULL;
- }
-
-@@ -396,6 +468,7 @@ static JNIEnv* getGlobalJNIEnv(void)
- hadoopClassPath = getenv("CLASSPATH");
- if (hadoopClassPath == NULL) {
- fprintf(stderr, "Environment variable CLASSPATH not set!\n");
-+ dlclose(jvmHandle);
- return NULL;
- }
- optHadoopClassPathLen = strlen(hadoopClassPath) +
-@@ -502,7 +576,15 @@ static JNIEnv* getGlobalJNIEnv(void)
- vm_args.nOptions = noArgs;
- vm_args.ignoreUnrecognized = 1;
-
-- rv = JNI_CreateJavaVM(&vm, (void*)&env, &vm_args);
-+ //Load the JNI_CreateJavaVM function from the libjvm library
-+ createJavaVMPtr = (jint JNICALL (*)(JavaVM **, void **, void *)) dlsym(jvmHandle, "JNI_CreateJavaVM");
-+ dlsym_error = dlerror();
-+ if (dlsym_error) {
-+ fprintf(stderr, "Can not load symbol JNI_CreateJavaVM: %s\n", dlsym_error);
-+ dlclose(jvmHandle);
-+ return NULL;
-+ }
-+ rv = (*createJavaVMPtr)(&vm, (void*)&env, &vm_args);
-
- if (hadoopJvmArgs != NULL) {
- free(hadoopJvmArgs);
-@@ -512,6 +594,7 @@ static JNIEnv* getGlobalJNIEnv(void)
- if (rv != 0) {
- fprintf(stderr, "Call to JNI_CreateJavaVM failed "
- "with error: %d\n", rv);
-+ dlclose(jvmHandle);
- return NULL;
- }
- jthr = invokeMethod(env, NULL, STATIC, NULL,
-@@ -470,6 +552,7 @@ static JNIEnv* getGlobalJNIEnv(void)
- if (rv != 0) {
- fprintf(stderr, "Call to AttachCurrentThread "
- "failed with error: %d\n", rv);
-+ dlclose(jvmHandle);
- return NULL;
- }
- }
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt b/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt
-index 74f20dd..255d4ab 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt
-@@ -161,7 +161,6 @@ add_executable(test_libhdfs_ops
- )
- target_link_libraries(test_libhdfs_ops
- hdfs_static
-- ${JAVA_JVM_LIBRARY}
- )
-
- add_executable(test_libhdfs_read
-@@ -169,7 +168,6 @@ add_executable(test_libhdfs_read
- )
- target_link_libraries(test_libhdfs_read
- hdfs_static
-- ${JAVA_JVM_LIBRARY}
- )
-
- add_executable(test_libhdfs_write
-@@ -177,7 +175,6 @@ add_executable(test_libhdfs_write
- )
- target_link_libraries(test_libhdfs_write
- hdfs_static
-- ${JAVA_JVM_LIBRARY}
- )
-
- add_library(native_mini_dfs
-@@ -189,17 +186,9 @@ add_library(native_mini_dfs
- ${OS_DIR}/thread_local_storage.c
- )
- target_link_libraries(native_mini_dfs
-- ${JAVA_JVM_LIBRARY}
- ${OS_LINK_LIBRARIES}
- )
-
--add_executable(test_native_mini_dfs
-- main/native/libhdfs/test_native_mini_dfs.c
--)
--target_link_libraries(test_native_mini_dfs
-- native_mini_dfs
--)
--
- add_executable(test_libhdfs_threaded
- main/native/libhdfs/expect.c
- main/native/libhdfs/test_libhdfs_threaded.c
diff --git a/hadoop-fedora-integration.patch b/hadoop-fedora-integration.patch
deleted file mode 100644
index 01d207c..0000000
--- a/hadoop-fedora-integration.patch
+++ /dev/null
@@ -1,2522 +0,0 @@
-diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml
-index c6f6c1b..7a3e0d4 100644
---- a/hadoop-client/pom.xml
-+++ b/hadoop-client/pom.xml
-@@ -60,20 +56,16 @@
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>jetty</groupId>
-- <artifactId>org.mortbay.jetty</artifactId>
-- </exclusion>
-- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>servlet-api-2.5</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-webapp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
-@@ -132,8 +124,8 @@
- <artifactId>avro</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
-diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
-index b9d6c60..9330a1a 100644
---- a/hadoop-common-project/hadoop-auth/pom.xml
-+++ b/hadoop-common-project/hadoop-auth/pom.xml
-@@ -53,13 +53,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty-util</artifactId>
-- <scope>test</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-servlet</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
-diff --git a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
-index 4e4ecc4..3429931 100644
---- a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
-+++ b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
-@@ -29,11 +29,12 @@ import org.apache.http.entity.InputStreamEntity;
- import org.apache.http.impl.auth.SPNegoSchemeFactory;
- import org.apache.http.impl.client.SystemDefaultHttpClient;
- import org.apache.http.util.EntityUtils;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.servlet.Context;
--import org.mortbay.jetty.servlet.FilterHolder;
--import org.mortbay.jetty.servlet.ServletHolder;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.servlet.FilterHolder;
-+import org.eclipse.jetty.servlet.ServletContextHandler;
-+import org.eclipse.jetty.servlet.ServletHolder;
-
-+import javax.servlet.DispatcherType;
- import javax.servlet.FilterConfig;
- import javax.servlet.ServletException;
- import javax.servlet.http.HttpServlet;
-@@ -52,6 +53,7 @@ import java.net.HttpURLConnection;
- import java.net.ServerSocket;
- import java.net.URL;
- import java.security.Principal;
-+import java.util.EnumSet;
- import java.util.Properties;
- import org.junit.Assert;
-
-@@ -61,7 +63,7 @@ public class AuthenticatorTestCase {
- private int port = -1;
- private boolean useTomcat = false;
- private Tomcat tomcat = null;
-- Context context;
-+ ServletContextHandler context;
-
- private static Properties authenticatorConfig;
-
-@@ -120,10 +122,10 @@ public class AuthenticatorTestCase {
-
- protected void startJetty() throws Exception {
- server = new Server(0);
-- context = new Context();
-+ context = new ServletContextHandler();
- context.setContextPath("/foo");
- server.setHandler(context);
-- context.addFilter(new FilterHolder(TestFilter.class), "/*", 0);
-+ context.addFilter(new FilterHolder(TestFilter.class), "/*", EnumSet.of(DispatcherType.REQUEST));
- context.addServlet(new ServletHolder(TestServlet.class), "/bar");
- host = "localhost";
- port = getLocalPort();
-diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
-index 7cf67a3..ef2733f 100644
---- a/hadoop-common-project/hadoop-common/pom.xml
-+++ b/hadoop-common-project/hadoop-common/pom.xml
-@@ -89,29 +89,25 @@
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>javax.servlet</groupId>
-- <artifactId>servlet-api</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-servlet</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty-util</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-webapp</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty-sslengine</artifactId>
-- <scope>compile</scope>
-- </dependency>
-- <dependency>
-- <groupId>javax.servlet.jsp</groupId>
-- <artifactId>jsp-api</artifactId>
-+ <groupId>org.apache.tomcat</groupId>
-+ <artifactId>tomcat-el-api</artifactId>
-+ <version>7.0.37</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
-@@ -125,6 +134,11 @@
- <artifactId>jersey-server</artifactId>
- <scope>compile</scope>
- </dependency>
-+ <dependency>
-+ <groupId>com.sun.jersey</groupId>
-+ <artifactId>jersey-servlet</artifactId>
-+ <scope>compile</scope>
-+ </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
-diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java
-index ef562b4..a4b05a1 100644
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java
-@@ -23,7 +23,7 @@
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
-
--import org.mortbay.jetty.servlet.DefaultServlet;
-+import org.eclipse.jetty.servlet.DefaultServlet;
-
- /**
- * General servlet which is admin-authorized.
-diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java
-index 52d9850..a7c23b9 100644
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java
-@@ -25,8 +25,8 @@
- import org.apache.commons.logging.LogFactory;
- import org.apache.log4j.Appender;
- import org.apache.log4j.Logger;
--import org.mortbay.jetty.NCSARequestLog;
--import org.mortbay.jetty.RequestLog;
-+import org.eclipse.jetty.server.NCSARequestLog;
-+import org.eclipse.jetty.server.RequestLog;
-
- /**
- * RequestLog object for use with Http
-diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
-index 3ad26c6..f87c68a 100644
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
-@@ -62,27 +62,29 @@
- import org.apache.hadoop.security.ssl.SSLFactory;
- import org.apache.hadoop.util.ReflectionUtils;
- import org.apache.hadoop.util.Shell;
--import org.mortbay.io.Buffer;
--import org.mortbay.jetty.Connector;
--import org.mortbay.jetty.Handler;
--import org.mortbay.jetty.MimeTypes;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.handler.ContextHandler;
--import org.mortbay.jetty.handler.ContextHandlerCollection;
--import org.mortbay.jetty.nio.SelectChannelConnector;
--import org.mortbay.jetty.security.SslSocketConnector;
--import org.mortbay.jetty.servlet.Context;
--import org.mortbay.jetty.servlet.DefaultServlet;
--import org.mortbay.jetty.servlet.FilterHolder;
--import org.mortbay.jetty.servlet.FilterMapping;
--import org.mortbay.jetty.servlet.ServletHandler;
--import org.mortbay.jetty.servlet.ServletHolder;
--import org.mortbay.jetty.webapp.WebAppContext;
--import org.mortbay.thread.QueuedThreadPool;
--import org.mortbay.util.MultiException;
-+import org.eclipse.jetty.io.Buffer;
-+import org.eclipse.jetty.server.Connector;
-+import org.eclipse.jetty.server.Handler;
-+import org.eclipse.jetty.http.MimeTypes;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.server.handler.ContextHandler;
-+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
-+import org.eclipse.jetty.server.nio.SelectChannelConnector;
-+import org.eclipse.jetty.server.ssl.SslSocketConnector;
-+import org.eclipse.jetty.servlet.ServletContextHandler;
-+import org.eclipse.jetty.servlet.DefaultServlet;
-+import org.eclipse.jetty.servlet.FilterHolder;
-+import org.eclipse.jetty.servlet.FilterMapping;
-+import org.eclipse.jetty.servlet.ServletHandler;
-+import org.eclipse.jetty.servlet.ServletHolder;
-+import org.eclipse.jetty.util.ssl.SslContextFactory;
-+import org.eclipse.jetty.webapp.WebAppContext;
-+import org.eclipse.jetty.util.thread.QueuedThreadPool;
-+import org.eclipse.jetty.util.MultiException;
-
- import com.sun.jersey.spi.container.servlet.ServletContainer;
-
-+
- /**
- * Create a Jetty embedded server to answer http requests. The primary goal
- * is to serve up status information for the server.
-@@ -122,8 +124,8 @@
- protected final Connector listener;
- protected final WebAppContext webAppContext;
- protected final boolean findPort;
-- protected final Map<Context, Boolean> defaultContexts =
-- new HashMap<Context, Boolean>();
-+ protected final Map<ServletContextHandler, Boolean> defaultContexts =
-+ new HashMap<ServletContextHandler, Boolean>();
- protected final List<String> filterNames = new ArrayList<String>();
- private static final int MAX_RETRIES = 10;
- static final String STATE_DESCRIPTION_ALIVE = " - alive";
-@@ -229,11 +231,18 @@ public HttpServer(String name, String bindAddress, int port,
- } catch (GeneralSecurityException ex) {
- throw new IOException(ex);
- }
-- SslSocketConnector sslListener = new SslSocketConnector() {
-- @Override
-- protected SSLServerSocketFactory createFactory() throws Exception {
-- return sslFactory.createSSLServerSocketFactory();
-- }
-+ // Jetty 8+ moved JKS config to SslContextFactory
-+ SslContextFactory sslContextFactory = new SslContextFactory(conf.get("ssl.server.keystore.location",""));
-+ sslContextFactory.setKeyStorePassword(conf.get("ssl.server.keystore.password",""));
-+ if (sslFactory.isClientCertRequired()) {
-+ sslContextFactory.setTrustStore(conf.get("ssl.server.truststore.location",""));
-+ sslContextFactory.setTrustStorePassword(conf.get("ssl.server.truststore.password",""));
-+ sslContextFactory.setTrustStoreType(conf.get("ssl.server.truststore.type", "jks"));
-+ }
-+ SslSocketConnector sslListener = new SslSocketConnector(sslContextFactory) {
-+ protected SSLServerSocketFactory createFactory() throws Exception {
-+ return sslFactory.createSSLServerSocketFactory();
-+ }
- };
- listener = sslListener;
- } else {
-@@ -267,11 +276,15 @@ protected SSLServerSocketFactory createFactory() throws Exception {
- webAppContext.getServletContext().setAttribute(CONF_CONTEXT_ATTRIBUTE, conf);
- webAppContext.getServletContext().setAttribute(ADMINS_ACL, adminsAcl);
- addNoCacheFilter(webAppContext);
-- webServer.addHandler(webAppContext);
-+
-+ ContextHandlerCollection handlers = new ContextHandlerCollection();
-+ handlers.setHandlers(webServer.getHandlers());
-+ handlers.addHandler(webAppContext);
-+ webServer.setHandler(handlers);
-
- addDefaultApps(contexts, appDir, conf);
-
-- addGlobalFilter("safety", QuotingInputFilter.class.getName(), null);
-+ addGlobalFilter("safety", QuotingInputFilter.class.getName(), new HashMap<String,String>(0));
- final FilterInitializer[] initializers = getFilterInitializers(conf);
- if (initializers != null) {
- conf = new Configuration(conf);
-@@ -320,7 +333,8 @@ public static Connector createDefaultChannelConnector() {
- // the same port with indeterminate routing of incoming requests to them
- ret.setReuseAddress(false);
- }
-- ret.setHeaderBufferSize(1024*64);
-+ ret.setRequestHeaderSize(1024*64);
-+ ret.setResponseHeaderSize(1024*64);
- return ret;
- }
-
-@@ -353,14 +367,14 @@ protected void addDefaultApps(ContextHandlerCollection parent,
- // set up the context for "/logs/" if "hadoop.log.dir" property is defined.
- String logDir = System.getProperty("hadoop.log.dir");
- if (logDir != null) {
-- Context logContext = new Context(parent, "/logs");
-+ ServletContextHandler logContext = new ServletContextHandler(parent, "/logs");
- logContext.setResourceBase(logDir);
- logContext.addServlet(AdminAuthorizedServlet.class, "/*");
- if (conf.getBoolean(
- CommonConfigurationKeys.HADOOP_JETTY_LOGS_SERVE_ALIASES,
- CommonConfigurationKeys.DEFAULT_HADOOP_JETTY_LOGS_SERVE_ALIASES)) {
- logContext.getInitParams().put(
-- "org.mortbay.jetty.servlet.Default.aliases", "true");
-+ "org.eclipse.jetty.servlet.Default.aliases", "true");
- }
- logContext.setDisplayName("logs");
- setContextAttributes(logContext, conf);
-@@ -368,7 +382,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
- defaultContexts.put(logContext, true);
- }
- // set up the context for "/static/*"
-- Context staticContext = new Context(parent, "/static");
-+ ServletContextHandler staticContext = new ServletContextHandler(parent, "/static");
- staticContext.setResourceBase(appDir + "/static");
- staticContext.addServlet(DefaultServlet.class, "/*");
- staticContext.setDisplayName("static");
-@@ -376,7 +390,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
- defaultContexts.put(staticContext, true);
- }
-
-- private void setContextAttributes(Context context, Configuration conf) {
-+ private void setContextAttributes(ServletContextHandler context, Configuration conf) {
- context.getServletContext().setAttribute(CONF_CONTEXT_ATTRIBUTE, conf);
- context.getServletContext().setAttribute(ADMINS_ACL, adminsAcl);
- }
-@@ -393,9 +407,12 @@ protected void addDefaultServlets() {
- addServlet("conf", "/conf", ConfServlet.class);
- }
-
-- public void addContext(Context ctxt, boolean isFiltered)
-+ public void addContext(ServletContextHandler ctxt, boolean isFiltered)
- throws IOException {
-- webServer.addHandler(ctxt);
-+ ContextHandlerCollection handlers = new ContextHandlerCollection();
-+ handlers.setHandlers(webServer.getHandlers());
-+ handlers.addHandler(ctxt);
-+ webServer.setHandler(handlers);
- addNoCacheFilter(webAppContext);
- defaultContexts.put(ctxt, isFiltered);
- }
-@@ -497,7 +514,7 @@ public void addInternalServlet(String name, String pathSpec,
- FilterMapping fmap = new FilterMapping();
- fmap.setPathSpec(pathSpec);
- fmap.setFilterName(SPNEGO_FILTER);
-- fmap.setDispatches(Handler.ALL);
-+ fmap.setDispatches(FilterMapping.ALL);
- handler.addFilterMapping(fmap);
- }
- }
-@@ -511,9 +528,9 @@ public void addFilter(String name, String classname,
- LOG.info("Added filter " + name + " (class=" + classname
- + ") to context " + webAppContext.getDisplayName());
- final String[] ALL_URLS = { "/*" };
-- for (Map.Entry<Context, Boolean> e : defaultContexts.entrySet()) {
-+ for (Map.Entry<ServletContextHandler, Boolean> e : defaultContexts.entrySet()) {
- if (e.getValue()) {
-- Context ctx = e.getKey();
-+ ServletContextHandler ctx = e.getKey();
- defineFilter(ctx, name, classname, parameters, ALL_URLS);
- LOG.info("Added filter " + name + " (class=" + classname
- + ") to context " + ctx.getDisplayName());
-@@ -527,7 +544,7 @@ public void addGlobalFilter(String name, String classname,
- Map<String, String> parameters) {
- final String[] ALL_URLS = { "/*" };
- defineFilter(webAppContext, name, classname, parameters, ALL_URLS);
-- for (Context ctx : defaultContexts.keySet()) {
-+ for (ServletContextHandler ctx : defaultContexts.keySet()) {
- defineFilter(ctx, name, classname, parameters, ALL_URLS);
- }
- LOG.info("Added global filter '" + name + "' (class=" + classname + ")");
-@@ -536,16 +553,18 @@ public void addGlobalFilter(String name, String classname,
- /**
- * Define a filter for a context and set up default url mappings.
- */
-- public void defineFilter(Context ctx, String name,
-+ public void defineFilter(ServletContextHandler ctx, String name,
- String classname, Map<String,String> parameters, String[] urls) {
-
- FilterHolder holder = new FilterHolder();
- holder.setName(name);
- holder.setClassName(classname);
-- holder.setInitParameters(parameters);
-+ if (null != parameters) {
-+ holder.setInitParameters(parameters);
-+ }
- FilterMapping fmap = new FilterMapping();
- fmap.setPathSpecs(urls);
-- fmap.setDispatches(Handler.ALL);
-+ fmap.setDispatches(FilterMapping.ALL);
- fmap.setFilterName(name);
- ServletHandler handler = ctx.getServletHandler();
- handler.addFilter(holder, fmap);
-@@ -557,13 +576,13 @@ public void defineFilter(Context ctx, String name,
- * @param webAppCtx The WebApplicationContext to add to
- */
- protected void addFilterPathMapping(String pathSpec,
-- Context webAppCtx) {
-+ ServletContextHandler webAppCtx) {
- ServletHandler handler = webAppCtx.getServletHandler();
- for(String name : filterNames) {
- FilterMapping fmap = new FilterMapping();
- fmap.setPathSpec(pathSpec);
- fmap.setFilterName(name);
-- fmap.setDispatches(Handler.ALL);
-+ fmap.setDispatches(FilterMapping.ALL);
- handler.addFilterMapping(fmap);
- }
- }
-@@ -627,12 +646,12 @@ public void addSslListener(InetSocketAddress addr, String keystore,
- if (webServer.isStarted()) {
- throw new IOException("Failed to add ssl listener");
- }
-- SslSocketConnector sslListener = new SslSocketConnector();
-+ SslContextFactory sslContextFactory = new SslContextFactory(keystore);
-+ sslContextFactory.setKeyStorePassword(storPass);
-+ sslContextFactory.setKeyManagerPassword(keyPass);
-+ SslSocketConnector sslListener = new SslSocketConnector(sslContextFactory);
- sslListener.setHost(addr.getHostName());
- sslListener.setPort(addr.getPort());
-- sslListener.setKeystore(keystore);
-- sslListener.setPassword(storPass);
-- sslListener.setKeyPassword(keyPass);
- webServer.addConnector(sslListener);
- }
-
-@@ -656,14 +675,14 @@ public void addSslListener(InetSocketAddress addr, Configuration sslConf,
- System.setProperty("javax.net.ssl.trustStoreType", sslConf.get(
- "ssl.server.truststore.type", "jks"));
- }
-- SslSocketConnector sslListener = new SslSocketConnector();
-+ SslContextFactory sslContextFactory = new SslContextFactory(sslConf.get("ssl.server.keystore.location",""));
-+ sslContextFactory.setKeyStorePassword(sslConf.get("ssl.server.keystore.password", ""));
-+ sslContextFactory.setKeyManagerPassword(sslConf.get("ssl.server.keystore.keypassword", ""));
-+ sslContextFactory.setKeyStoreType(sslConf.get("ssl.server.keystore.type", "jks"));
-+ sslContextFactory.setNeedClientAuth(needCertsAuth);
-+ SslSocketConnector sslListener = new SslSocketConnector(sslContextFactory);
- sslListener.setHost(addr.getHostName());
- sslListener.setPort(addr.getPort());
-- sslListener.setKeystore(sslConf.get("ssl.server.keystore.location"));
-- sslListener.setPassword(sslConf.get("ssl.server.keystore.password", ""));
-- sslListener.setKeyPassword(sslConf.get("ssl.server.keystore.keypassword", ""));
-- sslListener.setKeystoreType(sslConf.get("ssl.server.keystore.type", "jks"));
-- sslListener.setNeedClientAuth(needCertsAuth);
- webServer.addConnector(sslListener);
- }
-
-@@ -1095,8 +1114,8 @@ public void doFilter(ServletRequest request,
- */
- private String inferMimeType(ServletRequest request) {
- String path = ((HttpServletRequest)request).getRequestURI();
-- ContextHandler.SContext sContext = (ContextHandler.SContext)config.getServletContext();
-- MimeTypes mimes = sContext.getContextHandler().getMimeTypes();
-+ ContextHandler.Context context = (ContextHandler.Context)config.getServletContext();
-+ MimeTypes mimes = context.getContextHandler().getMimeTypes();
- Buffer mimeBuffer = mimes.getMimeByExtension(path);
- return (mimeBuffer == null) ? null : mimeBuffer.toString();
- }
-diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
-index 2f28d08..3ac7086 100644
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
-@@ -40,6 +40,7 @@
- import javax.servlet.ServletException;
- import javax.servlet.ServletRequest;
- import javax.servlet.ServletResponse;
-+import javax.servlet.SessionCookieConfig;
- import javax.servlet.http.HttpServlet;
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletRequestWrapper;
-@@ -59,7 +60,6 @@ import org.apache.hadoop.security.authentication.util.FileSignerSecretProvider;
- import org.apache.hadoop.security.authentication.util.RandomSignerSecretProvider;
- import org.apache.hadoop.security.authentication.util.SignerSecretProvider;
- import org.apache.hadoop.security.authentication.util.ZKSignerSecretProvider;
--import org.apache.hadoop.security.ssl.SslSelectChannelConnectorSecure;
- import org.apache.hadoop.jmx.JMXJsonServlet;
- import org.apache.hadoop.log.LogLevel;
- import org.apache.hadoop.metrics.MetricsServlet;
-@@ -70,29 +71,31 @@
- import org.apache.hadoop.security.authorize.AccessControlList;
- import org.apache.hadoop.util.ReflectionUtils;
- import org.apache.hadoop.util.Shell;
--import org.mortbay.io.Buffer;
--import org.mortbay.jetty.Connector;
--import org.mortbay.jetty.Handler;
--import org.mortbay.jetty.MimeTypes;
--import org.mortbay.jetty.RequestLog;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.SessionManager;
--import org.mortbay.jetty.handler.ContextHandler;
--import org.mortbay.jetty.handler.ContextHandlerCollection;
--import org.mortbay.jetty.handler.HandlerCollection;
--import org.mortbay.jetty.handler.RequestLogHandler;
--import org.mortbay.jetty.nio.SelectChannelConnector;
--import org.mortbay.jetty.security.SslSelectChannelConnector;
--import org.mortbay.jetty.servlet.AbstractSessionManager;
--import org.mortbay.jetty.servlet.Context;
--import org.mortbay.jetty.servlet.DefaultServlet;
--import org.mortbay.jetty.servlet.FilterHolder;
--import org.mortbay.jetty.servlet.FilterMapping;
--import org.mortbay.jetty.servlet.ServletHandler;
--import org.mortbay.jetty.servlet.ServletHolder;
--import org.mortbay.jetty.webapp.WebAppContext;
--import org.mortbay.thread.QueuedThreadPool;
--import org.mortbay.util.MultiException;
-+import org.eclipse.jetty.http.MimeTypes;
-+import org.eclipse.jetty.io.Buffer;
-+import org.eclipse.jetty.server.Connector;
-+import org.eclipse.jetty.server.Handler;
-+import org.eclipse.jetty.server.RequestLog;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.server.SessionManager;
-+import org.eclipse.jetty.server.handler.ContextHandler;
-+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
-+import org.eclipse.jetty.server.handler.HandlerCollection;
-+import org.eclipse.jetty.server.handler.RequestLogHandler;
-+import org.eclipse.jetty.server.nio.SelectChannelConnector;
-+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
-+import org.eclipse.jetty.server.session.AbstractSessionManager;
-+import org.eclipse.jetty.server.ssl.SslSocketConnector;
-+import org.eclipse.jetty.servlet.DefaultServlet;
-+import org.eclipse.jetty.servlet.FilterHolder;
-+import org.eclipse.jetty.servlet.FilterMapping;
-+import org.eclipse.jetty.servlet.ServletContextHandler;
-+import org.eclipse.jetty.servlet.ServletHandler;
-+import org.eclipse.jetty.servlet.ServletHolder;
-+import org.eclipse.jetty.util.MultiException;
-+import org.eclipse.jetty.util.ssl.SslContextFactory;
-+import org.eclipse.jetty.util.thread.QueuedThreadPool;
-+import org.eclipse.jetty.webapp.WebAppContext;
-
- import com.google.common.base.Preconditions;
- import com.google.common.collect.Lists;
-@@ -135,8 +137,8 @@ private ListenerInfo(boolean isManaged, Connector listener) {
-
- protected final WebAppContext webAppContext;
- protected final boolean findPort;
-- protected final Map<Context, Boolean> defaultContexts =
-- new HashMap<>();
-+ protected final Map<ServletContextHandler, Boolean> defaultContexts =
-+ new HashMap<ServletContextHandler, Boolean>();
- protected final List<String> filterNames = new ArrayList<>();
- static final String STATE_DESCRIPTION_ALIVE = " - alive";
- static final String STATE_DESCRIPTION_NOT_LIVE = " - not live";
-@@ -320,23 +322,24 @@ public final class HttpServer2 implements FilterContainer {
- }
-
- private Connector createHttpsChannelConnector() {
-- SslSelectChannelConnector c = new SslSelectChannelConnectorSecure();
-- configureChannelConnector(c);
--
-- c.setNeedClientAuth(needsClientAuth);
-- c.setKeyPassword(keyPassword);
-+ // Jetty 8+ moved JKS config to SslContextFactory
-+ SslContextFactory scf = new SslContextFactory();
-+ scf.setNeedClientAuth(needsClientAuth);
-+ scf.setKeyManagerPassword(keyPassword);
-
- if (keyStore != null) {
-- c.setKeystore(keyStore);
-- c.setKeystoreType(keyStoreType);
-- c.setPassword(keyStorePassword);
-+ scf.setKeyStorePath(keyStore);
-+ scf.setKeyStoreType(keyStoreType);
-+ scf.setKeyStorePassword(keyStorePassword);
- }
-
- if (trustStore != null) {
-- c.setTruststore(trustStore);
-- c.setTruststoreType(trustStoreType);
-- c.setTrustPassword(trustStorePassword);
-+ scf.setTrustStore(trustStore);
-+ scf.setTrustStoreType(trustStoreType);
-+ scf.setTrustStorePassword(trustStorePassword);
- }
-+ SslSelectChannelConnector c = new SslSelectChannelConnector(scf);
-+ configureChannelConnector(c);
-
- if(null != excludeCiphers && !excludeCiphers.isEmpty()) {
- c.setExcludeCipherSuites(excludeCiphers.split(","));
-@@ -369,7 +373,8 @@ private void initializeWebServer(String name, String hostName,
- if (sm instanceof AbstractSessionManager) {
- AbstractSessionManager asm = (AbstractSessionManager)sm;
- asm.setHttpOnly(true);
-- asm.setSecureCookies(true);
-+ SessionCookieConfig scc = asm.getSessionCookieConfig();
-+ scc.setSecure(true);
- }
-
- ContextHandlerCollection contexts = new ContextHandlerCollection();
-@@ -387,11 +392,14 @@ private void initializeWebServer(String name, String hostName,
-
- final String appDir = getWebAppsPath(name);
-
-- webServer.addHandler(webAppContext);
-+ ContextHandlerCollection handlers = new ContextHandlerCollection();
-+ handlers.setHandlers(webServer.getHandlers());
-+ handlers.addHandler(webAppContext);
-+ webServer.setHandler(handlers);
-
- addDefaultApps(contexts, appDir, conf);
-
-- addGlobalFilter("safety", QuotingInputFilter.class.getName(), null);
-+ addGlobalFilter("safety", QuotingInputFilter.class.getName(), new HashMap<String,String>(0));
- final FilterInitializer[] initializers = getFilterInitializers(conf);
- if (initializers != null) {
- conf = new Configuration(conf);
-@@ -522,7 +528,8 @@ public final class HttpServer2 implements FilterContainer {
- // the same port with indeterminate routing of incoming requests to them
- c.setReuseAddress(false);
- }
-- c.setHeaderBufferSize(1024*64);
-+ c.setRequestHeaderSize(1024*64);
-+ c.setResponseHeaderSize(1024*64);
- }
-
- @InterfaceAudience.Private
-@@ -541,7 +550,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
- // set up the context for "/logs/" if "hadoop.log.dir" property is defined.
- String logDir = System.getProperty("hadoop.log.dir");
- if (logDir != null) {
-- Context logContext = new Context(parent, "/logs");
-+ ServletContextHandler logContext = new ServletContextHandler(parent, "/logs");
- logContext.setResourceBase(logDir);
- logContext.addServlet(AdminAuthorizedServlet.class, "/*");
- if (conf.getBoolean(
-@@ -550,7 +559,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
- @SuppressWarnings("unchecked")
- Map<String, String> params = logContext.getInitParams();
- params.put(
-- "org.mortbay.jetty.servlet.Default.aliases", "true");
-+ "org.eclipse.jetty.servlet.Default.aliases", "true");
- }
- logContext.setDisplayName("logs");
- setContextAttributes(logContext, conf);
-@@ -558,7 +567,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
- defaultContexts.put(logContext, true);
- }
- // set up the context for "/static/*"
-- Context staticContext = new Context(parent, "/static");
-+ ServletContextHandler staticContext = new ServletContextHandler(parent, "/static");
- staticContext.setResourceBase(appDir + "/static");
- staticContext.addServlet(DefaultServlet.class, "/*");
- staticContext.setDisplayName("static");
-@@ -566,7 +575,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
- defaultContexts.put(staticContext, true);
- }
-
-- private void setContextAttributes(Context context, Configuration conf) {
-+ private void setContextAttributes(ServletContextHandler context, Configuration conf) {
- context.getServletContext().setAttribute(CONF_CONTEXT_ATTRIBUTE, conf);
- context.getServletContext().setAttribute(ADMINS_ACL, adminsAcl);
- }
-@@ -583,8 +592,11 @@ protected void addDefaultServlets() {
- addServlet("conf", "/conf", ConfServlet.class);
- }
-
-- public void addContext(Context ctxt, boolean isFiltered) {
-+ public void addContext(ServletContextHandler ctxt, boolean isFiltered) {
-- webServer.addHandler(ctxt);
-+ ContextHandlerCollection handlers = new ContextHandlerCollection();
-+ handlers.setHandlers(webServer.getHandlers());
-+ handlers.addHandler(ctxt);
-+ webServer.setHandler(handlers);
- addNoCacheFilter(webAppContext);
- defaultContexts.put(ctxt, isFiltered);
- }
-@@ -669,7 +681,7 @@ public void addInternalServlet(String name, String pathSpec,
- FilterMapping fmap = new FilterMapping();
- fmap.setPathSpec(pathSpec);
- fmap.setFilterName(SPNEGO_FILTER);
-- fmap.setDispatches(Handler.ALL);
-+ fmap.setDispatches(FilterMapping.ALL);
- handler.addFilterMapping(fmap);
- }
- }
-@@ -686,9 +686,9 @@ public final class HttpServer2 implements FilterContainer {
- "Added filter " + name + " (class=" + classname + ") to context " + webAppContext.getDisplayName());
- final String[] ALL_URLS = { "/*" };
- fmap = getFilterMapping(name, ALL_URLS);
-- for (Map.Entry<Context, Boolean> e : defaultContexts.entrySet()) {
-+ for (Map.Entry<ServletContextHandler, Boolean> e : defaultContexts.entrySet()) {
- if (e.getValue()) {
-- Context ctx = e.getKey();
-+ ServletContextHandler ctx = e.getKey();
- defineFilter(ctx, filterHolder, fmap);
- LOG.info("Added filter " + name + " (class=" + classname
- + ") to context " + ctx.getDisplayName());
-@@ -704,7 +704,7 @@ public final class HttpServer2 implements FilterContainer {
- FilterHolder filterHolder = getFilterHolder(name, classname, parameters);
- FilterMapping fmap = getFilterMapping(name, ALL_URLS);
- defineFilter(webAppContext, filterHolder, fmap);
-- for (Context ctx : defaultContexts.keySet()) {
-+ for (ServletContextHandler ctx : defaultContexts.keySet()) {
- defineFilter(ctx, filterHolder, fmap);
- }
- LOG.info("Added global filter '" + name + "' (class=" + classname + ")");
-@@ -713,7 +725,7 @@
- /**
- * Define a filter for a context and set up default url mappings.
- */
-- public static void defineFilter(Context ctx, String name,
-+ public static void defineFilter(ServletContextHandler ctx, String name,
- String classname, Map<String,String> parameters, String[] urls) {
- FilterHolder filterHolder = getFilterHolder(name, classname, parameters);
- FilterMapping fmap = getFilterMapping(name, urls);
-@@ -723,7 +734,7 @@ public final class HttpServer2 implements FilterContainer {
- /**
- * Define a filter for a context and set up default url mappings.
- */
-- private static void defineFilter(Context ctx, FilterHolder holder,
-+ private static void defineFilter(ServletContextHandler ctx, FilterHolder holder,
- FilterMapping fmap) {
- ServletHandler handler = ctx.getServletHandler();
- handler.addFilter(holder, fmap);
-@@ -732,7 +732,7 @@
- private static FilterMapping getFilterMapping(String name, String[] urls) {
- FilterMapping fmap = new FilterMapping();
- fmap.setPathSpecs(urls);
-- fmap.setDispatches(Handler.ALL);
-+ fmap.setDispatches(FilterMapping.ALL);
- fmap.setFilterName(name);
- return fmap;
- }
-@@ -752,13 +752,13 @@
- * @param webAppCtx The WebApplicationContext to add to
- */
- protected void addFilterPathMapping(String pathSpec,
-- Context webAppCtx) {
-+ ServletContextHandler webAppCtx) {
- ServletHandler handler = webAppCtx.getServletHandler();
- for(String name : filterNames) {
- FilterMapping fmap = new FilterMapping();
- fmap.setPathSpec(pathSpec);
- fmap.setFilterName(name);
-- fmap.setDispatches(Handler.ALL);
-+ fmap.setDispatches(FilterMapping.ALL);
- handler.addFilterMapping(fmap);
- }
- }
-@@ -812,7 +823,8 @@ public InetSocketAddress getConnectorAddress(int index) {
- return null;
-
- Connector c = webServer.getConnectors()[index];
-- if (c.getLocalPort() == -1) {
-+ // jetty8 has 2 getLocalPort err values
-+ if (c.getLocalPort() == -1 || c.getLocalPort() == -2) {
- // The connector is not bounded
- return null;
- }
-@@ -901,7 +901,7 @@ public final class HttpServer2 implements FilterContainer {
- */
- void openListeners() throws Exception {
- for (Connector listener : listeners) {
-- if (listener.getLocalPort() != -1) {
-+ if (listener.getLocalPort() != -1 && listener.getLocalPort() != -2) {
- // This listener is either started externally or has been bound
- continue;
- }
-@@ -1249,8 +1262,8 @@ public void doFilter(ServletRequest request,
- */
- private String inferMimeType(ServletRequest request) {
- String path = ((HttpServletRequest)request).getRequestURI();
-- ContextHandler.SContext sContext = (ContextHandler.SContext)config.getServletContext();
-- MimeTypes mimes = sContext.getContextHandler().getMimeTypes();
-+ ContextHandler.Context context = (ContextHandler.Context)config.getServletContext();
-+ MimeTypes mimes = context.getContextHandler().getMimeTypes();
- Buffer mimeBuffer = mimes.getMimeByExtension(path);
- return (mimeBuffer == null) ? null : mimeBuffer.toString();
- }
-diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java
-index 8f5dcd1..a78318a 100644
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java
-@@ -36,8 +36,8 @@
- import org.apache.hadoop.metrics.spi.OutputRecord;
- import org.apache.hadoop.metrics.spi.AbstractMetricsContext.MetricMap;
- import org.apache.hadoop.metrics.spi.AbstractMetricsContext.TagMap;
--import org.mortbay.util.ajax.JSON;
--import org.mortbay.util.ajax.JSON.Output;
-+import org.eclipse.jetty.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON.Output;
-
- /**
- * A servlet to print out metrics data. By default, the servlet returns a
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java
-index 1c22ee6..90846d9 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java
-@@ -23,7 +23,7 @@
- import javax.xml.parsers.DocumentBuilder;
- import javax.xml.parsers.DocumentBuilderFactory;
-
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
- import org.w3c.dom.Node;
-@@ -107,4 +107,4 @@ public void testBadFormat() throws Exception {
- }
- assertEquals("", sw.toString());
- }
--}
-\ No newline at end of file
-+}
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
-index e862db4..7f73534 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
-@@ -32,7 +32,7 @@
- import org.junit.Assert;
- import org.junit.Before;
- import org.junit.Test;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-
- /**
- * <p>
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java
-index 81ca210..6ec331f 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java
-@@ -27,7 +27,7 @@
- import org.apache.hadoop.fs.Path;
- import org.apache.hadoop.fs.viewfs.ConfigUtil;
- import org.apache.hadoop.util.Shell;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-
-
- /**
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsTestSetup.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsTestSetup.java
-index 92bcbc3..3726e83 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsTestSetup.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsTestSetup.java
-@@ -26,7 +26,7 @@
- import org.apache.hadoop.fs.Path;
- import org.apache.hadoop.fs.viewfs.ConfigUtil;
- import org.apache.hadoop.util.Shell;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-
-
- /**
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestGlobalFilter.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestGlobalFilter.java
-index 0e4a1ca..e31adff 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestGlobalFilter.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestGlobalFilter.java
-@@ -22,6 +22,7 @@
- import java.io.InputStreamReader;
- import java.net.URL;
- import java.net.URLConnection;
-+import java.util.HashMap;
- import java.util.Set;
- import java.util.TreeSet;
-
-@@ -75,7 +76,7 @@ public Initializer() {}
-
- @Override
- public void initFilter(FilterContainer container, Configuration conf) {
-- container.addGlobalFilter("recording", RecordingFilter.class.getName(), null);
-+ container.addGlobalFilter("recording", RecordingFilter.class.getName(), new HashMap<String,String>(0));
- }
- }
- }
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpCookieFlag.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpCookieFlag.java
-index c0aaf64..a29e275 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpCookieFlag.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpCookieFlag.java
-@@ -37,6 +37,7 @@ import java.net.URI;
- import java.net.URL;
- import java.security.GeneralSecurityException;
- import java.net.HttpCookie;
-+import java.util.HashMap;
- import java.util.List;
-
- public class TestHttpCookieFlag {
-@@ -70,7 +71,7 @@ public void destroy() {
- @Override
- public void initFilter(FilterContainer container, Configuration conf) {
- container.addFilter("DummyAuth", DummyAuthenticationFilter.class
-- .getName(), null);
-+ .getName(), new HashMap<String,String>(0));
- }
- }
-
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpRequestLog.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpRequestLog.java
-index 23e0d3e..24be3fe 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpRequestLog.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpRequestLog.java
-@@ -19,8 +19,8 @@
-
- import org.apache.log4j.Logger;
- import org.junit.Test;
--import org.mortbay.jetty.NCSARequestLog;
--import org.mortbay.jetty.RequestLog;
-+import org.eclipse.jetty.server.NCSARequestLog;
-+import org.eclipse.jetty.server.RequestLog;
-
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertNotNull;
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestPathFilter.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestPathFilter.java
-index 09f31df..be80795 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestPathFilter.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestPathFilter.java
-@@ -22,6 +22,7 @@
- import java.io.InputStreamReader;
- import java.net.URL;
- import java.net.URLConnection;
-+import java.util.HashMap;
- import java.util.Set;
- import java.util.TreeSet;
-
-@@ -75,7 +76,7 @@ public Initializer() {}
-
- @Override
- public void initFilter(FilterContainer container, Configuration conf) {
-- container.addFilter("recording", RecordingFilter.class.getName(), null);
-+ container.addFilter("recording", RecordingFilter.class.getName(), new HashMap<String,String>(0));
- }
- }
- }
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestServletFilter.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestServletFilter.java
-index 6b17ccc..8f354d3 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestServletFilter.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestServletFilter.java
-@@ -22,6 +22,7 @@
- import java.io.InputStreamReader;
- import java.net.URL;
- import java.net.URLConnection;
-+import java.util.HashMap;
- import java.util.Random;
-
- import javax.servlet.Filter;
-@@ -74,7 +75,7 @@ public Initializer() {}
-
- @Override
- public void initFilter(FilterContainer container, Configuration conf) {
-- container.addFilter("simple", SimpleFilter.class.getName(), null);
-+ container.addFilter("simple", SimpleFilter.class.getName(), new HashMap<String,String>(0));
- }
- }
- }
-@@ -157,7 +158,7 @@ public Initializer() {
- }
-
- public void initFilter(FilterContainer container, Configuration conf) {
-- container.addFilter("simple", ErrorFilter.class.getName(), null);
-+ container.addFilter("simple", ErrorFilter.class.getName(), new HashMap<String,String>(0));
- }
- }
- }
-@@ -173,8 +174,7 @@ public void testServletFilterWhenInitThrowsException() throws Exception {
- http.start();
- fail("expecting exception");
- } catch (IOException e) {
-- assertTrue(e.getMessage().contains(
-- "Problem in starting http server. Server handlers failed"));
-+ assertTrue(e.getMessage().toLowerCase().contains("problem"));
- }
- }
-
-@@ -189,7 +189,7 @@ public void testContextSpecificServletFilterWhenInitThrowsException()
- HttpServer2 http = createTestServer(conf);
- HttpServer2.defineFilter(http.webAppContext,
- "ErrorFilter", ErrorFilter.class.getName(),
-- null, null);
-+ new HashMap<String,String>(0), null);
- try {
- http.start();
- fail("expecting exception");
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/resource/JerseyResource.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/resource/JerseyResource.java
-index f1313e2..52ea9b9 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/resource/JerseyResource.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/resource/JerseyResource.java
-@@ -32,7 +32,7 @@
-
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- /**
- * A simple Jersey resource class TestHttpServer.
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics/TestMetricsServlet.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics/TestMetricsServlet.java
-index ec54f59..d289a03 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics/TestMetricsServlet.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics/TestMetricsServlet.java
-@@ -30,7 +30,7 @@
- import org.apache.hadoop.metrics.MetricsServlet.TagsMetricsPair;
- import org.apache.hadoop.metrics.spi.NoEmitMetricsContext;
- import org.apache.hadoop.metrics.spi.OutputRecord;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- public class TestMetricsServlet extends TestCase {
- MetricsContext nc1;
-diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
-index fe1284f..91c13a8 100644
---- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
-+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
-@@ -32,9 +32,9 @@ public void testFindContainingJar() {
- Assert.assertNotNull("Containing jar not found for Logger",
- containingJar);
- File jarFile = new File(containingJar);
-- Assert.assertTrue("Containing jar does not exist on file system",
-+ Assert.assertTrue("Containing jar does not exist on file system ",
- jarFile.exists());
-- Assert.assertTrue("Incorrect jar file" + containingJar,
-- jarFile.getName().matches("log4j.+[.]jar"));
-+ Assert.assertTrue("Incorrect jar file " + containingJar,
-+ jarFile.getName().matches("log4j.*[.]jar"));
- }
- }
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
-index d01a32f..d85405b 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
-+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
-@@ -45,7 +45,7 @@
- </httpfs.tomcat.dist.dir>
- <kerberos.realm>LOCALHOST</kerberos.realm>
- <test.exclude.kerberos.test>**/TestHttpFSWithKerberos.java</test.exclude.kerberos.test>
-- <tomcat.download.url>http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apa...</tomcat.download.url>
-+ <tomcat.download.url>http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apa...</tomcat.download.url>
- </properties>
-
- <dependencies>
-@@ -90,8 +90,8 @@
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
-@@ -128,16 +124,16 @@
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>servlet-api-2.5</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-webapp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
-@@ -158,16 +150,16 @@
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>servlet-api-2.5</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-webapp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
-index a425bdd..39c60f5 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
-+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
-@@ -1,7 +1,7 @@
- <?xml version='1.0' encoding='utf-8'?>
- <!--
-
-- All Rights Reserved.
-+ All Rights Reserved.
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
-@@ -23,16 +23,17 @@
- Documentation at /docs/config/server.html
- -->
- <Server port="${httpfs.admin.port}" shutdown="SHUTDOWN">
--
-+ <!-- Security listener. Documentation at /docs/config/listeners.html
-+ <Listener className="org.apache.catalina.security.SecurityListener" />
-+ -->
- <!--APR library loader. Documentation at /docs/apr.html -->
-- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"/>
-+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
- <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
-- <Listener className="org.apache.catalina.core.JasperListener"/>
-+ <Listener className="org.apache.catalina.core.JasperListener" />
- <!-- Prevent memory leaks due to use of particular java/javax APIs-->
-- <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
-- <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
-- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
-- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
-+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
-
- <!-- Global JNDI resources
- Documentation at /docs/jndi-resources-howto.html
-@@ -45,7 +46,7 @@
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-- pathname="conf/tomcat-users.xml"/>
-+ pathname="conf/tomcat-users.xml" />
- </GlobalNamingResources>
-
- <!-- A "Service" is a collection of one or more "Connectors" that share
-@@ -71,7 +72,7 @@
- -->
- <Connector port="${httpfs.http.port}" protocol="HTTP/1.1"
- connectionTimeout="20000"
-- redirectPort="8443"/>
-+ redirectPort="8443" />
- <!-- A "Connector" using the shared thread pool-->
- <!--
- <Connector executor="tomcatThreadPool"
-@@ -93,10 +94,10 @@
-
-
- <!-- An Engine represents the entry point (within Catalina) that processes
-- every request. The Engine implementation for Tomcat stand alone
-- analyzes the HTTP headers included with the request, and passes them
-- on to the appropriate Host (virtual host).
-- Documentation at /docs/config/engine.html -->
-+ every request. The Engine implementation for Tomcat stand alone
-+ analyzes the HTTP headers included with the request, and passes them
-+ on to the appropriate Host (virtual host).
-+ Documentation at /docs/config/engine.html -->
-
- <!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-@@ -110,26 +111,19 @@
- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
- -->
-
-- <!-- The request dumper valve dumps useful debugging information about
-- the request and response data received and sent by Tomcat.
-- Documentation at: /docs/config/valve.html -->
-- <!--
-- <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-- -->
-+ <!-- Use the LockOutRealm to prevent attempts to guess user passwords
-+ via a brute-force attack -->
-+ <Realm className="org.apache.catalina.realm.LockOutRealm">
-+ <!-- This Realm uses the UserDatabase configured in the global JNDI
-+ resources under the key "UserDatabase". Any edits
-+ that are performed against this UserDatabase are immediately
-+ available for use by the Realm. -->
-+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-+ resourceName="UserDatabase"/>
-+ </Realm>
-
-- <!-- This Realm uses the UserDatabase configured in the global JNDI
-- resources under the key "UserDatabase". Any edits
-- that are performed against this UserDatabase are immediately
-- available for use by the Realm. -->
-- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-- resourceName="UserDatabase"/>
--
-- <!-- Define the default virtual host
-- Note: XML Schema validation will not work with Xerces 2.2.
-- -->
-- <Host name="localhost" appBase="webapps"
-- unpackWARs="true" autoDeploy="true"
-- xmlValidation="false" xmlNamespaceAware="false">
-+ <Host name="localhost" appBase="webapps"
-+ unpackWARs="true" autoDeploy="true">
-
- <!-- SingleSignOn valve, share authentication between web applications
- Documentation at: /docs/config/valve.html -->
-@@ -138,11 +132,11 @@
- -->
-
- <!-- Access log processes all example.
-- Documentation at: /docs/config/valve.html -->
-- <!--
-+ Documentation at: /docs/config/valve.html
-+ Note: The pattern used is equivalent to using pattern="common" -->
- <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
-- prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
-- -->
-+ prefix="localhost_access_log." suffix=".txt"
-+ pattern="%h %l %u %t "%r" %s %b" />
-
- </Host>
- </Engine>
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java
-index d512897..b277973 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java
-@@ -46,8 +46,8 @@ import org.junit.Assert;
- import org.junit.Test;
- import org.junit.runner.RunWith;
- import org.junit.runners.Parameterized;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.webapp.WebAppContext;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.webapp.WebAppContext;
-
- import com.google.common.collect.Lists;
-
-@@ -108,7 +108,7 @@ private void createHttpFSServer() throws Exception {
- URL url = cl.getResource("webapp");
- WebAppContext context = new WebAppContext(url.getPath(), "/webhdfs");
- Server server = TestJettyHelper.getJettyServer();
-- server.addHandler(context);
-+ server.setHandler(context);
- server.start();
- }
-
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServer.java
-index 48cca42..f893127 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServer.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServer.java
-@@ -64,8 +64,8 @@ import org.apache.hadoop.test.TestJettyHelper;
- import org.json.simple.JSONObject;
- import org.json.simple.parser.JSONParser;
- import org.junit.Test;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.webapp.WebAppContext;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.webapp.WebAppContext;
-
- import com.google.common.collect.Maps;
- import java.util.Properties;
-@@ -157,7 +157,7 @@ private void createHttpFSServer(boolean addDelegationTokenAuthHandler)
- URL url = cl.getResource("webapp");
- WebAppContext context = new WebAppContext(url.getPath(), "/webhdfs");
- Server server = TestJettyHelper.getJettyServer();
-- server.addHandler(context);
-+ server.setHandler(context);
- server.start();
- if (addDelegationTokenAuthHandler) {
- HttpFSServerWebApp.get().setAuthority(TestJettyHelper.getAuthority());
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSWithKerberos.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSWithKerberos.java
-index 45ce8ed..6076b1f 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSWithKerberos.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSWithKerberos.java
-@@ -41,8 +41,8 @@
- import org.junit.After;
- import org.junit.Assert;
- import org.junit.Test;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.webapp.WebAppContext;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.webapp.WebAppContext;
-
- import java.io.File;
- import java.io.FileOutputStream;
-@@ -105,7 +105,7 @@ private void createHttpFSServer() throws Exception {
- URL url = cl.getResource("webapp");
- WebAppContext context = new WebAppContext(url.getPath(), "/webhdfs");
- Server server = TestJettyHelper.getJettyServer();
-- server.addHandler(context);
-+ server.setHandler(context);
- server.start();
- HttpFSServerWebApp.get().setAuthority(TestJettyHelper.getAuthority());
- }
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHFSTestCase.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHFSTestCase.java
-index eb2cdc6..3d13cf5 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHFSTestCase.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHFSTestCase.java
-@@ -39,8 +39,8 @@
- import org.apache.hadoop.fs.Path;
- import org.apache.hadoop.util.Time;
- import org.junit.Test;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.servlet.Context;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.servlet.ServletContextHandler;
-
- public class TestHFSTestCase extends HFSTestCase {
-
-@@ -165,11 +165,11 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
- @Test
- @TestJetty
- public void testJetty() throws Exception {
-- Context context = new Context();
-+ ServletContextHandler context = new ServletContextHandler();
- context.setContextPath("/");
- context.addServlet(MyServlet.class, "/bar");
- Server server = TestJettyHelper.getJettyServer();
-- server.addHandler(context);
-+ server.setHandler(context);
- server.start();
- URL url = new URL(TestJettyHelper.getJettyURL(), "/bar");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHTestCase.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHTestCase.java
-index 74d34ec..8b7223a 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHTestCase.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHTestCase.java
-@@ -34,8 +34,8 @@
-
- import org.apache.hadoop.util.Time;
- import org.junit.Test;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.servlet.Context;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.servlet.ServletContextHandler;
-
- public class TestHTestCase extends HTestCase {
-
-@@ -132,11 +132,11 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
- @Test
- @TestJetty
- public void testJetty() throws Exception {
-- Context context = new Context();
-+ ServletContextHandler context = new ServletContextHandler();
- context.setContextPath("/");
- context.addServlet(MyServlet.class, "/bar");
- Server server = TestJettyHelper.getJettyServer();
-- server.addHandler(context);
-+ server.setHandler(context);
- server.start();
- URL url = new URL(TestJettyHelper.getJettyURL(), "/bar");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestJettyHelper.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestJettyHelper.java
-index b0f14f4..fb81ab2 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestJettyHelper.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestJettyHelper.java
-@@ -29,9 +29,9 @@ import org.junit.Test;
- import org.junit.rules.MethodRule;
- import org.junit.runners.model.FrameworkMethod;
- import org.junit.runners.model.Statement;
--import org.mortbay.jetty.Connector;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.security.SslSelectChannelConnector;
-+import org.eclipse.jetty.server.Connector;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
-
- public class TestJettyHelper implements MethodRule {
- private boolean ssl;
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
-index 5ee5841..8b56730 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
-+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
-@@ -85,12 +85,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>compile</scope>
- </dependency>
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
-index 420e5d2..c134d71 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
-+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
-@@ -70,15 +70,26 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>compile</scope>
- </dependency>
-+ <dependency>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-util-ajax</artifactId>
-+ <scope>compile</scope>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-util</artifactId>
-+ </exclusion>
-+ </exclusions>
-+ </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
-@@ -136,11 +131,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>javax.servlet</groupId>
-- <artifactId>servlet-api</artifactId>
-- <scope>compile</scope>
-- </dependency>
-- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
-index 50b44f8..d5a91d3 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
-@@ -46,7 +46,7 @@
- import org.apache.hadoop.util.StringUtils;
- import org.apache.hadoop.util.Tool;
- import org.apache.hadoop.util.ToolRunner;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- import com.google.common.base.Preconditions;
- import com.google.common.collect.Maps;
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
-index fc85a5e..1610c8c 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
-@@ -202,7 +202,7 @@ import org.apache.hadoop.util.VersionInfo;
- import org.apache.hadoop.tracing.SpanReceiverHost;
- import org.apache.hadoop.tracing.SpanReceiverInfo;
- import org.apache.hadoop.tracing.TraceAdminProtocol;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- import com.google.common.annotations.VisibleForTesting;
- import com.google.common.base.Joiner;
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
-index 4232e00..3386dff 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
-@@ -289,7 +289,7 @@ import org.apache.log4j.Appender;
- import org.apache.log4j.AsyncAppender;
- import org.apache.log4j.Logger;
- import org.codehaus.jackson.map.ObjectMapper;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- import com.google.common.annotations.VisibleForTesting;
- import com.google.common.base.Charsets;
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/StreamFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
-index aa4ba5d..5b945ba 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
-@@ -39,7 +39,7 @@
- import org.apache.hadoop.io.IOUtils;
- import org.apache.hadoop.security.UserGroupInformation;
- import org.apache.hadoop.util.ServletUtil;
--import org.mortbay.jetty.InclusiveByteRange;
-+import org.eclipse.jetty.server.InclusiveByteRange;
-
- @InterfaceAudience.Private
- public class StreamFile extends DfsServlet {
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java
-index 3471848..b4e0202 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java
-@@ -34,7 +34,7 @@
- import org.junit.After;
- import org.junit.Before;
- import org.junit.Test;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- /**
- * Test {@link JournalNodeMXBean}
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java
-index db8f92e..79d9003 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java
-@@ -35,7 +35,7 @@ import org.apache.hadoop.hdfs.MiniDFSCluster;
- import org.apache.hadoop.metrics2.impl.ConfigBuilder;
- import org.apache.hadoop.metrics2.impl.TestMetricsConfig;
- import org.junit.Test;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- /**
- * Class for testing {@link NameNodeMXBean} implementation
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
-index d459d30..6327a83 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
-@@ -32,7 +32,7 @@ import org.apache.hadoop.io.nativeio.NativeIO.POSIX.NoMlockCacheManipulator;
- import org.apache.hadoop.util.VersionInfo;
- import org.codehaus.jackson.map.ObjectMapper;
- import org.junit.Test;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- import javax.management.MBeanServer;
- import javax.management.ObjectName;
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartupProgressServlet.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartupProgressServlet.java
-index 0f22e9a..bff549a 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartupProgressServlet.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartupProgressServlet.java
-@@ -36,7 +36,7 @@
- import org.apache.hadoop.hdfs.server.namenode.startupprogress.StartupProgress;
- import org.junit.Before;
- import org.junit.Test;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- public class TestStartupProgressServlet {
-
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java
-index f24b801..28d05b4 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java
-@@ -46,7 +46,7 @@
- import org.apache.hadoop.net.NetUtils;
- import org.junit.Test;
- import org.mockito.Mockito;
--import org.mortbay.jetty.InclusiveByteRange;
-+import org.eclipse.jetty.server.InclusiveByteRange;
-
- /*
- * Mock input stream class that always outputs the current position of the stream.
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/test/MiniDFSClusterManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/test/MiniDFSClusterManager.java
-index 7029f42..c7023c9 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/test/MiniDFSClusterManager.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/test/MiniDFSClusterManager.java
-@@ -38,7 +38,7 @@
- import org.apache.hadoop.hdfs.HdfsConfiguration;
- import org.apache.hadoop.hdfs.MiniDFSCluster;
- import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- /**
- * This class drives the creation of a mini-cluster on the local machine. By
-diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/JobEndNotifier.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/JobEndNotifier.java
-index 981e6ff..7864756 100644
---- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/JobEndNotifier.java
-+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/JobEndNotifier.java
-@@ -30,7 +30,8 @@
- import org.apache.hadoop.mapred.JobContext;
- import org.apache.hadoop.mapreduce.MRJobConfig;
- import org.apache.hadoop.mapreduce.v2.api.records.JobReport;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-+import org.eclipse.jetty.util.log.Logger;
-
- /**
- * <p>This class handles job end notification. Submitters of jobs can choose to
-@@ -48,6 +49,7 @@ import org.eclipse.jetty.util.log.Log;
- public class JobEndNotifier implements Configurable {
- private static final String JOB_ID = "$jobId";
- private static final String JOB_STATUS = "$jobStatus";
-+ private static Logger log = Log.getLogger(JobEndNotifier.class);
-
- private Configuration conf;
- protected String userUrl;
-@@ -101,10 +103,10 @@ public class JobEndNotifier implements Configurable {
- int port = Integer.parseInt(portConf);
- proxyToUse = new Proxy(proxyType,
- new InetSocketAddress(hostname, port));
-- Log.info("Job end notification using proxy type \"" + proxyType +
-+ log.info("Job end notification using proxy type \"" + proxyType +
- "\" hostname \"" + hostname + "\" and port \"" + port + "\"");
- } catch(NumberFormatException nfe) {
-- Log.warn("Job end notification couldn't parse configured proxy's port "
-+ log.warn("Job end notification couldn't parse configured proxy's port "
- + portConf + ". Not going to use a proxy");
- }
- }
-@@ -121,23 +123,23 @@ public class JobEndNotifier implements Configurable {
- protected boolean notifyURLOnce() {
- boolean success = false;
- try {
-- Log.info("Job end notification trying " + urlToNotify);
-+ log.info("Job end notification trying " + urlToNotify);
- HttpURLConnection conn =
- (HttpURLConnection) urlToNotify.openConnection(proxyToUse);
- conn.setConnectTimeout(timeout);
- conn.setReadTimeout(timeout);
- conn.setAllowUserInteraction(false);
- if(conn.getResponseCode() != HttpURLConnection.HTTP_OK) {
-- Log.warn("Job end notification to " + urlToNotify +" failed with code: "
-+ log.warn("Job end notification to " + urlToNotify +" failed with code: "
- + conn.getResponseCode() + " and message \"" + conn.getResponseMessage()
- +"\"");
- }
- else {
- success = true;
-- Log.info("Job end notification to " + urlToNotify + " succeeded");
-+ log.info("Job end notification to " + urlToNotify + " succeeded");
- }
- } catch(IOException ioe) {
-- Log.warn("Job end notification to " + urlToNotify + " failed", ioe);
-+ log.warn("Job end notification to " + urlToNotify + " failed", ioe);
- }
- return success;
- }
-@@ -152,7 +154,7 @@ public class JobEndNotifier implements Configurable {
- throws InterruptedException {
- // Do we need job-end notification?
- if (userUrl == null) {
-- Log.info("Job end notification URL not set, skipping.");
-+ log.info("Job end notification URL not set, skipping.");
- return;
- }
-
-@@ -168,23 +170,23 @@ public class JobEndNotifier implements Configurable {
- try {
- urlToNotify = new URL(userUrl);
- } catch (MalformedURLException mue) {
-- Log.warn("Job end notification couldn't parse " + userUrl, mue);
-+ log.warn("Job end notification couldn't parse " + userUrl, mue);
- return;
- }
-
- // Send notification
- boolean success = false;
- while (numTries-- > 0 && !success) {
-- Log.info("Job end notification attempts left " + numTries);
-+ log.info("Job end notification attempts left " + numTries);
- success = notifyURLOnce();
- if (!success) {
- Thread.sleep(waitInterval);
- }
- }
- if (!success) {
-- Log.warn("Job end notification failed to notify : " + urlToNotify);
-+ log.warn("Job end notification failed to notify : " + urlToNotify);
- } else {
-- Log.info("Job end notification succeeded for " + jobReport.getJobId());
-+ log.info("Job end notification succeeded for " + jobReport.getJobId());
- }
- }
- }
-diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java
-index 8891ec7..1dd369a 100644
---- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java
-+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java
-@@ -136,7 +136,7 @@ public void testJobsQueryStateNone() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 1, json.length());
-- assertEquals("jobs is not null", JSONObject.NULL, json.get("jobs"));
-+ assertEquals("jobs is not None", 0, json.getJSONObject("jobs").length());
- }
-
- @Test
-@@ -202,7 +202,7 @@ public void testJobsQueryUserNone() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 1, json.length());
-- assertEquals("jobs is not null", JSONObject.NULL, json.get("jobs"));
-+ assertEquals("jobs is not None", 0, json.getJSONObject("jobs").length());
- }
-
- @Test
-@@ -287,7 +287,7 @@ public void testJobsQueryQueueNonExist() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 1, json.length());
-- assertEquals("jobs is not null", JSONObject.NULL, json.get("jobs"));
-+ assertEquals("jobs is not None", 0, json.getJSONObject("jobs").length());
- }
-
- @Test
-@@ -319,7 +319,7 @@ public void testJobsQueryStartTimeBegin() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 1, json.length());
-- assertEquals("jobs is not null", JSONObject.NULL, json.get("jobs"));
-+ assertEquals("jobs is not None", 0, json.getJSONObject("jobs").length());
- }
-
- @Test
-@@ -639,7 +639,7 @@ public void testJobsQueryFinishTimeEnd() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 1, json.length());
-- assertEquals("jobs is not null", JSONObject.NULL, json.get("jobs"));
-+ assertEquals("jobs is not None", 0, json.getJSONObject("jobs").length());
- }
-
- @Test
-diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java
-index d2ea74e..d986fdc 100644
---- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java
-+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java
-@@ -18,9 +18,9 @@
-
- package org.apache.hadoop.mapred;
-
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.servlet.Context;
--import org.mortbay.jetty.servlet.ServletHolder;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.servlet.ServletContextHandler;
-+import org.eclipse.jetty.servlet.ServletHolder;
- import org.apache.hadoop.fs.Path;
- import org.apache.hadoop.fs.FileSystem;
- import org.apache.hadoop.io.Text;
-@@ -69,7 +69,7 @@ private void startHttpServer() throws Exception {
- }
- webServer = new Server(0);
-
-- Context context = new Context(webServer, contextPath);
-+ ServletContextHandler context = new ServletContextHandler(webServer, contextPath);
-
- // create servlet handler
- context.addServlet(new ServletHolder(new NotificationServlet()),
-diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/MiniHadoopClusterManager.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/MiniHadoopClusterManager.java
-index 2e8ba5e..3cc73b5 100644
---- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/MiniHadoopClusterManager.java
-+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/MiniHadoopClusterManager.java
-@@ -45,7 +45,7 @@
- import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig;
- import org.apache.hadoop.yarn.conf.YarnConfiguration;
- import org.apache.hadoop.yarn.server.MiniYARNCluster;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- /**
- * This class drives the creation of a mini-cluster on the local machine. By
-diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
-index c803a7f..393d385 100644
---- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
-+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
-@@ -118,6 +118,7 @@ import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
- import org.jboss.netty.handler.codec.frame.TooLongFrameException;
- import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
- import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
-+import org.jboss.netty.handler.codec.http.HttpHeaders;
- import org.jboss.netty.handler.codec.http.HttpRequest;
- import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
- import org.jboss.netty.handler.codec.http.HttpResponse;
-@@ -127,7 +127,6 @@ import org.jboss.netty.handler.codec.http.QueryStringDecoder;
- import org.jboss.netty.handler.ssl.SslHandler;
- import org.jboss.netty.handler.stream.ChunkedWriteHandler;
- import org.jboss.netty.util.CharsetUtil;
--import org.mortbay.jetty.HttpHeaders;
-
- import com.google.common.annotations.VisibleForTesting;
- import com.google.common.base.Charsets;
-@@ -830,9 +830,9 @@ public class ShuffleHandler extends AuxiliaryService {
- }
- // Check whether the shuffle version is compatible
- if (!ShuffleHeader.DEFAULT_HTTP_HEADER_NAME.equals(
-- request.getHeader(ShuffleHeader.HTTP_HEADER_NAME))
-+ request.headers().get(ShuffleHeader.HTTP_HEADER_NAME))
- || !ShuffleHeader.DEFAULT_HTTP_HEADER_VERSION.equals(
-- request.getHeader(ShuffleHeader.HTTP_HEADER_VERSION))) {
-+ request.headers().get(ShuffleHeader.HTTP_HEADER_VERSION))) {
- sendError(ctx, "Incompatible shuffle request version", BAD_REQUEST);
- }
- final Map<String,List<String>> q =
-@@ -1044,12 +1044,12 @@ public class ShuffleHandler extends AuxiliaryService {
- boolean keepAliveParam, long contentLength) {
- if (!connectionKeepAliveEnabled && !keepAliveParam) {
- LOG.info("Setting connection close header...");
-- response.setHeader(HttpHeaders.CONNECTION, CONNECTION_CLOSE);
-+ response.headers().set(HttpHeaders.Names.CONNECTION, CONNECTION_CLOSE);
- } else {
-- response.setHeader(HttpHeaders.CONTENT_LENGTH,
-+ response.headers().set(HttpHeaders.Names.CONTENT_LENGTH,
- String.valueOf(contentLength));
-- response.setHeader(HttpHeaders.CONNECTION, HttpHeaders.KEEP_ALIVE);
-- response.setHeader(HttpHeaders.KEEP_ALIVE, "timeout="
-+ response.headers().set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE);
-+ response.headers().set(HttpHeaders.Values.KEEP_ALIVE, "timeout="
- + connectionKeepAliveTimeOut);
- LOG.info("Content Length in shuffle : " + contentLength);
- }
-@@ -1077,7 +1077,7 @@ public class ShuffleHandler extends AuxiliaryService {
- String enc_str = SecureShuffleUtils.buildMsgFrom(requestUri);
- // hash from the fetcher
- String urlHashStr =
-- request.getHeader(SecureShuffleUtils.HTTP_HEADER_URL_HASH);
-+ request.headers().get(SecureShuffleUtils.HTTP_HEADER_URL_HASH);
- if (urlHashStr == null) {
- LOG.info("Missing header hash for " + appid);
- throw new IOException("fetcher cannot be authenticated");
-@@ -1093,11 +1093,11 @@ public class ShuffleHandler extends AuxiliaryService {
- String reply =
- SecureShuffleUtils.generateHash(urlHashStr.getBytes(Charsets.UTF_8),
- tokenSecret);
-- response.setHeader(SecureShuffleUtils.HTTP_HEADER_REPLY_URL_HASH, reply);
-+ response.headers().set(SecureShuffleUtils.HTTP_HEADER_REPLY_URL_HASH, reply);
- // Put shuffle version into http header
-- response.setHeader(ShuffleHeader.HTTP_HEADER_NAME,
-+ response.headers().set(ShuffleHeader.HTTP_HEADER_NAME,
- ShuffleHeader.DEFAULT_HTTP_HEADER_NAME);
-- response.setHeader(ShuffleHeader.HTTP_HEADER_VERSION,
-+ response.headers().set(ShuffleHeader.HTTP_HEADER_VERSION,
- ShuffleHeader.DEFAULT_HTTP_HEADER_VERSION);
- if (LOG.isDebugEnabled()) {
- int len = reply.length();
-@@ -1163,11 +1163,11 @@ public class ShuffleHandler extends AuxiliaryService {
- protected void sendError(ChannelHandlerContext ctx, String message,
- HttpResponseStatus status) {
- HttpResponse response = new DefaultHttpResponse(HTTP_1_1, status);
-- response.setHeader(CONTENT_TYPE, "text/plain; charset=UTF-8");
-+ response.headers().set(CONTENT_TYPE, "text/plain; charset=UTF-8");
- // Put shuffle version into http header
-- response.setHeader(ShuffleHeader.HTTP_HEADER_NAME,
-+ response.headers().set(ShuffleHeader.HTTP_HEADER_NAME,
- ShuffleHeader.DEFAULT_HTTP_HEADER_NAME);
-- response.setHeader(ShuffleHeader.HTTP_HEADER_VERSION,
-+ response.headers().set(ShuffleHeader.HTTP_HEADER_VERSION,
- ShuffleHeader.DEFAULT_HTTP_HEADER_VERSION);
- response.setContent(
- ChannelBuffers.copiedBuffer(message, CharsetUtil.UTF_8));
-diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java
-index 420c428..3a3257e 100644
---- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java
-+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java
-@@ -94,7 +94,6 @@ import org.junit.Test;
- import org.mockito.invocation.InvocationOnMock;
- import org.mockito.stubbing.Answer;
- import org.mockito.Mockito;
--import org.mortbay.jetty.HttpHeaders;
-
- public class TestShuffleHandler {
- static final long MiB = 1024 * 1024;
-diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
-index 8ae5809..b7da2bc 100644
---- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
-+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
-@@ -43,8 +43,8 @@
- <artifactId>avro</artifactId>
- <exclusions>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
-diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml
-index 8f1d2b0..465c2df 100644
---- a/hadoop-mapreduce-project/pom.xml
-+++ b/hadoop-mapreduce-project/pom.xml
-@@ -52,8 +52,8 @@
- <artifactId>avro</artifactId>
- <exclusions>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
-@@ -136,6 +128,12 @@
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>asm</groupId>
-+ <artifactId>asm</artifactId>
-+ </exclusion>
-+ </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
-diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
-index b315e2b..e9b072d 100644
---- a/hadoop-project/pom.xml
-+++ b/hadoop-project/pom.xml
-@@ -79,7 +79,7 @@
- <curator.version>2.7.1</curator.version>
- <findbugs.version>3.0.0</findbugs.version>
-
-- <tomcat.version>6.0.48</tomcat.version>
-+ <tomcat.version>7.0.37</tomcat.version>
-
- <!-- define the Java language version used by the compiler -->
- <javac.version>1.7</javac.version>
-@@ -455,28 +455,27 @@
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
-- <version>2.5</version>
-+ <version>3.1.0</version>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-- <version>6.1.26</version>
-- <exclusions>
-- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>servlet-api</artifactId>
-- </exclusion>
-- </exclusions>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
-+ <version>8.1</version>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-servlet</artifactId>
-+ <version>8.1</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
-- <version>6.1.26</version>
-+ <version>8.1</version>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty-sslengine</artifactId>
-- <version>6.1.26</version>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-webapp</artifactId>
-+ <version>8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
-@@ -484,15 +484,15 @@
- <version>7.0.55</version>
- </dependency>
- <dependency>
-- <groupId>javax.servlet.jsp</groupId>
-- <artifactId>jsp-api</artifactId>
-- <version>2.1</version>
-+ <groupId>org.glassfish.web</groupId>
-+ <artifactId>javax.servlet.jsp</artifactId>
-+ <version>2.2.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.servlet</artifactId>
-- <version>3.1</version>
-+ <version>8.1.14.v20131031</version>
- </dependency>
-
- <dependency>
-@@ -531,6 +531,17 @@
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>asm</groupId>
-+ <artifactId>asm</artifactId>
-+ </exclusion>
-+ </exclusions>
-+ </dependency>
-+ <dependency>
-+ <groupId>com.sun.jersey</groupId>
-+ <artifactId>jersey-servlet</artifactId>
-+ <version>${jersey.version}</version>
- </dependency>
-
- <dependency>
-@@ -592,11 +592,6 @@
- <version>2.4</version>
- </dependency>
-
-- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty-servlet-tester</artifactId>
-- <version>6.1.26</version>
-- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
-diff --git a/hadoop-tools/hadoop-sls/pom.xml b/hadoop-tools/hadoop-sls/pom.xml
-index 6166725..e0d3ee7 100644
---- a/hadoop-tools/hadoop-sls/pom.xml
-+++ b/hadoop-tools/hadoop-sls/pom.xml
-@@ -55,18 +55,12 @@
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- <scope>provided</scope>
-- <exclusions>
-- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>servlet-api</artifactId>
-- </exclusion>
-- </exclusions>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>provided</scope>
- </dependency>
-diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
-index 123ccea..e961e58 100644
---- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
-+++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
-@@ -34,10 +34,11 @@ import org.apache.hadoop.classification.InterfaceAudience.Private;
- import org.apache.hadoop.classification.InterfaceStability.Unstable;
- import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event
- .SchedulerEventType;
--import org.mortbay.jetty.Handler;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.handler.AbstractHandler;
--import org.mortbay.jetty.Request;
-+import org.eclipse.jetty.server.Handler;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.server.Request;
-+import org.eclipse.jetty.server.handler.AbstractHandler;
-+import org.eclipse.jetty.server.handler.ResourceHandler;
-
- import org.apache.hadoop.yarn.sls.SLSRunner;
- import org.apache.hadoop.yarn.sls.scheduler.FairSchedulerMetrics;
-@@ -47,7 +48,6 @@ import com.codahale.metrics.Counter;
- import com.codahale.metrics.Gauge;
- import com.codahale.metrics.Histogram;
- import com.codahale.metrics.MetricRegistry;
--import org.mortbay.jetty.handler.ResourceHandler;
-
- @Private
- @Unstable
-@@ -108,8 +108,9 @@ public void start() throws Exception {
-
- Handler handler = new AbstractHandler() {
- @Override
-- public void handle(String target, HttpServletRequest request,
-- HttpServletResponse response, int dispatch) {
-+ public void handle(String target, Request baseRequest,
-+ HttpServletRequest request,
-+ HttpServletResponse response) {
- try{
- // timeunit
- int timeunit = 1000; // second, divide millionsecond / 1000
-@@ -131,7 +132,7 @@ public void handle(String target, HttpServletRequest request,
- // js/css request
- if (target.startsWith("/js") || target.startsWith("/css")) {
- response.setCharacterEncoding("utf-8");
-- staticHandler.handle(target, request, response, dispatch);
-+ staticHandler.handle(target, baseRequest, request, response);
- } else
- // json request
- if (target.equals("/simulateMetrics")) {
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
-index 08e71c1..461c43c 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
-@@ -93,7 +93,7 @@ import org.junit.BeforeClass;
- import org.junit.Test;
- import org.mockito.invocation.InvocationOnMock;
- import org.mockito.stubbing.Answer;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-
- import com.google.common.base.Supplier;
-
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
-index 1efb54c..1b3463b 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
-@@ -69,7 +69,7 @@ import org.apache.hadoop.yarn.util.Records;
- import org.junit.Assert;
- import org.junit.Before;
- import org.junit.Test;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-
- import com.google.common.collect.ImmutableSet;
-
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
-index a19a78c..83aa759 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
-@@ -67,7 +67,7 @@
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </dependency>
- <dependency>
-@@ -163,6 +163,12 @@
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>asm</groupId>
-+ <artifactId>asm</artifactId>
-+ </exclusion>
-+ </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
-index f8c6f55..71df06b 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
-@@ -266,7 +266,8 @@ public void setup() {
- server.setAttribute(entry.getKey(), entry.getValue());
- }
- HttpServer2.defineFilter(server.getWebAppContext(), "guice",
-- GuiceFilter.class.getName(), null, new String[] { "/*" });
-+ GuiceFilter.class.getName(), new HashMap<String,String>(0),
-+ new String[] { "/*" });
-
- webapp.setConf(conf);
- webapp.setHttpServer(server);
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
-index 0fbafd2..5fe4206 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
-@@ -99,7 +95,7 @@
- <artifactId>jersey-client</artifactId>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </dependency>
- <dependency>
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java
-index 7d2948e..81e51c3 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerLogsPage.java
-@@ -43,6 +43,7 @@
- import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
- import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.PRE;
- import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
-+import org.eclipse.jetty.util.log.Log;
-
- import com.google.inject.Inject;
-
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
-index bfb0e87..f9fac8e 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
-@@ -124,7 +124,7 @@ import org.junit.Assert;
- import org.junit.Test;
- import org.mockito.ArgumentCaptor;
- import org.mockito.Mockito;
--import org.mortbay.util.MultiException;
-+import org.eclipse.jetty.util.MultiException;
-
- import com.google.common.base.Supplier;
-
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java
-index 72c1f6f..d272614 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java
-@@ -176,7 +176,7 @@ public void testNodeAppsNone() throws JSONException, Exception {
- .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
-- assertEquals("apps isn't NULL", JSONObject.NULL, json.get("apps"));
-+ assertEquals("apps isn't None",0,json.getJSONObject("apps").length());
- }
-
- private HashMap<String, String> addAppContainers(Application app)
-@@ -286,7 +286,7 @@ public void testNodeAppsUserNone() throws JSONException, Exception {
- .get(ClientResponse.class);
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
-- assertEquals("apps is not null", JSONObject.NULL, json.get("apps"));
-+ assertEquals("apps is not None", 0, json.getJSONObject("apps").length());
- }
-
- @Test
-@@ -368,7 +368,7 @@ public void testNodeAppsStateNone() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
-
-- assertEquals("apps is not null", JSONObject.NULL, json.get("apps"));
-+ assertEquals("apps is not None", 0, json.getJSONObject("apps").length());
- }
-
- @Test
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java
-index 29c9253..56ca16e 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java
-@@ -183,7 +183,7 @@ public void testNodeContainersNone() throws JSONException, Exception {
- .get(ClientResponse.class);
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
-- assertEquals("apps isn't NULL", JSONObject.NULL, json.get("containers"));
-+ assertEquals("apps isn't None", 0, json.getJSONObject("containers").length());
- }
-
- private HashMap<String, String> addAppContainers(Application app)
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
-index 3e78e02..358a534 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
-@@ -161,7 +157,7 @@
- <artifactId>jersey-client</artifactId>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </dependency>
- <dependency>
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMNMInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMNMInfo.java
-index ef4a0d4..f96879e 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMNMInfo.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMNMInfo.java
-@@ -33,7 +33,7 @@
- import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
- import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
- import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNodeReport;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- /**
- * JMX bean listing statuses of all node managers.
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockNM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockNM.java
-index 1dcac06..6ecc80d 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockNM.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockNM.java
-@@ -43,7 +43,7 @@
- import org.apache.hadoop.yarn.server.utils.BuilderUtils;
- import org.apache.hadoop.yarn.util.Records;
- import org.apache.hadoop.yarn.util.YarnVersionInfo;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Log;
-
- public class MockNM {
-
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java
-index 45b3803..2b79c2c 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java
-@@ -376,7 +376,7 @@ public void testAppsQueryStateNone() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 1, json.length());
-- assertEquals("apps is not null", JSONObject.NULL, json.get("apps"));
-+ assertEquals("apps is not None", 0, json.getJSONObject("apps").length());
- rm.stop();
- }
-
-@@ -491,7 +491,7 @@ public void testAppsQueryFinalStatusNone() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 1, json.length());
-- assertEquals("apps is not null", JSONObject.NULL, json.get("apps"));
-+ assertEquals("apps is not None", 0, json.getJSONObject("apps").length());
- rm.stop();
- }
-
-@@ -667,7 +667,7 @@ public void testAppsQueryStartEnd() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 1, json.length());
-- assertEquals("apps is not null", JSONObject.NULL, json.get("apps"));
-+ assertEquals("apps is not None", 0, json.getJSONObject("apps").length());
- rm.stop();
- }
-
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java
-index da2e2b1..77cdfa9 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java
-@@ -204,7 +204,7 @@ public void testNodesQueryStateNone() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 1, json.length());
-- assertEquals("nodes is not null", JSONObject.NULL, json.get("nodes"));
-+ assertEquals("nodes is not None", 0, json.getJSONObject("nodes").length());
- }
-
- @Test
-@@ -343,7 +343,7 @@ public void testNodesQueryHealthyFalse() throws JSONException, Exception {
- assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
- JSONObject json = response.getEntity(JSONObject.class);
- assertEquals("incorrect number of elements", 1, json.length());
-- assertEquals("nodes is not null", JSONObject.NULL, json.get("nodes"));
-+ assertEquals("nodes is not None", 0, json.getJSONObject("nodes").length());
- }
-
- public void testNodesHelper(String path, String media) throws JSONException,
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml
-index 10f243c..af23544 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml
-@@ -109,8 +105,8 @@
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java
-index 1be0115..420a41c 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java
-@@ -57,9 +57,10 @@ import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
- import org.junit.AfterClass;
- import org.junit.BeforeClass;
- import org.junit.Test;
--import org.mortbay.jetty.Server;
--import org.mortbay.jetty.servlet.Context;
--import org.mortbay.jetty.servlet.ServletHolder;
-+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.servlet.ServletContextHandler;
-+import org.eclipse.jetty.servlet.ServletHolder;
-+
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
-
-@@ -81,7 +82,7 @@ public class TestWebAppProxyServlet {
- @BeforeClass
- public static void start() throws Exception {
- server = new Server(0);
-- Context context = new Context();
-+ ServletContextHandler context = new ServletContextHandler();
- context.setContextPath("/foo");
- server.setHandler(context);
- context.addServlet(new ServletHolder(TestServlet.class), "/bar");
-diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml
-index c479b67..a065485 100644
---- a/hadoop-common-project/hadoop-kms/pom.xml
-+++ b/hadoop-common-project/hadoop-kms/pom.xml
-@@ -84,11 +84,6 @@
- <scope>provided</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-- <scope>test</scope>
-- </dependency>
-- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>compile</scope>
-@@ -122,20 +117,20 @@
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jetty</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-webapp</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>jsp-api-2.1</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-servlet</artifactId>
- </exclusion>
- <exclusion>
-- <groupId>org.mortbay.jetty</groupId>
-- <artifactId>servlet-api-2.5</artifactId>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
-@@ -178,7 +173,7 @@
- <scope>compile</scope>
- </dependency>
- <dependency>
-- <groupId>org.mortbay.jetty</groupId>
-+ <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>compile</scope>
- </dependency>
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java
-index d2cca0e..637cfd6 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java
-@@ -31,7 +31,8 @@ import org.apache.hadoop.hdfs.server.namenode.snapshot.DirectoryWithSnapshotFeat
- import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot;
-
- import com.google.common.base.Preconditions;
--import org.mortbay.log.Log;
-+import org.eclipse.jetty.util.log.Logger;
-+import org.eclipse.jetty.util.log.Log;
-
- /**
- * An anonymous reference to an inode.
-@@ -567,7 +568,8 @@ public abstract class INodeReference extends INode {
- try {
- ref.addSpaceConsumed(counts.negation(), true);
- } catch (QuotaExceededException e) {
-- Log.warn("Should not have QuotaExceededException");
-+ Logger log = Log.getLogger(INodeReference.class);
-+ log.warn("Should not have QuotaExceededException");
- }
- }
-
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java
-index 0d32758..658fa3d 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java
-@@ -63,7 +63,7 @@ import org.apache.http.client.utils.URIBuilder;
-
- import com.google.common.annotations.VisibleForTesting;
- import com.google.common.collect.Lists;
--import org.mortbay.jetty.EofException;
-+import org.eclipse.jetty.io.EofException;
-
- /**
- * This class provides fetching a specified file from the NameNode.
-diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
-index 5dc0963..63c9647 100644
---- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
-+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java
-@@ -62,7 +62,7 @@ import org.apache.hadoop.fs.azure.metrics.ErrorMetricUpdater;
- import org.apache.hadoop.fs.azure.metrics.ResponseReceivedMetricUpdater;
- import org.apache.hadoop.fs.permission.FsPermission;
- import org.apache.hadoop.fs.permission.PermissionStatus;
--import org.mortbay.util.ajax.JSON;
-+import org.eclipse.jetty.util.ajax.JSON;
-
- import com.google.common.annotations.VisibleForTesting;
- import com.microsoft.azure.storage.CloudStorageAccount;
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
-index 7fb900d..27582fb 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
-@@ -55,8 +55,8 @@ import org.apache.hadoop.yarn.server.timeline.webapp.CrossOriginFilterInitialize
- import org.apache.hadoop.yarn.webapp.WebApp;
- import org.apache.hadoop.yarn.webapp.WebApps;
- import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
--import org.mortbay.jetty.servlet.FilterHolder;
--import org.mortbay.jetty.webapp.WebAppContext;
-+import org.eclipse.jetty.servlet.FilterHolder;
-+import org.eclipse.jetty.webapp.WebAppContext;
-
- import com.google.common.annotations.VisibleForTesting;
-
-diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SslSelectChannelConnectorSecure.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SslSelectChannelConnectorSecure.java
-index 7ff2292..b6c9f6f 100644
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SslSelectChannelConnectorSecure.java
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SslSelectChannelConnectorSecure.java
-@@ -26,7 +26,8 @@ import javax.net.ssl.SSLEngine;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.apache.hadoop.classification.InterfaceAudience;
--import org.mortbay.jetty.security.SslSelectChannelConnector;
-+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
-+import java.nio.channels.SocketChannel;
-
- /**
- * This subclass of the Jetty SslSelectChannelConnector exists solely to
-@@ -47,8 +48,8 @@ public class SslSelectChannelConnectorSecure extends SslSelectChannelConnector {
- * Disable SSLv3 protocol.
- */
- @Override
-- protected SSLEngine createSSLEngine() throws IOException {
-- SSLEngine engine = super.createSSLEngine();
-+ protected SSLEngine createSSLEngine(SocketChannel channel) throws IOException {
-+ SSLEngine engine = super.createSSLEngine(channel);
- ArrayList<String> nonSSLProtocols = new ArrayList<String>();
- for (String p : engine.getEnabledProtocols()) {
- if (!p.contains("SSLv3")) {
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
-index 5ac65cc..d73721a 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
-@@ -40,6 +40,10 @@
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-+ <dependency>
-+ <groupId>org.eclipse.jetty</groupId>
-+ <artifactId>jetty-util</artifactId>
-+ </dependency>
- <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-guava.patch b/hadoop-guava.patch
deleted file mode 100644
index f7a3eac..0000000
--- a/hadoop-guava.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
-index b315e2b..9ad8bcd 100644
---- a/hadoop-project/pom.xml
-+++ b/hadoop-project/pom.xml
-@@ -400,7 +400,7 @@
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
-- <version>11.0.2</version>
-+ <version>20.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
-diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
-index d55c80b..4505aa9 100644
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
-@@ -67,7 +67,7 @@ class XAttrCommands extends FsCommand {
- "0x and 0s, respectively.\n" +
- "<path>: The file or directory.\n";
- private final static Function<String, XAttrCodec> enValueOfFunc =
-- Enums.valueOfFunction(XAttrCodec.class);
-+ Enums.stringConverter(XAttrCodec.class);
-
- private String name = null;
- private boolean dump = false;
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
-index 8656ae9..f78f6be 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
-@@ -1160,7 +1160,7 @@ public class DataStorage extends Storage {
- }
- linkWorkers.shutdown();
- for (Future<Void> f : futures) {
-- Futures.get(f, IOException.class);
-+ Futures.getChecked(f, IOException.class);
- }
- }
-
-diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java
-index 1f9e3e9..961b158 100644
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java
-@@ -18,7 +18,6 @@
-
- package org.apache.hadoop.hdfs;
-
--import com.google.common.collect.Iterators;
- import org.apache.hadoop.classification.InterfaceAudience;
- import org.apache.hadoop.classification.InterfaceStability;
- import org.apache.hadoop.hdfs.inotify.EventBatch;
-@@ -33,6 +32,7 @@ import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
-
- import java.io.IOException;
-+import java.util.Collections;
- import java.util.Iterator;
- import java.util.Random;
- import java.util.concurrent.TimeUnit;
-@@ -77,7 +77,7 @@ public class DFSInotifyEventInputStream {
- long lastReadTxid) throws IOException {
- this.traceSampler = traceSampler;
- this.namenode = namenode;
-- this.it = Iterators.emptyIterator();
-+ this.it = Collections.emptyIterator();
- this.lastReadTxid = lastReadTxid;
- }
-
-diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
-index 2ee2ba7..d60b277 100644
---- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
-+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
-@@ -1052,7 +1052,7 @@ public class ClientRMService extends AbstractService implements
- new RMAppMoveEvent(applicationId, request.getTargetQueue(), future));
-
- try {
-- Futures.get(future, YarnException.class);
-+ Futures.getChecked(future, YarnException.class);
- } catch (YarnException ex) {
- RMAuditLogger.logFailure(callerUGI.getShortUserName(),
- AuditConstants.MOVE_APP_REQUEST, "UNKNOWN", "ClientRMService",
diff --git a/hadoop-hdfs-site.xml b/hadoop-hdfs-site.xml
deleted file mode 100644
index 2e543b0..0000000
--- a/hadoop-hdfs-site.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<configuration>
- <property>
- <name>dfs.replication</name>
- <value>1</value>
- </property>
- <!-- Immediately exit safemode as soon as one DataNode checks in.
- On a multi-node cluster, these configurations must be removed. -->
- <property>
- <name>dfs.safemode.extension</name>
- <value>0</value>
- </property>
- <property>
- <name>dfs.safemode.min.datanodes</name>
- <value>1</value>
- </property>
- <property>
- <name>hadoop.tmp.dir</name>
- <value>/var/lib/hadoop-hdfs/${user.name}</value>
- </property>
- <property>
- <name>dfs.namenode.name.dir</name>
- <value>file:///var/lib/hadoop-hdfs/${user.name}/dfs/namenode</value>
- </property>
- <property>
- <name>dfs.namenode.checkpoint.dir</name>
- <value>file:///var/lib/hadoop-hdfs/${user.name}/dfs/secondarynamenode</value>
- </property>
- <property>
- <name>dfs.datanode.data.dir</name>
- <value>file:///var/lib/hadoop-hdfs/${user.name}/dfs/datanode</value>
- </property>
- <property>
- <name>dfs.http.address</name>
- <value>0.0.0.0:50070</value>
- </property>
- <property>
- <name>dfs.datanode.address</name>
- <value>0.0.0.0:50010</value>
- </property>
- <property>
- <name>dfs.datanode.http.address</name>
- <value>0.0.0.0:50075</value>
- </property>
- <property>
- <name>dfs.datanode.ipc.address</name>
- <value>0.0.0.0:50020</value>
- </property>
-</configuration>
diff --git a/hadoop-hdfs.service.template b/hadoop-hdfs.service.template
deleted file mode 100644
index bca5c5f..0000000
--- a/hadoop-hdfs.service.template
+++ /dev/null
@@ -1,37 +0,0 @@
-[Unit]
-Description=The Hadoop DAEMON daemon
-After=network.target
-After=NetworkManager.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/hadoop-hdfs
-EnvironmentFile=-/etc/sysconfig/hadoop-DAEMON
-ExecStart=/usr/sbin/hadoop-daemon.sh start DAEMON
-ExecStop=/usr/sbin/hadoop-daemon.sh stop DAEMON
-User=hdfs
-Group=hadoop
-PIDFile=/var/run/hadoop-hdfs/hadoop-hdfs-DAEMON.pid
-LimitNOFILE=32768
-LimitNPROC=65536
-
-#######################################
-# Note: Below are cgroup options
-#######################################
-#Slice=
-#CPUAccounting=true
-#CPUShares=1024
-
-#MemoryAccounting=true
-#TBD: MemoryLimit=bytes, MemorySoftLimit=bytes
-
-#BlockIOAccounting=true
-#BlockIOWeight=??
-#BlockIODeviceWeight=??
-#TBD: BlockIOReadBandwidth=bytes, BlockIOWriteBandwidth=bytes
-
-#DeviceAllow=
-#DevicePolicy=auto|closed|strict
-
-[Install]
-WantedBy=multi-user.target
diff --git a/hadoop-httpfs.sysconfig b/hadoop-httpfs.sysconfig
deleted file mode 100644
index 63c953c..0000000
--- a/hadoop-httpfs.sysconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-CATALINA_BASE=/usr/share/hadoop/httpfs/tomcat
-CATALINA_HOME=/usr/share/hadoop/httpfs/tomcat
-CATALINA_TMPDIR=/var/cache/hadoop-httpfs
-
-CATALINA_OPTS="-Dhttpfs.home.dir=/usr -Dhttpfs.config.dir=/etc/hadoop -Dhttpfs.log.dir=/var/log/hadoop-httpfs -Dhttpfs.temp.dir=/var/cache/hadoop-httpfs -Dhttpfs.admin.port=14001 -Dhttpfs.http.port=14000"
diff --git a/hadoop-jersey1.patch b/hadoop-jersey1.patch
deleted file mode 100644
index afb77be..0000000
--- a/hadoop-jersey1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
-index b646304..97ac7c2 100644
---- a/hadoop-project/pom.xml
-+++ b/hadoop-project/pom.xml
-@@ -64,7 +64,7 @@
- <avro.version>1.7.4</avro.version>
-
- <!-- jersey version -->
-- <jersey.version>1.9</jersey.version>
-+ <jersey.version>1</jersey.version>
-
- <!-- jackson versions -->
- <jackson.version>1.9.13</jackson.version>
diff --git a/hadoop-jni-library-loading.patch b/hadoop-jni-library-loading.patch
deleted file mode 100644
index bd88dfa..0000000
--- a/hadoop-jni-library-loading.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
-index 5667d98..c0106ce 100644
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
-@@ -46,15 +46,20 @@
- LOG.debug("Trying to load the custom-built native-hadoop library...");
- }
- try {
-- System.loadLibrary("hadoop");
-+ System.load("/usr/lib64/hadoop/libhadoop.so");
- LOG.debug("Loaded the native-hadoop library");
- nativeCodeLoaded = true;
-- } catch (Throwable t) {
-- // Ignore failure to load
-- if(LOG.isDebugEnabled()) {
-- LOG.debug("Failed to load native-hadoop with error: " + t);
-- LOG.debug("java.library.path=" +
-- System.getProperty("java.library.path"));
-+ } catch (Throwable t64) {
-+ LOG.debug("Failed to load 64-bit native-hadoop with error: " + t64);
-+ try {
-+ System.load("/usr/lib/hadoop/libhadoop.so");
-+ LOG.debug("Loaded the native-hadoop library");
-+ nativeCodeLoaded = true;
-+ } catch (Throwable t32) {
-+ // Ignore failure to load
-+ if(LOG.isDebugEnabled()) {
-+ LOG.debug("Failed to load 32-bit native-hadoop with error: " + t32);
-+ }
- }
- }
-
diff --git a/hadoop-layout.sh b/hadoop-layout.sh
deleted file mode 100644
index 7801fc8..0000000
--- a/hadoop-layout.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-export HADOOP_PREFIX=/usr
-export HADOOP_COMMON_HOME=/usr
-export HADOOP_COMMON_DIR=share/hadoop/common
-export HADOOP_COMMON_LIB_JARS_DIR=share/hadoop/common/lib
-export HADOOP_COMMON_LIB_NATIVE_DIR=lib/hadoop
-export HADOOP_CONF_DIR=/etc/hadoop
-export HADOOP_LIBEXEC_DIR=/usr/libexec
-
-export HADOOP_HDFS_HOME=$HADOOP_PREFIX
-export HDFS_DIR=share/hadoop/hdfs
-export HDFS_LIB_JARS_DIR=share/hadoop/hadoop/lib
-export HADOOP_PID_DIR=/var/run/hadoop-hdfs
-export HADOOP_LOG_DIR=/var/log/hadoop-hdfs
-export HADOOP_IDENT_STRING=hdfs
-
-export HADOOP_YARN_HOME=$HADOOP_PREFIX
-export YARN_DIR=share/hadoop/yarn
-export YARN_LIB_JARS_DIR=share/hadoop/yarn/lib
-export YARN_PID_DIR=/var/run/hadoop-yarn
-export YARN_LOG_DIR=/var/log/hadoop-yarn
-export YARN_CONF_DIR=/etc/hadoop
-export YARN_IDENT_STRING=yarn
-
-export HADOOP_MAPRED_HOME=$HADOOP_PREFIX
-export MAPRED_DIR=share/hadoop/mapreduce
-export MAPRED_LIB_JARS_DIR=share/hadoop/mapreduce/lib
-export HADOOP_MAPRED_PID_DIR=/var/run/hadoop-mapreduce
-export HADOOP_MAPRED_LOG_DIR=/var/log/hadoop-mapreduce
-export HADOOP_MAPRED_IDENT_STRING=mapred
diff --git a/hadoop-mapred-site.xml b/hadoop-mapred-site.xml
deleted file mode 100644
index 4be352f..0000000
--- a/hadoop-mapred-site.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<configuration>
- <property>
- <name>mapred.job.tracker</name>
- <value>localhost:8021</value>
- </property>
-
- <property>
- <name>mapreduce.framework.name</name>
- <value>yarn</value>
- </property>
-
- <property>
- <description>To set the value of tmp directory for map and reduce tasks.</description>
- <name>mapreduce.task.tmp.dir</name>
- <value>/var/cache/hadoop-mapreduce/${user.name}/tasks</value>
- </property>
-
-</configuration>
diff --git a/hadoop-mapreduce.service.template b/hadoop-mapreduce.service.template
deleted file mode 100644
index fb90804..0000000
--- a/hadoop-mapreduce.service.template
+++ /dev/null
@@ -1,37 +0,0 @@
-[Unit]
-Description=The Hadoop DAEMON daemon
-After=network.target
-After=NetworkManager.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/hadoop-mapreduce
-EnvironmentFile=-/etc/sysconfig/hadoop-DAEMON
-ExecStart=/usr/sbin/mr-jobhistory-daemon.sh start DAEMON
-ExecStop=/usr/sbin/mr-jobhistory-daemon.sh stop DAEMON
-User=mapred
-Group=hadoop
-PIDFile=/var/run/hadoop-mapreduce/mapred-mapred-DAEMON.pid
-LimitNOFILE=32768
-LimitNPROC=65536
-
-#######################################
-# Note: Below are cgroup options
-#######################################
-#Slice=
-#CPUAccounting=true
-#CPUShares=1024
-
-#MemoryAccounting=true
-#TBD: MemoryLimit=bytes, MemorySoftLimit=bytes
-
-#BlockIOAccounting=true
-#BlockIOWeight=??
-#BlockIODeviceWeight=??
-#TBD: BlockIOReadBandwidth=bytes, BlockIOWriteBandwidth=bytes
-
-#DeviceAllow=
-#DevicePolicy=auto|closed|strict
-
-[Install]
-WantedBy=multi-user.target
diff --git a/hadoop-netty-3-Final.patch b/hadoop-netty-3-Final.patch
deleted file mode 100644
index c701c33..0000000
--- a/hadoop-netty-3-Final.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
-index b315e2b..a9da3aa 100644
---- a/hadoop-project/pom.xml
-+++ b/hadoop-project/pom.xml
-@@ -462,7 +462,7 @@
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
-- <version>3.6.2.Final</version>
-+ <version>3.10.6.Final</version>
- </dependency>
-
- <dependency>
diff --git a/hadoop-no-download-tomcat.patch b/hadoop-no-download-tomcat.patch
deleted file mode 100644
index 6ea06d7..0000000
--- a/hadoop-no-download-tomcat.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
-index d01a32f..9ebc494 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
-+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
-@@ -523,53 +523,6 @@
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
-- <id>dist</id>
-- <goals>
-- <goal>run</goal>
-- </goals>
-- <phase>package</phase>
-- <configuration>
-- <target>
-- <mkdir dir="downloads"/>
-- <get
-- src="${tomcat.download.url}"
-- dest="downloads/apache-tomcat-${tomcat.version}.tar.gz" verbose="true" skipexisting="true"/>
-- <delete dir="${project.build.directory}/tomcat.exp"/>
-- <mkdir dir="${project.build.directory}/tomcat.exp"/>
--
-- <!-- Using Unix script to preserve file permissions -->
-- <echo file="${project.build.directory}/tomcat-untar.sh">
-- cd "${project.build.directory}/tomcat.exp"
-- gzip -cd ../../downloads/apache-tomcat-${tomcat.version}.tar.gz | tar xf -
-- </echo>
-- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
-- <arg line="./tomcat-untar.sh"/>
-- </exec>
--
-- <move file="${project.build.directory}/tomcat.exp/apache-tomcat-${tomcat.version}"
-- tofile="${httpfs.tomcat.dist.dir}"/>
-- <delete dir="${project.build.directory}/tomcat.exp"/>
-- <delete dir="${httpfs.tomcat.dist.dir}/webapps"/>
-- <mkdir dir="${httpfs.tomcat.dist.dir}/webapps"/>
-- <delete file="${httpfs.tomcat.dist.dir}/conf/server.xml"/>
-- <copy file="${basedir}/src/main/tomcat/server.xml"
-- toDir="${httpfs.tomcat.dist.dir}/conf"/>
-- <delete file="${httpfs.tomcat.dist.dir}/conf/ssl-server.xml"/>
-- <copy file="${basedir}/src/main/tomcat/ssl-server.xml"
-- toDir="${httpfs.tomcat.dist.dir}/conf"/>
-- <delete file="${httpfs.tomcat.dist.dir}/conf/logging.properties"/>
-- <copy file="${basedir}/src/main/tomcat/logging.properties"
-- toDir="${httpfs.tomcat.dist.dir}/conf"/>
-- <copy toDir="${httpfs.tomcat.dist.dir}/webapps/ROOT">
-- <fileset dir="${basedir}/src/main/tomcat/ROOT"/>
-- </copy>
-- <copy toDir="${httpfs.tomcat.dist.dir}/webapps/webhdfs">
-- <fileset dir="${project.build.directory}/webhdfs"/>
-- </copy>
-- </target>
-- </configuration>
-- </execution>
-- <execution>
- <id>tar</id>
- <phase>package</phase>
- <goals>
diff --git a/hadoop-openssl.patch b/hadoop-openssl.patch
deleted file mode 100644
index 332e930..0000000
--- a/hadoop-openssl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c
-index 5cb5bba..5294ec7 100644
---- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c
-+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c
-@@ -253,14 +253,15 @@ JNIEXPORT jlong JNICALL Java_org_apache_hadoop_crypto_OpensslCipher_init
- static int check_update_max_output_len(EVP_CIPHER_CTX *context, int input_len,
- int max_output_len)
- {
-- if (context->flags & EVP_CIPH_NO_PADDING) {
-+ unsigned long flags = EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(context));
-+ if (flags & EVP_CIPH_NO_PADDING) {
- if (max_output_len >= input_len) {
- return 1;
- }
- return 0;
- } else {
-- int b = context->cipher->block_size;
-- if (context->encrypt) {
-+ int b = EVP_CIPHER_CTX_block_size(context);
-+ if (EVP_CIPHER_CTX_encrypting(context)) {
- if (max_output_len >= input_len + b - 1) {
- return 1;
- }
-@@ -307,10 +308,11 @@ JNIEXPORT jint JNICALL Java_org_apache_hadoop_crypto_OpensslCipher_update
- static int check_doFinal_max_output_len(EVP_CIPHER_CTX *context,
- int max_output_len)
- {
-- if (context->flags & EVP_CIPH_NO_PADDING) {
-+ unsigned long flags = EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(context));
-+ if (flags & EVP_CIPH_NO_PADDING) {
- return 1;
- } else {
-- int b = context->cipher->block_size;
-+ int b = EVP_CIPHER_CTX_block_size(context);
- if (max_output_len >= b) {
- return 1;
- }
diff --git a/hadoop-tomcat-users.xml b/hadoop-tomcat-users.xml
deleted file mode 100644
index daa8e18..0000000
--- a/hadoop-tomcat-users.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
- 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.
--->
-<tomcat-users xmlns="http://tomcat.apache.org/xml"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
- version="1.0">
-<!--
- NOTE: By default, no user is included in the "manager-gui" role required
- to operate the "/manager/html" web application. If you wish to use this app,
- you must define such a user - the username and password are arbitrary.
--->
-<!--
- NOTE: The sample user and role entries below are wrapped in a comment
- and thus are ignored when reading this file. Do not forget to remove
- <!.. ..> that surrounds them.
--->
-<!--
- <role rolename="tomcat"/>
- <role rolename="role1"/>
- <user username="tomcat" password="tomcat" roles="tomcat"/>
- <user username="both" password="tomcat" roles="tomcat,role1"/>
- <user username="role1" password="tomcat" roles="role1"/>
--->
-
-<!-- <role rolename="admin"/> -->
-<!-- <role rolename="admin-gui"/> -->
-<!-- <role rolename="admin-script"/> -->
-<!-- <role rolename="manager"/> -->
-<!-- <role rolename="manager-gui"/> -->
-<!-- <role rolename="manager-script"/> -->
-<!-- <role rolename="manager-jmx"/> -->
-<!-- <role rolename="manager-status"/> -->
-<!-- <user name="admin" password="adminadmin" roles="admin,manager,admin-gui,admin-script,manager-gui,manager-script,manager-jmx,manager-status" /> -->
-</tomcat-users>
diff --git a/hadoop-tools.jar.patch b/hadoop-tools.jar.patch
deleted file mode 100644
index db8d527..0000000
--- a/hadoop-tools.jar.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
-index c3e1aa1..9042f73 100644
---- a/hadoop-common-project/hadoop-annotations/pom.xml
-+++ b/hadoop-common-project/hadoop-annotations/pom.xml
-@@ -46,11 +46,8 @@
- </activation>
- <dependencies>
- <dependency>
-- <groupId>jdk.tools</groupId>
-- <artifactId>jdk.tools</artifactId>
-- <version>1.7</version>
-- <scope>system</scope>
-- <systemPath>${java.home}/../lib/tools.jar</systemPath>
-+ <groupId>com.sun</groupId>
-+ <artifactId>tools</artifactId>
- </dependency>
- </dependencies>
- </profile>
-@@ -61,11 +58,8 @@
- </activation>
- <dependencies>
- <dependency>
-- <groupId>jdk.tools</groupId>
-- <artifactId>jdk.tools</artifactId>
-- <version>1.8</version>
-- <scope>system</scope>
-- <systemPath>${java.home}/../lib/tools.jar</systemPath>
-+ <groupId>com.sun</groupId>
-+ <artifactId>tools</artifactId>
- </dependency>
- </dependencies>
- </profile>
diff --git a/hadoop-yarn-site.xml b/hadoop-yarn-site.xml
deleted file mode 100644
index d4d273f..0000000
--- a/hadoop-yarn-site.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<configuration>
- <property>
- <name>yarn.nodemanager.aux-services</name>
- <value>mapreduce_shuffle</value>
- </property>
-
- <property>
- <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name>
- <value>org.apache.hadoop.mapred.ShuffleHandler</value>
- </property>
-
-<!--
- <property>
- <name>yarn.log-aggregation-enable</name>
- <value>true</value>
- </property>
--->
-
- <property>
- <name>yarn.dispatcher.exit-on-error</name>
- <value>true</value>
- </property>
-
- <property>
- <description>List of directories to store localized files in.</description>
- <name>yarn.nodemanager.local-dirs</name>
- <value>/var/cache/hadoop-yarn/${user.name}/nm-local-dir</value>
- </property>
-
- <property>
- <description>Where to store container logs.</description>
- <name>yarn.nodemanager.log-dirs</name>
- <value>/var/log/hadoop-yarn/containers</value>
- </property>
-
-<!--
- <property>
- <description>Where to aggregate logs to.</description>
- <name>yarn.nodemanager.remote-app-log-dir</name>
- <value>/var/log/hadoop-yarn/apps</value>
- </property>
--->
-
- <property>
- <description>Classpath for typical applications.</description>
- <name>yarn.application.classpath</name>
- <value>
- $HADOOP_CONF_DIR,$HADOOP_COMMON_HOME/$HADOOP_COMMON_DIR/*,
- $HADOOP_COMMON_HOME/$HADOOP_COMMON_LIB_JARS_DIR/*,
- $HADOOP_HDFS_HOME/$HDFS_DIR/*,$HADOOP_HDFS_HOME/$HDFS_LIB_JARS_DIR/*,
- $HADOOP_MAPRED_HOME/$MAPRED_DIR/*,
- $HADOOP_MAPRED_HOME/$MAPRED_LIB_JARS_DIR/*,
- $HADOOP_YARN_HOME/$YARN_DIR/*,$HADOOP_YARN_HOME/$YARN_LIB_JARS_DIR/*
- </value>
- </property>
-</configuration>
diff --git a/hadoop-yarn.service.template b/hadoop-yarn.service.template
deleted file mode 100644
index 00e53f4..0000000
--- a/hadoop-yarn.service.template
+++ /dev/null
@@ -1,37 +0,0 @@
-[Unit]
-Description=The Hadoop DAEMON daemon
-After=network.target
-After=NetworkManager.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/hadoop-yarn
-EnvironmentFile=-/etc/sysconfig/hadoop-DAEMON
-ExecStart=/usr/sbin/yarn-daemon.sh start DAEMON
-ExecStop=/usr/sbin/yarn-daemon.sh stop DAEMON
-User=yarn
-Group=hadoop
-PIDFile=/var/run/hadoop-yarn/yarn-yarn-DAEMON.pid
-LimitNOFILE=32768
-LimitNPROC=65536
-
-#######################################
-# Note: Below are cgroup options
-#######################################
-#Slice=
-#CPUAccounting=true
-#CPUShares=1024
-
-#MemoryAccounting=true
-#TBD: MemoryLimit=bytes, MemorySoftLimit=bytes
-
-#BlockIOAccounting=true
-#BlockIOWeight=??
-#BlockIODeviceWeight=??
-#TBD: BlockIOReadBandwidth=bytes, BlockIOWriteBandwidth=bytes
-
-#DeviceAllow=
-#DevicePolicy=auto|closed|strict
-
-[Install]
-WantedBy=multi-user.target
diff --git a/hadoop.logrotate b/hadoop.logrotate
deleted file mode 100644
index e722f00..0000000
--- a/hadoop.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/hadoop-NAME/*.log
-{
- missingok
- copytruncate
- compress
- weekly
- rotate 52
-}
diff --git a/hadoop.spec b/hadoop.spec
deleted file mode 100644
index 23256ac..0000000
--- a/hadoop.spec
+++ /dev/null
@@ -1,1391 +0,0 @@
-%global _hardened_build 1
-
-%global hadoop_version %{version}
-%global hdfs_services hadoop-zkfc.service hadoop-datanode.service hadoop-secondarynamenode.service hadoop-namenode.service hadoop-journalnode.service
-%global mapreduce_services hadoop-historyserver.service
-%global yarn_services hadoop-proxyserver.service hadoop-resourcemanager.service hadoop-nodemanager.service hadoop-timelineserver.service
-
-# Filter out undesired provides and requires
-%global __requires_exclude_from ^%{_libdir}/%{name}/libhadoop.so$
-%global __provides_exclude_from ^%{_libdir}/%{name}/.*$
-
-Name: hadoop
-Version: 2.7.6
-Release: 7%{?dist}
-Summary: A software platform for processing vast amounts of data
-# The BSD license file is missing
-# https://issues.apache.org/jira/browse/HADOOP-9849
-License: ASL 2.0 and BSD
-URL: https://%{name}.apache.org
-Source0: https://www.apache.org/dist/%{name}/core/%{name}-%{version}/%{name}-%{ver...
-Source1: %{name}-layout.sh
-Source2: %{name}-hdfs.service.template
-Source3: %{name}-mapreduce.service.template
-Source4: %{name}-yarn.service.template
-Source6: %{name}.logrotate
-Source8: %{name}-core-site.xml
-Source9: %{name}-hdfs-site.xml
-Source10: %{name}-mapred-site.xml
-Source11: %{name}-yarn-site.xml
-Source12: %{name}-httpfs.sysconfig
-Source13: hdfs-create-dirs
-Source14: %{name}-tomcat-users.xml
-# This patch includes the following upstream tickets:
-# https://issues.apache.org/jira/browse/HADOOP-9613
-# https://issues.apache.org/jira/browse/HDFS-5411
-# https://issues.apache.org/jira/browse/HADOOP-10068
-# https://issues.apache.org/jira/browse/HADOOP-10075
-# https://issues.apache.org/jira/browse/HADOOP-10076
-Patch0: %{name}-fedora-integration.patch
-# Fedora packaging guidelines for JNI library loading
-Patch2: %{name}-jni-library-loading.patch
-# Don't download tomcat
-Patch4: %{name}-no-download-tomcat.patch
-# Use dlopen to find libjvm.so
-Patch5: %{name}-dlopen-libjvm.patch
-# Update to Guava 20
-Patch7: %{name}-guava.patch
-# Update to Netty 3.6.6-Final
-Patch8: %{name}-netty-3-Final.patch
-# Remove problematic issues with tools.jar
-Patch9: %{name}-tools.jar.patch
-# Workaround for bz1012059
-Patch10: %{name}-build.patch
-# Build with hard-float on ARMv7
-Patch12: %{name}-armhfp.patch
-
-# fix Jersey1 support
-Patch13: hadoop-jersey1.patch
-# fix java8 doclint
-Patch14: hadoop-2.4.1-disable-doclint.patch
-# Fix Protobuf compiler errors after updating to 3.1.0
-Patch19: protobuf3.patch
-# Patch openssl 1.0.2 to use 1.1.0
-Patch21: %{name}-openssl.patch
-# fix exception no longer thrown in aws
-Patch22: %{name}-aws.patch
-# fix classpath issues
-Patch23: classpath.patch
-
-# fix container-executor compilation rbhz#1597446
-Patch24: fix-container-executor-cmake.patch
-
-# fix rhbz#1593020
-Patch25: backport-CVE-2018-8009.patch
-
-BuildRequires: ant
-BuildRequires: antlr-tool
-BuildRequires: aopalliance
-BuildRequires: apache-commons-beanutils
-BuildRequires: apache-commons-cli
-BuildRequires: apache-commons-codec
-BuildRequires: apache-commons-collections
-BuildRequires: apache-commons-configuration
-BuildRequires: apache-commons-daemon
-BuildRequires: apache-commons-el
-BuildRequires: apache-commons-io
-BuildRequires: apache-commons-lang
-BuildRequires: apache-commons-logging
-BuildRequires: apache-commons-math
-BuildRequires: apache-commons-net
-BuildRequires: apache-rat-plugin
-BuildRequires: apacheds-kerberos
-BuildRequires: atinject
-BuildRequires: avalon-framework
-BuildRequires: avalon-logkit
-BuildRequires: avro
-BuildRequires: avro-maven-plugin
-BuildRequires: aws-sdk-java
-BuildRequires: bookkeeper-java
-BuildRequires: cglib
-BuildRequires: checkstyle
-BuildRequires: chrpath
-BuildRequires: cmake
-BuildRequires: curator
-BuildRequires: ecj >= 1:4.2.1-6
-BuildRequires: fuse-devel
-BuildRequires: fusesource-pom
-BuildRequires: gcc-c++
-BuildRequires: geronimo-jms
-BuildRequires: glassfish-jaxb
-BuildRequires: glassfish-jsp
-BuildRequires: glassfish-jsp-api
-BuildRequires: google-guice
-BuildRequires: grizzly
-BuildRequires: guava20
-BuildRequires: guice-servlet
-BuildRequires: hamcrest
-BuildRequires: hawtjni
-BuildRequires: hsqldb
-BuildRequires: htrace
-BuildRequires: httpcomponents-client
-BuildRequires: httpcomponents-core
-BuildRequires: istack-commons
-BuildRequires: jackson
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: java-base64
-BuildRequires: java-devel
-BuildRequires: java-xmlbuilder
-BuildRequires: javamail
-BuildRequires: javapackages-tools
-BuildRequires: jdiff
-BuildRequires: jersey1
-BuildRequires: jersey1-contribs
-BuildRequires: jets3t
-BuildRequires: jettison
-BuildRequires: jetty8
-BuildRequires: jetty-util-ajax
-BuildRequires: jsch
-BuildRequires: json_simple
-BuildRequires: jspc
-BuildRequires: jsr-305
-BuildRequires: jsr-311
-BuildRequires: jul-to-slf4j
-BuildRequires: junit
-BuildRequires: jzlib
-BuildRequires: leveldbjni
-BuildRequires: groovy18
-BuildRequires: log4j12
-BuildRequires: maven-antrun-plugin
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-clean-plugin
-BuildRequires: maven-dependency-plugin
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-invoker-plugin
-BuildRequires: maven-local
-BuildRequires: maven-plugin-build-helper
-BuildRequires: maven-plugin-exec
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-release-plugin
-BuildRequires: maven-remote-resources-plugin
-BuildRequires: maven-shade-plugin
-BuildRequires: maven-source-plugin
-BuildRequires: maven-war-plugin
-BuildRequires: metrics
-BuildRequires: mockito
-BuildRequires: native-maven-plugin
-BuildRequires: netty3
-BuildRequires: netty
-BuildRequires: objectweb-asm
-BuildRequires: objenesis >= 1.2-16
-BuildRequires: openssl-devel
-BuildRequires: paranamer
-BuildRequires: protobuf-compiler
-BuildRequires: protobuf-java
-BuildRequires: relaxngDatatype
-BuildRequires: servlet3
-BuildRequires: slf4j
-BuildRequires: snappy-devel
-BuildRequires: snappy-java
-BuildRequires: systemd
-BuildRequires: tomcat
-BuildRequires: tomcat-el-3.0-api
-BuildRequires: tomcat-log4j
-BuildRequires: txw2
-BuildRequires: xmlenc
-BuildRequires: zookeeper-java > 3.4.5-15
-# For tests
-BuildRequires: jersey1-test-framework
-
-%description
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-%package client
-Summary: Libraries for Apache Hadoop clients
-BuildArch: noarch
-Requires: %{name}-common = %{version}-%{release}
-Requires: %{name}-hdfs = %{version}-%{release}
-Requires: %{name}-mapreduce = %{version}-%{release}
-Requires: %{name}-yarn = %{version}-%{release}
-
-%description client
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-This package provides libraries for Apache Hadoop clients.
-
-%package common
-Summary: Common files needed by Apache Hadoop daemons
-BuildArch: noarch
-Requires(pre): /usr/sbin/useradd
-Obsoletes: %{name}-javadoc < 2.4.1-22%{?dist}
-
-# These are required to meet the symlinks for the classpath
-Requires: antlr-tool
-Requires: apache-commons-beanutils
-Requires: avalon-framework
-Requires: avalon-logkit
-Requires: checkstyle
-Requires: coreutils
-Requires: geronimo-jms
-Requires: glassfish-jaxb
-Requires: glassfish-jsp
-Requires: glassfish-jsp-api
-Requires: istack-commons
-Requires: jakarta-commons-httpclient
-Requires: java-base64
-Requires: java-xmlbuilder
-Requires: javamail
-Requires: jettison
-Requires: jetty8
-Requires: jsr-311
-Requires: mockito
-Requires: objectweb-asm
-Requires: objenesis
-Requires: paranamer
-Requires: relaxngDatatype
-Requires: servlet3
-Requires: snappy-java
-Requires: txw2
-Requires: which
-
-%description common
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-This package contains common files and utilities needed by other Apache
-Hadoop modules.
-
-%package common-native
-Summary: The native Apache Hadoop library file
-Requires: %{name}-common = %{version}-%{release}
-
-%description common-native
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-This package contains the native-hadoop library
-
-%package devel
-Summary: Headers for Apache Hadoop
-Requires: libhdfs%{?_isa} = %{version}-%{release}
-
-%description devel
-Header files for Apache Hadoop's hdfs library and other utilities
-
-%package hdfs
-Summary: The Apache Hadoop Distributed File System
-BuildArch: noarch
-Requires: apache-commons-daemon-jsvc
-Requires: %{name}-common = %{version}-%{release}
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-
-%description hdfs
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-The Hadoop Distributed File System (HDFS) is the primary storage system
-used by Apache Hadoop applications.
-
-%package hdfs-fuse
-Summary: Allows mounting of Apache Hadoop HDFS
-Requires: fuse
-Requires: libhdfs%{?_isa} = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-Requires: %{name}-hdfs = %{version}-%{release}
-Requires: %{name}-mapreduce = %{version}-%{release}
-Requires: %{name}-yarn = %{version}-%{release}
-
-%description hdfs-fuse
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-This package provides tools that allow HDFS to be mounted as a standard
-file system through fuse.
-
-%package httpfs
-Summary: Provides web access to HDFS
-BuildArch: noarch
-Requires: apache-commons-dbcp
-Requires: ecj >= 1:4.2.1-6
-Requires: json_simple
-Requires: tomcat
-Requires: tomcat-lib
-Requires: tomcat-native
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-
-%description httpfs
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-This package provides a server that provides HTTP REST API support for
-the complete FileSystem/FileContext interface in HDFS.
-
-%package -n libhdfs
-Summary: The Apache Hadoop Filesystem Library
-Requires: %{name}-hdfs = %{version}-%{release}
-Requires: lzo
-
-%description -n libhdfs
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-This package provides the Apache Hadoop Filesystem Library.
-
-%package mapreduce
-Summary: Apache Hadoop MapReduce (MRv2)
-BuildArch: noarch
-Requires: %{name}-common = %{version}-%{release}
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-
-%description mapreduce
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-This package provides Apache Hadoop MapReduce (MRv2).
-
-%package mapreduce-examples
-Summary: Apache Hadoop MapReduce (MRv2) examples
-BuildArch: noarch
-Requires: hsqldb
-
-%description mapreduce-examples
-This package contains mapreduce examples.
-
-%package maven-plugin
-Summary: Apache Hadoop maven plugin
-BuildArch: noarch
-Requires: maven
-
-%description maven-plugin
-The Apache Hadoop maven plugin
-
-%package tests
-Summary: Apache Hadoop test resources
-BuildArch: noarch
-Requires: %{name}-common = %{version}-%{release}
-Requires: %{name}-hdfs = %{version}-%{release}
-Requires: %{name}-mapreduce = %{version}-%{release}
-Requires: %{name}-yarn = %{version}-%{release}
-
-%description tests
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-This package contains test related resources for Apache Hadoop.
-
-%package yarn
-Summary: Apache Hadoop YARN
-BuildArch: noarch
-Requires: %{name}-common = %{version}-%{release}
-Requires: %{name}-mapreduce = %{version}-%{release}
-Requires: aopalliance
-Requires: atinject
-Requires: hamcrest
-Requires: hawtjni
-Requires: leveldbjni
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-
-%description yarn
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-This package contains Apache Hadoop YARN.
-
-%package yarn-security
-Summary: The ability to run Apache Hadoop YARN in secure mode
-Requires: %{name}-yarn = %{version}-%{release}
-
-%description yarn-security
-Apache Hadoop is a framework that allows for the distributed processing of
-large data sets across clusters of computers using simple programming models.
-It is designed to scale up from single servers to thousands of machines, each
-offering local computation and storage.
-
-This package contains files needed to run Apache Hadoop YARN in secure mode.
-
-%prep
-%autosetup -p1 -n %{name}-%{version}-src
-
-%pom_xpath_set "pom:properties/pom:protobuf.version" 3.5.0 hadoop-project
-
-# These native libs won't build on s390x and armv7hl (possibly due to some cmake issue with provided compat functions)
-%pom_remove_plugin :maven-antrun-plugin hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager
-
-%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions/pom:execution[pom:phase='test-compile']" "<id>default-jar</id>" hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell
-
-# Remove the maven-site-plugin. It's not needed
-%pom_remove_plugin :maven-site-plugin
-%pom_remove_plugin :maven-site-plugin hadoop-common-project/hadoop-auth
-%pom_remove_plugin :maven-site-plugin hadoop-hdfs-project/hadoop-hdfs-httpfs
-
-# Remove the findbugs-maven-plugin. It's not needed and isn't available
-%pom_remove_plugin :findbugs-maven-plugin hadoop-hdfs-project/hadoop-hdfs-httpfs
-%pom_remove_plugin :findbugs-maven-plugin hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal
-%pom_remove_plugin :findbugs-maven-plugin hadoop-mapreduce-project/hadoop-mapreduce-client
-%pom_remove_plugin :findbugs-maven-plugin hadoop-mapreduce-project/hadoop-mapreduce-examples
-%pom_remove_plugin :findbugs-maven-plugin hadoop-mapreduce-project
-%pom_remove_plugin :findbugs-maven-plugin hadoop-project-dist
-%pom_remove_plugin :findbugs-maven-plugin hadoop-project
-%pom_remove_plugin :findbugs-maven-plugin hadoop-tools/hadoop-rumen
-%pom_remove_plugin :findbugs-maven-plugin hadoop-tools/hadoop-streaming
-%pom_remove_plugin :findbugs-maven-plugin hadoop-yarn-project/hadoop-yarn
-%pom_remove_plugin :findbugs-maven-plugin hadoop-yarn-project
-
-# Remove the maven-project-info-reports plugin. It's not needed and isn't available
-%pom_remove_plugin :maven-project-info-reports-plugin hadoop-common-project/hadoop-auth
-%pom_remove_plugin :maven-project-info-reports-plugin hadoop-hdfs-project/hadoop-hdfs-httpfs
-%pom_remove_plugin :maven-project-info-reports-plugin hadoop-project
-
-# Remove the maven-checkstyle plugin. It's not needed and isn't available
-%pom_remove_plugin :maven-checkstyle-plugin hadoop-project-dist
-%pom_remove_plugin :maven-checkstyle-plugin hadoop-project
-%pom_remove_plugin :maven-checkstyle-plugin hadoop-tools/hadoop-distcp
-
-# Disable the hadoop-minikdc module due to missing deps
-%pom_disable_module hadoop-minikdc hadoop-common-project
-%pom_remove_dep :hadoop-minikdc hadoop-common-project/hadoop-common
-%pom_remove_dep :hadoop-minikdc hadoop-common-project/hadoop-auth
-%pom_remove_dep :hadoop-minikdc hadoop-project
-%pom_remove_dep :hadoop-minikdc hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests
-%pom_remove_dep :hadoop-minikdc hadoop-common-project/hadoop-kms
-%pom_remove_dep :hadoop-minikdc hadoop-hdfs-project/hadoop-hdfs
-%pom_remove_dep :hadoop-minikdc hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry
-%pom_remove_dep :hadoop-minikdc hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager
-%pom_remove_dep :hadoop-minikdc hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice
-rm -f hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/TestKerberosAuthenticator.java
-rm -f hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java
-rm -f hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAltKerberosAuthenticationHandler.java
-rm -f hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java
-rm -f hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java
-rm -f hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferTestCase.java
-rm -f hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZonesWithKMS.java
-rm -f hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/TestSecureNNWithQJM.java
-
-# Remove other deps only needed for testing
-%pom_remove_dep :tomcat-embed-core hadoop-project
-%pom_remove_dep :tomcat-embed-logging-juli hadoop-project
-%pom_remove_dep :tomcat-embed-core hadoop-common-project/hadoop-auth
-%pom_remove_dep :tomcat-embed-logging-juli hadoop-common-project/hadoop-auth
-rm -f hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
-rm -f hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/TestPseudoAuthenticator.java
-%pom_xpath_remove "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='hadoop-auth' and pom:type='test-jar']" hadoop-project
-%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:artifactId='hadoop-auth' and pom:type='test-jar']" hadoop-hdfs-project/hadoop-hdfs-httpfs
-%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:artifactId='hadoop-auth' and pom:type='test-jar']" hadoop-common-project/hadoop-common
-%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:artifactId='hadoop-auth' and pom:type='test-jar']" hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager
-%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:artifactId='hadoop-auth' and pom:type='test-jar']" hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice
-
-# Remove tests with errors - Tests are not needed for packaging so don't bother
-rm -f hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java
-rm -f hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUGILoginFromKeytab.java
-rm -f hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/web/TestWebDelegationToken.java
-rm -f hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/curator/TestChildReaper.java
-rm -f hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestSSLHttpServer.java
-rm -f hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestZKDelegationTokenSecretManager.java
-rm -f hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpCookieFlag.java
-rm -f hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSWithZK.java
-rm -f hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/MiniKMS.java
-rm -f hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
-rm -rf hadoop-hdfs-project/hadoop-hdfs/src/test
-rm -rf hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test
-rm -rf hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test
-rm -rf hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test
-rm -rf hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager
-rm -f hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/test/YarnTestDriver.java
-rm -rf hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server
-rm -rf hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client
-rm -rf hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test
-rm -rf hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test
-rm -rf hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test
-rm -f hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java
-rm -rf hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test
-rm -rf hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test
-rm -rf hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test
-rm -rf hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test
-rm -rf hadoop-tools/hadoop-streaming/src/test
-rm -rf hadoop-tools/hadoop-gridmix/src/test/java
-rm -rf hadoop-tools/hadoop-extras/src/test
-rm -rf hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test
-rm -rf hadoop-hdfs-project/hadoop-hdfs-nfs/src/test
-rm -rf hadoop-tools/hadoop-distcp/src/test
-rm -rf hadoop-tools/hadoop-archives/src/test
-rm -rf hadoop-tools/hadoop-datajoin/src/test
-
-# Remove dist plugin. It's not needed and has issues
-%pom_remove_plugin :maven-antrun-plugin hadoop-common-project/hadoop-kms
-%pom_remove_plugin :maven-antrun-plugin hadoop-dist
-
-# remove plugin causing to build the same jar twice
-%pom_remove_plugin :maven-jar-plugin hadoop-common-project/hadoop-auth
-
-# modify version of apacheds-kerberos-codec to 2.0.0-M15
-%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='apacheds-kerberos-codec']/pom:version" 2.0.0-M21 hadoop-project
-
-%if 0%{?fedora} > 25
-# Disable hadoop-pipes, because it needs upstream patching for Openssl 1.1.0
-%pom_disable_module hadoop-pipes hadoop-tools
-%pom_remove_dep :hadoop-pipes hadoop-tools/hadoop-tools-dist
-%endif
-
-# Add dependencies for timeline service
-%pom_add_dep org.iq80.leveldb:leveldb hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice
-%pom_add_dep org.fusesource.hawtjni:hawtjni-runtime hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice
-
-# Fix scope on hadoop-common:test-jar
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='hadoop-common' and pom:type='test-jar']/pom:scope" test hadoop-tools/hadoop-openstack
-
-# Modify asm version to version 5.0.2 and groupId to org.ow2.asm
-%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='asm']/pom:version" 5.0.2 hadoop-project
-%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='asm']/pom:groupId" org.ow2.asm hadoop-project
-
-# Add missing deps
-%pom_add_dep org.iq80.leveldb:leveldb hadoop-hdfs-project/hadoop-hdfs
-%pom_add_dep org.iq80.leveldb:leveldb hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common
-
-# remove plugins that are not needed
-%pom_remove_plugin :maven-jar-plugin hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy
-%pom_remove_plugin :maven-antrun-plugin hadoop-tools/hadoop-streaming
-
-# disable microsoft azure because the package is not available
-%pom_disable_module hadoop-azure hadoop-tools
-%pom_remove_dep :hadoop-azure hadoop-tools/hadoop-tools-dist
-
-# disable kms war because it breaks bundling policy
-%pom_disable_module hadoop-kms hadoop-common-project
-%pom_remove_dep :hadoop-kms hadoop-hdfs-project/hadoop-hdfs
-
-# War files we don't want
-%mvn_package :%{name}-auth-examples __noinstall
-%mvn_package :%{name}-hdfs-httpfs __noinstall
-
-# Parts we don't want to distribute
-%mvn_package :%{name}-assemblies __noinstall
-
-# Workaround for bz1012059
-%mvn_package :%{name}-project-dist __noinstall
-
-# Create separate file lists for packaging
-%mvn_package :::tests: %{name}-tests
-%mvn_package :%{name}-*-tests::{}: %{name}-tests
-%mvn_package :%{name}-client*::{}: %{name}-client
-%mvn_package :%{name}-hdfs*::{}: %{name}-hdfs
-%mvn_package :%{name}-mapreduce-examples*::{}: %{name}-mapreduce-examples
-%mvn_package :%{name}-mapreduce*::{}: %{name}-mapreduce
-%mvn_package :%{name}-archives::{}: %{name}-mapreduce
-%mvn_package :%{name}-datajoin::{}: %{name}-mapreduce
-%mvn_package :%{name}-distcp::{}: %{name}-mapreduce
-%mvn_package :%{name}-extras::{}: %{name}-mapreduce
-%mvn_package :%{name}-gridmix::{}: %{name}-mapreduce
-%mvn_package :%{name}-openstack::{}: %{name}-mapreduce
-%mvn_package :%{name}-rumen::{}: %{name}-mapreduce
-%mvn_package :%{name}-sls::{}: %{name}-mapreduce
-%mvn_package :%{name}-streaming::{}: %{name}-mapreduce
-%if 0%{?fedora} <= 25
-%mvn_package :%{name}-pipes::{}: %{name}-mapreduce
-%endif
-%mvn_package :%{name}-tools*::{}: %{name}-mapreduce
-%mvn_package :%{name}-maven-plugins::{}: %{name}-maven-plugin
-%mvn_package :%{name}-minicluster::{}: %{name}-tests
-%mvn_package :%{name}-yarn*::{}: %{name}-yarn
-
-# Jar files that need to be overridden due to installation location
-%mvn_file :%{name}-common::tests: %{name}/%{name}-common
-
-%build
-%set_build_flags
-# increase JVM memory limits to avoid OOM during build
-%ifarch s390x ppc64le
-export MAVEN_OPTS="-Xms2048M -Xmx4096M"
-%endif
-%mvn_build -j -- -Drequire.snappy=true -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipTest -DskipIT -Dmaven.javadoc.skip=true
-
-# This takes a long time to run, so comment out for now
-#%%check
-#mvn-rpmbuild -Pdist,native test -Dmaven.test.failure.ignore=true
-
-%install
-# Copy all jar files except those generated by the build
-# $1 the src directory
-# $2 the dest directory
-copy_dep_jars()
-{
- find $1 ! -name "hadoop-*.jar" -name "*.jar" | xargs install -m 0644 -t $2
- rm -f $2/tools-*.jar
-}
-
-# Create symlinks for jars from the build
-# $1 the location to create the symlink
-link_hadoop_jars()
-{
- for f in `ls hadoop-* | grep -v tests | grep -v examples`
- do
- n=`echo $f | sed "s/-%{version}//"`
- if [ -L $1/$n ]
- then
- continue
- elif [ -e $1/$f ]
- then
- rm -f $1/$f $1/$n
- fi
- p=`find %{buildroot}/%{_jnidir} %{buildroot}/%{_javadir}/%{name} -name $n | sed "s#%{buildroot}##"`
- %{__ln_s} $p $1/$n
- done
-}
-
-%mvn_install
-
-install -d -m 0755 %{buildroot}/%{_libdir}/%{name}
-install -d -m 0755 %{buildroot}/%{_includedir}/%{name}
-install -d -m 0755 %{buildroot}/%{_jnidir}/%{name}
-
-install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/client/lib
-install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/common/lib
-install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/hdfs/lib
-install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/hdfs/webapps
-install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/httpfs/tomcat/webapps
-install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/mapreduce/lib
-install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/yarn/lib
-install -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/tomcat/Catalina/localhost
-install -d -m 0755 %{buildroot}/%{_sysconfdir}/logrotate.d
-install -d -m 0755 %{buildroot}/%{_sysconfdir}/sysconfig
-install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
-install -d -m 0755 %{buildroot}/%{_sharedstatedir}/%{name}-hdfs
-install -d -m 0755 %{buildroot}/%{_sharedstatedir}/tomcats/httpfs
-install -d -m 0755 %{buildroot}/%{_var}/cache/%{name}-yarn
-install -d -m 0755 %{buildroot}/%{_var}/cache/%{name}-httpfs/temp
-install -d -m 0755 %{buildroot}/%{_var}/cache/%{name}-httpfs/work
-install -d -m 0755 %{buildroot}/%{_var}/cache/%{name}-mapreduce
-install -d -m 0755 %{buildroot}/%{_var}/log/%{name}-yarn
-install -d -m 0755 %{buildroot}/%{_var}/log/%{name}-hdfs
-install -d -m 0755 %{buildroot}/%{_var}/log/%{name}-httpfs
-install -d -m 0755 %{buildroot}/%{_var}/log/%{name}-mapreduce
-install -d -m 0755 %{buildroot}/%{_var}/run/%{name}-yarn
-install -d -m 0755 %{buildroot}/%{_var}/run/%{name}-hdfs
-install -d -m 0755 %{buildroot}/%{_var}/run/%{name}-mapreduce
-
-basedir='%{name}-common-project/%{name}-common/target/%{name}-common-%{hadoop_version}'
-hdfsdir='%{name}-hdfs-project/%{name}-hdfs/target/%{name}-hdfs-%{hadoop_version}'
-httpfsdir='%{name}-hdfs-project/%{name}-hdfs-httpfs/target/%{name}-hdfs-httpfs-%{hadoop_version}'
-mapreddir='%{name}-mapreduce-project/target/%{name}-mapreduce-%{hadoop_version}'
-yarndir='%{name}-yarn-project/target/%{name}-yarn-project-%{hadoop_version}'
-
-# copy script folders
-for dir in bin libexec sbin
-do
- cp -arf $basedir/$dir %{buildroot}/%{_prefix}
- cp -arf $hdfsdir/$dir %{buildroot}/%{_prefix}
- cp -arf $mapreddir/$dir %{buildroot}/%{_prefix}
- cp -arf $yarndir/$dir %{buildroot}/%{_prefix}
-done
-
-# This binary is obsoleted and causes a conflict with qt-devel
-rm -rf %{buildroot}/%{_bindir}/rcc
-
-# Duplicate files
-rm -f %{buildroot}/%{_sbindir}/hdfs-config.sh
-
-# copy config files
-cp -arf $basedir/etc/* %{buildroot}/%{_sysconfdir}
-cp -arf $httpfsdir/etc/* %{buildroot}/%{_sysconfdir}
-cp -arf $mapreddir/etc/* %{buildroot}/%{_sysconfdir}
-cp -arf $yarndir/etc/* %{buildroot}/%{_sysconfdir}
-
-# copy binaries
-cp -arf $basedir/lib/native/libhadoop.so* %{buildroot}/%{_libdir}/%{name}
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/*
-cp -arf $hdfsdir/include/hdfs.h %{buildroot}/%{_includedir}/%{name}
-cp -arf $hdfsdir/lib/native/libhdfs.so* %{buildroot}/%{_libdir}
-chrpath --delete %{buildroot}/%{_libdir}/libhdfs*
-cp -af hadoop-hdfs-project/hadoop-hdfs/target/native/main/native/fuse-dfs/fuse_dfs %{buildroot}/%{_bindir}
-chrpath --delete %{buildroot}/%{_bindir}/fuse_dfs
-
-# Not needed since httpfs is deployed with existing systemd setup
-rm -f %{buildroot}/%{_sbindir}/httpfs.sh
-rm -f %{buildroot}/%{_libexecdir}/httpfs-config.sh
-rm -f %{buildroot}/%{_bindir}/httpfs-env.sh
-
-# Remove files with .cmd extension
-find %{buildroot} -name *.cmd | xargs rm -f
-
-# Modify hadoop-env.sh to point to correct locations for JAVA_HOME
-# and JSVC_HOME.
-sed -i "s|\${JAVA_HOME}|/usr/lib/jvm/jre|" %{buildroot}/%{_sysconfdir}/%{name}/%{name}-env.sh
-sed -i "s|\${JSVC_HOME}|/usr/bin|" %{buildroot}/%{_sysconfdir}/%{name}/%{name}-env.sh
-
-# Ensure the java provided DocumentBuilderFactory is used
-sed -i "s|\(HADOOP_OPTS.*=.*\)\$HADOOP_CLIENT_OPTS|\1 -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl \$HADOOP_CLIENT_OPTS|" %{buildroot}/%{_sysconfdir}/%{name}/%{name}-env.sh
-echo "export YARN_OPTS=\"\$YARN_OPTS -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl\"" >> %{buildroot}/%{_sysconfdir}/%{name}/yarn-env.sh
-
-# Workaround for bz1012059
-install -pm 644 hadoop-project-dist/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}-%{name}-project-dist.pom
-%{__ln_s} %{_jnidir}/%{name}/hadoop-common.jar %{buildroot}/%{_datadir}/%{name}/common
-%{__ln_s} %{_javadir}/%{name}/hadoop-hdfs.jar %{buildroot}/%{_datadir}/%{name}/hdfs
-%{__ln_s} %{_javadir}/%{name}/hadoop-client.jar %{buildroot}/%{_datadir}/%{name}/client
-
-# client jar depenencies
-copy_dep_jars %{name}-client/target/%{name}-client-%{hadoop_version}/share/%{name}/client/lib %{buildroot}/%{_datadir}/%{name}/client/lib
-%{_bindir}/xmvn-subst %{buildroot}/%{_datadir}/%{name}/client/lib
-pushd %{name}-client/target/%{name}-client-%{hadoop_version}/share/%{name}/client/lib
- link_hadoop_jars %{buildroot}/%{_datadir}/%{name}/client/lib
-popd
-pushd %{name}-client/target/%{name}-client-%{hadoop_version}/share/%{name}/client
- link_hadoop_jars %{buildroot}/%{_datadir}/%{name}/client
-popd
-
-# common jar depenencies
-copy_dep_jars $basedir/share/%{name}/common/lib %{buildroot}/%{_datadir}/%{name}/common/lib
-%{_bindir}/xmvn-subst %{buildroot}/%{_datadir}/%{name}/common/lib
-pushd $basedir/share/%{name}/common
- link_hadoop_jars %{buildroot}/%{_datadir}/%{name}/common
-popd
-for f in `ls %{buildroot}/%{_datadir}/%{name}/common/*.jar`
-do
- echo "$f" | sed "s|%{buildroot}||" >> .mfiles
-done
-pushd $basedir/share/%{name}/common/lib
- link_hadoop_jars %{buildroot}/%{_datadir}/%{name}/common/lib
-popd
-
-# hdfs jar dependencies
-copy_dep_jars $hdfsdir/share/%{name}/hdfs/lib %{buildroot}/%{_datadir}/%{name}/hdfs/lib
-%{_bindir}/xmvn-subst %{buildroot}/%{_datadir}/%{name}/hdfs/lib
-%{__ln_s} %{_jnidir}/%{name}/%{name}-hdfs-bkjournal.jar %{buildroot}/%{_datadir}/%{name}/hdfs/lib
-pushd $hdfsdir/share/%{name}/hdfs
- link_hadoop_jars %{buildroot}/%{_datadir}/%{name}/hdfs
-popd
-
-# httpfs
-# Create the webapp directory structure
-pushd %{buildroot}/%{_sharedstatedir}/tomcats/httpfs
- %{__ln_s} %{_datadir}/%{name}/httpfs/tomcat/conf conf
- %{__ln_s} %{_datadir}/%{name}/httpfs/tomcat/lib lib
- %{__ln_s} %{_datadir}/%{name}/httpfs/tomcat/logs logs
- %{__ln_s} %{_datadir}/%{name}/httpfs/tomcat/temp temp
- %{__ln_s} %{_datadir}/%{name}/httpfs/tomcat/webapps webapps
- %{__ln_s} %{_datadir}/%{name}/httpfs/tomcat/work work
-popd
-
-# Copy the tomcat configuration and overlay with specific configuration bits.
-# This is needed so the httpfs instance won't collide with a system running
-# tomcat
-for cfgfile in catalina.policy catalina.properties context.xml \
- tomcat.conf web.xml server.xml logging.properties;
-do
- cp -a %{_sysconfdir}/tomcat/$cfgfile %{buildroot}/%{_sysconfdir}/%{name}/tomcat
-done
-
-# Replace, in place, the Tomcat configuration files delivered with the current
-# Fedora release. See BZ#1295968 for some reason.
-sed -i -e 's/8005/${httpfs.admin.port}/g' -e 's/8080/${httpfs.http.port}/g' %{buildroot}/%{_sysconfdir}/%{name}/tomcat/server.xml
-sed -i -e 's/catalina.base/httpfs.log.dir/g' %{buildroot}/%{_sysconfdir}/%{name}/tomcat/logging.properties
-# Given the permission, only the root and tomcat users can access to that file,
-# not the build user. So, the build would fail here.
-install -m 660 %{SOURCE14} %{buildroot}/%{_sysconfdir}/%{name}/tomcat/tomcat-users.xml
-
-# Copy the httpfs webapp
-cp -arf %{name}-hdfs-project/%{name}-hdfs-httpfs/target/webhdfs %{buildroot}/%{_datadir}/%{name}/httpfs/tomcat/webapps
-
-# Tell tomcat to follow symlinks
-cat > %{buildroot}/%{_datadir}/%{name}/httpfs/tomcat/webapps/webhdfs/META-INF/context.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<Context allowLinking="true">
-</Context>
-EOF
-
-# Remove the jars included in the webapp and create symlinks
-rm -f %{buildroot}/%{_datadir}/%{name}/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/tools*.jar
-rm -f %{buildroot}/%{_datadir}/%{name}/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib/tomcat-*.jar
-%{_bindir}/xmvn-subst %{buildroot}/%{_datadir}/%{name}/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib
-pushd %{buildroot}/%{_datadir}/%{name}/httpfs/tomcat/webapps/webhdfs/WEB-INF/lib
- link_hadoop_jars .
-popd
-
-pushd %{buildroot}/%{_datadir}/%{name}/httpfs/tomcat
- %{__ln_s} %{_datadir}/tomcat/bin bin
- %{__ln_s} %{_sysconfdir}/%{name}/tomcat conf
- %{__ln_s} %{_datadir}/tomcat/lib lib
- %{__ln_s} %{_var}/cache/%{name}-httpfs/temp temp
- %{__ln_s} %{_var}/cache/%{name}-httpfs/work work
- %{__ln_s} %{_var}/log/%{name}-httpfs logs
-popd
-
-# mapreduce jar dependencies
-mrdir='%{name}-mapreduce-project/target/%{name}-mapreduce-%{hadoop_version}'
-copy_dep_jars $mrdir/share/%{name}/mapreduce/lib %{buildroot}/%{_datadir}/%{name}/mapreduce/lib
-%{_bindir}/xmvn-subst %{buildroot}/%{_datadir}/%{name}/mapreduce/lib
-%{__ln_s} %{_javadir}/%{name}/%{name}-annotations.jar %{buildroot}/%{_datadir}/%{name}/mapreduce/lib
-pushd $mrdir/share/%{name}/mapreduce
- link_hadoop_jars %{buildroot}/%{_datadir}/%{name}/mapreduce
-popd
-
-# yarn jar dependencies
-yarndir='%{name}-yarn-project/target/%{name}-yarn-project-%{hadoop_version}'
-copy_dep_jars $yarndir/share/%{name}/yarn/lib %{buildroot}/%{_datadir}/%{name}/yarn/lib
-%{_bindir}/xmvn-subst %{buildroot}/%{_datadir}/%{name}/yarn/lib
-%{__ln_s} %{_javadir}/%{name}/%{name}-annotations.jar %{buildroot}/%{_datadir}/%{name}/yarn/lib
-pushd $yarndir/share/%{name}/yarn
- link_hadoop_jars %{buildroot}/%{_datadir}/%{name}/yarn
-popd
-
-# Install hdfs webapp bits
-cp -arf $hdfsdir/share/hadoop/hdfs/webapps/* %{buildroot}/%{_datadir}/%{name}/hdfs/webapps
-
-# hadoop layout. Convert to appropriate lib location for 32 and 64 bit archs
-lib=$(echo %{?_libdir} | sed -e 's:/usr/\(.*\):\1:')
-if [ "$lib" = "%_libdir" ]; then
- echo "_libdir is not located in /usr. Lib location is wrong"
- exit 1
-fi
-sed -e "s|HADOOP_COMMON_LIB_NATIVE_DIR\s*=.*|HADOOP_COMMON_LIB_NATIVE_DIR=$lib/%{name}|" %{SOURCE1} > %{buildroot}/%{_libexecdir}/%{name}-layout.sh
-
-# Default config
-cp -f %{SOURCE8} %{buildroot}/%{_sysconfdir}/%{name}/core-site.xml
-cp -f %{SOURCE9} %{buildroot}/%{_sysconfdir}/%{name}/hdfs-site.xml
-cp -f %{SOURCE10} %{buildroot}/%{_sysconfdir}/%{name}/mapred-site.xml
-cp -f %{SOURCE11} %{buildroot}/%{_sysconfdir}/%{name}/yarn-site.xml
-
-# systemd configuration
-install -d -m 0755 %{buildroot}/%{_unitdir}/
-for service in %{hdfs_services} %{mapreduce_services} %{yarn_services}
-do
- s=`echo $service | cut -d'-' -f 2 | cut -d'.' -f 1`
- daemon=$s
- if [[ "%{hdfs_services}" == *$service* ]]
- then
- src=%{SOURCE2}
- elif [[ "%{mapreduce_services}" == *$service* ]]
- then
- src=%{SOURCE3}
- elif [[ "%{yarn_services}" == *$service* ]]
- then
- if [[ "$s" == "timelineserver" ]]
- then
- daemon='historyserver'
- fi
- src=%{SOURCE4}
- else
- echo "Failed to determine type of service for %service"
- exit 1
- fi
- sed -e "s|DAEMON|$daemon|g" $src > %{buildroot}/%{_unitdir}/%{name}-$s.service
-done
-
-cp -f %{SOURCE12} %{buildroot}/%{_sysconfdir}/sysconfig/tomcat@httpfs
-
-# Ensure /var/run directories are recreated on boot
-echo "d %{_var}/run/%{name}-yarn 0775 yarn hadoop -" > %{buildroot}/%{_tmpfilesdir}/%{name}-yarn.conf
-echo "d %{_var}/run/%{name}-hdfs 0775 hdfs hadoop -" > %{buildroot}/%{_tmpfilesdir}/%{name}-hdfs.conf
-echo "d %{_var}/run/%{name}-mapreduce 0775 mapred hadoop -" > %{buildroot}/%{_tmpfilesdir}/%{name}-mapreduce.conf
-
-# logrotate config
-for type in hdfs httpfs yarn mapreduce
-do
- sed -e "s|NAME|$type|" %{SOURCE6} > %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}-$type
-done
-sed -i "s|{|%{_var}/log/hadoop-hdfs/*.audit\n{|" %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}-hdfs
-
-# hdfs init script
-install -m 755 %{SOURCE13} %{buildroot}/%{_sbindir}
-
-%pretrans -p <lua> hdfs
-path = "%{_datadir}/%{name}/hdfs/webapps"
-st = posix.stat(path)
-if st and st.type == "link" then
- os.remove(path)
-end
-
-%pre common
-getent group hadoop >/dev/null || groupadd -r hadoop
-
-%pre hdfs
-getent group hdfs >/dev/null || groupadd -r hdfs
-getent passwd hdfs >/dev/null || /usr/sbin/useradd --comment "Apache Hadoop HDFS" --shell /sbin/nologin -M -r -g hdfs -G hadoop --home %{_sharedstatedir}/%{name}-hdfs hdfs
-
-%pre mapreduce
-getent group mapred >/dev/null || groupadd -r mapred
-getent passwd mapred >/dev/null || /usr/sbin/useradd --comment "Apache Hadoop MapReduce" --shell /sbin/nologin -M -r -g mapred -G hadoop --home %{_var}/cache/%{name}-mapreduce mapred
-
-%pre yarn
-getent group yarn >/dev/null || groupadd -r yarn
-getent passwd yarn >/dev/null || /usr/sbin/useradd --comment "Apache Hadoop Yarn" --shell /sbin/nologin -M -r -g yarn -G hadoop --home %{_var}/cache/%{name}-yarn yarn
-
-%preun hdfs
-%systemd_preun %{hdfs_services}
-
-%preun mapreduce
-%systemd_preun %{mapreduce_services}
-
-%preun yarn
-%systemd_preun %{yarn_services}
-
-%ldconfig_scriptlets common-native
-
-%post hdfs
-# Change the home directory for the hdfs user
-if [[ `getent passwd hdfs | cut -d: -f 6` != "%{_sharedstatedir}/%{name}-hdfs" ]]
-then
- /usr/sbin/usermod -d %{_sharedstatedir}/%{name}-hdfs hdfs
-fi
-
-if [ $1 -gt 1 ]
-then
- if [ -d %{_var}/cache/%{name}-hdfs ] && [ ! -L %{_var}/cache/%{name}-hdfs ]
- then
- # Move the existing hdfs data to the new location
- mv -f %{_var}/cache/%{name}-hdfs/* %{_sharedstatedir}/%{name}-hdfs/
- fi
-fi
-%systemd_post %{hdfs_services}
-
-%ldconfig_scriptlets -n libhdfs
-
-%post mapreduce
-%systemd_post %{mapreduce_services}
-
-%post yarn
-%systemd_post %{yarn_services}
-
-%postun hdfs
-%systemd_postun_with_restart %{hdfs_services}
-
-if [ $1 -lt 1 ]
-then
- # Remove the compatibility symlink
- rm -f %{_var}/cache/%{name}-hdfs
-fi
-
-%postun mapreduce
-%systemd_postun_with_restart %{mapreduce_services}
-
-%postun yarn
-%systemd_postun_with_restart %{yarn_services}
-
-%posttrans hdfs
-# Create a symlink to the new location for hdfs data in case the user changed
-# the configuration file and the new one isn't in place to point to the
-# correct location
-if [ ! -e %{_var}/cache/%{name}-hdfs ]
-then
- %{__ln_s} %{_sharedstatedir}/%{name}-hdfs %{_var}/cache
-fi
-
-%files -f .mfiles-%{name}-client client
-%{_datadir}/%{name}/client
-
-%files -f .mfiles common
-%doc LICENSE.txt
-%doc NOTICE.txt
-%doc README.txt
-%config(noreplace) %{_sysconfdir}/%{name}/core-site.xml
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}-env.sh
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}-metrics.properties
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}-metrics2.properties
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}-policy.xml
-%config(noreplace) %{_sysconfdir}/%{name}/log4j.properties
-%config(noreplace) %{_sysconfdir}/%{name}/ssl-client.xml.example
-%config(noreplace) %{_sysconfdir}/%{name}/ssl-server.xml.example
-%config(noreplace) %{_sysconfdir}/%{name}/slaves
-%config(noreplace) %{_sysconfdir}/%{name}/configuration.xsl
-
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/common
-%{_datadir}/%{name}/common/lib
-%{_libexecdir}/%{name}-config.sh
-%{_libexecdir}/%{name}-layout.sh
-
-# Workaround for bz1012059
-%{_mavenpomdir}/JPP.%{name}-%{name}-project-dist.pom
-
-%{_bindir}/%{name}
-%{_sbindir}/%{name}-daemon.sh
-%{_sbindir}/%{name}-daemons.sh
-%{_sbindir}/start-all.sh
-%{_sbindir}/start-balancer.sh
-%{_sbindir}/start-dfs.sh
-%{_sbindir}/start-secure-dns.sh
-%{_sbindir}/stop-all.sh
-%{_sbindir}/stop-balancer.sh
-%{_sbindir}/stop-dfs.sh
-%{_sbindir}/stop-secure-dns.sh
-%{_sbindir}/slaves.sh
-
-%files common-native
-%{_libdir}/%{name}/libhadoop.*
-
-%files devel
-%{_includedir}/%{name}
-%{_libdir}/libhdfs.so
-
-%files -f .mfiles-%{name}-hdfs hdfs
-%config(noreplace) %{_sysconfdir}/%{name}/hdfs-site.xml
-%{_datadir}/%{name}/hdfs
-%{_unitdir}/%{name}-datanode.service
-%{_unitdir}/%{name}-namenode.service
-%{_unitdir}/%{name}-journalnode.service
-%{_unitdir}/%{name}-secondarynamenode.service
-%{_unitdir}/%{name}-zkfc.service
-%{_libexecdir}/hdfs-config.sh
-%{_bindir}/hdfs
-%{_sbindir}/distribute-exclude.sh
-%{_sbindir}/refresh-namenodes.sh
-%{_sbindir}/hdfs-create-dirs
-%{_tmpfilesdir}/%{name}-hdfs.conf
-%config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name}-hdfs
-%attr(0755,hdfs,hadoop) %dir %{_var}/run/%{name}-hdfs
-%attr(0755,hdfs,hadoop) %dir %{_var}/log/%{name}-hdfs
-%attr(0755,hdfs,hadoop) %dir %{_sharedstatedir}/%{name}-hdfs
-
-%files hdfs-fuse
-%attr(755,hdfs,hadoop) %{_bindir}/fuse_dfs
-
-%files httpfs
-%config(noreplace) %{_sysconfdir}/sysconfig/tomcat@httpfs
-%config(noreplace) %{_sysconfdir}/%{name}/httpfs-env.sh
-%config(noreplace) %{_sysconfdir}/%{name}/httpfs-log4j.properties
-%config(noreplace) %{_sysconfdir}/%{name}/httpfs-signature.secret
-%config(noreplace) %{_sysconfdir}/%{name}/httpfs-site.xml
-%attr(-,tomcat,tomcat) %config(noreplace) %{_sysconfdir}/%{name}/tomcat/*.*
-%attr(0775,root,tomcat) %dir %{_sysconfdir}/%{name}/tomcat
-%attr(0775,root,tomcat) %dir %{_sysconfdir}/%{name}/tomcat/Catalina
-%attr(0775,root,tomcat) %dir %{_sysconfdir}/%{name}/tomcat/Catalina/localhost
-%{_datadir}/%{name}/httpfs
-%{_sharedstatedir}/tomcats/httpfs
-%config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name}-httpfs
-%attr(0775,root,tomcat) %dir %{_var}/log/%{name}-httpfs
-%attr(0775,root,tomcat) %dir %{_var}/cache/%{name}-httpfs
-%attr(0775,root,tomcat) %dir %{_var}/cache/%{name}-httpfs/temp
-%attr(0775,root,tomcat) %dir %{_var}/cache/%{name}-httpfs/work
-
-%files -n libhdfs
-%{_libdir}/libhdfs.so.*
-
-%files -f .mfiles-%{name}-mapreduce mapreduce
-%config(noreplace) %{_sysconfdir}/%{name}/mapred-env.sh
-%config(noreplace) %{_sysconfdir}/%{name}/mapred-queues.xml.template
-%config(noreplace) %{_sysconfdir}/%{name}/mapred-site.xml
-%config(noreplace) %{_sysconfdir}/%{name}/mapred-site.xml.template
-%{_datadir}/%{name}/mapreduce
-%{_libexecdir}/mapred-config.sh
-%{_unitdir}/%{name}-historyserver.service
-%{_bindir}/mapred
-%{_sbindir}/mr-jobhistory-daemon.sh
-%{_tmpfilesdir}/%{name}-mapreduce.conf
-%config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name}-mapreduce
-%attr(0755,mapred,hadoop) %dir %{_var}/run/%{name}-mapreduce
-%attr(0755,mapred,hadoop) %dir %{_var}/log/%{name}-mapreduce
-%attr(0755,mapred,hadoop) %dir %{_var}/cache/%{name}-mapreduce
-
-%files -f .mfiles-%{name}-mapreduce-examples mapreduce-examples
-
-%files -f .mfiles-%{name}-maven-plugin maven-plugin
-
-%files -f .mfiles-%{name}-tests tests
-
-%files -f .mfiles-%{name}-yarn yarn
-%config(noreplace) %{_sysconfdir}/%{name}/capacity-scheduler.xml
-%config(noreplace) %{_sysconfdir}/%{name}/yarn-env.sh
-%config(noreplace) %{_sysconfdir}/%{name}/yarn-site.xml
-%{_unitdir}/%{name}-nodemanager.service
-%{_unitdir}/%{name}-proxyserver.service
-%{_unitdir}/%{name}-resourcemanager.service
-%{_unitdir}/%{name}-timelineserver.service
-%{_libexecdir}/yarn-config.sh
-%{_datadir}/%{name}/yarn
-%{_bindir}/yarn
-%{_sbindir}/yarn-daemon.sh
-%{_sbindir}/yarn-daemons.sh
-%{_sbindir}/start-yarn.sh
-%{_sbindir}/stop-yarn.sh
-%{_tmpfilesdir}/%{name}-yarn.conf
-%config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name}-yarn
-%attr(0755,yarn,hadoop) %dir %{_var}/run/%{name}-yarn
-%attr(0755,yarn,hadoop) %dir %{_var}/log/%{name}-yarn
-%attr(0755,yarn,hadoop) %dir %{_var}/cache/%{name}-yarn
-
-%files yarn-security
-%config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
-# Permissions set per upstream guidelines: https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/...
-# %%attr(6050,root,yarn) %%{_bindir}/container-executor
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.7.6-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.7.6-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.7.6-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jul 06 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 2.7.6-4
-- Disable container-executor builds (rhbz#1597446 not fixed on s390x and armv7hl)
-
-* Thu Jul 05 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 2.7.6-3
-- Fix rhbz#1597446 (container-executor builds) and rhbz#1593020 (CVE-2018-8009)
-
-* Fri Jun 29 2018 Mike Miller <mmiller(a)apache.org> - 2.7.6-2
-- Fix jetty version dependencies
-
-* Wed Jun 27 2018 Mike Miller <mmiller(a)apache.org> - 2.7.6-1
-- Upgrade to version 2.7.6
-
-* Tue May 29 2018 Rafael dos Santos <rdossant(a)redhat.com> - 2.7.3-10
-- Use standard Fedora build/linker flags (rhbz#1540172)
-
-* Wed Mar 07 2018 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 2.7.3-9
-- Add gcc-c++ BuildRequires
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.7.3-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 16 2018 Mike Miller <mmiller(a)apache.org> - 2.7.3-7
-- Update protobuf version
-
-* Fri Aug 04 2017 Mike Miller <mmiller(a)apache.org> - 2.7.3-6
-- Updated protobuf version
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.7.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.7.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed May 24 2017 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.7.3-3
-- Remove temporary BuildRequires on aether, which was retired
-
-* Fri Mar 17 2017 Mike Miller <mmiller(a)apache.org> - 2.7.3-2
-- Fix classpath issues
-
-* Thu Mar 02 2017 Mike Miller <mmiller(a)apache.org> - 2.7.3-1
-- Update to 2.7.3
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.4.1-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Dec 20 2016 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 2.4.1-25
-- Use protobuf 3.1.0; fixes FTBFS (bz#1396787)
-
-* Fri Oct 28 2016 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 2.4.1-24
-- build libhdfs for all architectures (bz#1328076)
-
-* Sun Oct 23 2016 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 2.4.1-23
-- fix jni patch on unsupported arches
-
-* Sat Oct 22 2016 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 2.4.1-22
-- General cleanup and restore builds on rawhide (disable hadoop-pipes)
-
-* Fri Jul 01 2016 Than Ngo <than(a)redhat.com> - 2.4.1-21
-- drop the patch Java detection on ppc64le which
- causes the wrong detection on ppc64le
-
-* Thu Jun 23 2016 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 2.4.1-20
-- Fix broken symlink (bz#1308662) and bad Requires(pre) (bz#1319092)
-
-* Tue Jun 21 2016 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 2.4.1-19
-- Fix FTBFS due to maven-jar-plugin behavior and missing maven-source-plugin
-
-* Thu Jun 16 2016 Christopher Tubbs <ctubbsii(a)fedoraproject.org> - 2.4.1-18
-- Drop unnecessary nc6 dependency
-
-* Mon Jun 13 2016 Till Maas <opensource(a)till.name> - 2.4.1-17
-- Rebuild for unretirement
-
-* Sun May 8 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.4.1-16
-- rebuild (aarch64)
-
-* Sat Feb 06 2016 Denis Arnaud <denis.arnaud(a)fedoraproject.org> 2.4.1-15
-- Rebuilt for new EclipseLink jersey1
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.4.1-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sun Jan 31 2016 Denis Arnaud <denis.arnaud(a)fedoraproject.org> 2.4.1-13
-- Fixed the FTBFS on Fedora 24+
-
-* Sat Jan 09 2016 Denis Arnaud <denis.arnaud(a)fedoraproject.org> 2.4.1-12
-- Fix BZ#1295968: start of tomcat@httpfs
-
-* Wed Sep 09 2015 gil cattaneo <puntogil(a)libero.it> 2.4.1-11
-- fix FTBFS RHBZ#1239555
-- remove all BuildRequires which have been istalled by default
-
-* Fri Jul 10 2015 Mosaab Alzoubi <moceap(a)hotmail.com> - 2.4.1-10
-- Fix #1239555
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Apr 21 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.4.1-8
-- Fix building on ARMv7
-
-* Wed Mar 11 2015 Swapnil Kulkarni <coolsvap(a)gmail.com> 2.4.1-7
-- Added groovy18 dependency
-
-* Sun Feb 15 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.4.1-7
-- Update netty3 patch for 3.9.3
-
-* Mon Oct 27 2014 Robert Rati <rrati@redhat> - 2.4.1-6
-- Changed commons-httpclient BR/R to jakarta-commons-httpclient
-- Changed commons-codec BR to apache-commons-codec
-
-* Fri Oct 10 2014 Dan Hork <dan[at]danny.cz> - 2.4.1-5
-- fix OOM during build on s390x and ppc64le (#1149295)
-- fix Java detection on ppc64le
-
-* Wed Oct 8 2014 Robert Rati <rrati@redhat> - 2.4.1-4
-- Exclude asm3 as a runtime dependency
-- Removed explict dependency on yarn from the mapreduce package
-- Added mapreduce dependency on yarn package
-
-* Mon Sep 29 2014 Robert Rati <rrati@redhat> - 2.4.1-3
-- Rebuild
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Tue Jul 15 2014 Robert Rati <rrati@redhat> - 2.4.1-1
-- Update to upstream release 2.4.1
-- Fixed resolution of test jars
-
-* Thu Jun 26 2014 Robert Rati <rrati@redhat> - 2.4.0-3
-- Fixed FTBFS (#1106748)
-- Update to build with guava 17.0
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue May 27 2014 Robert Rati <rrati@redhat> - 2.4.0-1
-- Update to upstream release 2.4.0
-- Fix fedora conditionals for non-fedora systems (BZ1083135)
-- Conditionalize javadoc generation
-- Update BuildRequires
-
-* Fri Mar 28 2014 Michael Simacek <msimacek(a)redhat.com> - 2.2.0-7
-- Use Requires: java-headless rebuild (#1067528)
-
-* Mon Feb 17 2014 Timothy St. Clair <tstclair(a)redhat.com> - 2.2.0-6
-- Rebuild with modification to systemd initialization for tachyon support
-
-* Mon Feb 3 2014 Robert Rati <rrati@redhat> - 2.2.0-5
-- Added json_simple dependency to httpfs package
-- Added default tomcat-users file
-- Fixed up file permissions and ownership for tomcat configuration
-- Conditionalize the zookeeper-test modes to < F21
-- Additional fix for netty3 compat package for >F20
-
-* Fri Jan 24 2014 Robert Rati <rrati@redhat> - 2.2.0-4
-- Fixed 2 packages providing hadoop-yarn-server-tests (BZ1056521)
-- Package httpfs bits using tomcat@ service
-- Patches for jetty 9.1.0 and guava 0.15 on >F20
-- Use netty3 compat package for >F20
-- Moved limits configuration to systemd files
-- By default logrotate will keep 1 year of logs
-
-* Tue Dec 3 2013 Robert Rati <rrati@redhat> - 2.2.0-3
-- Removed jline Requires
-
-* Tue Dec 3 2013 Robert Rati <rrati@redhat> - 2.2.0-2
-- Changed provides filter to just filter the .so
-- Corrected naming of hadoop-common test jar
-- Removed jline BuildRequires
-- Moved pre/port install invocation of ldconfig to common-native
-- Added workaround for bz1023116
-
-* Wed Oct 23 2013 Robert Rati <rrati@redhat> - 2.2.0-1
-- Update to upstream 2.2.0
-- New patch to open libjvm with dlopen
-- Conditionally compile libhdfs and deps for x86 only
-- Added BR on objenesis >= 1.2-16
-- Removed rpath from libhdfs
-- Removed unneeded header files from devel
-- Removed kfs removal patch
-
-* Thu Oct 10 2013 Robert Rati <rrati@redhat> - 2.0.5-12
-- Removed workaround for BZ1015612
-- Filtered libhadoop provides/requires (BZ1017596)
-- Fixed symlink for hdfs-bkjournal
-- Moved libhdfs.so to devel package (BZ1017579)
-- Fixed symlink paths for hadoop jars (BZ1017568)
-- Added ownership of %%{_datadir}/%%{name}/hadoop/common
-
-* Mon Oct 7 2013 Robert Rati <rrati@redhat> - 2.0.5-11
-- Workaround for BZ1015612
-- Added BuildRequires on gcc-g++ and make
-- Removed duplicated deps from common package
-
-* Thu Oct 3 2013 Robert Rati <rrati@redhat> - 2.0.5-10
-- Added dependency on which
-- Added pom files for test jars
-- Removed workaround for BZ986909
-- Packaged additional test jars and pom files
-- Added workaround for bz1012059
-- Updated hdfs-create-dirs to format the namenode if it is not formatted
-- Spec cleanup
-
-* Fri Sep 13 2013 Robert Rati <rrati@redhat> - 2.0.5-9
-- Removed rcc. It was obsolete and conflicted with qt-devel (BZ1003034)
-- Moved to xmvn-subst for jar dependency symlinks
-- Packaged test jars into test subpackage
-- hdfs subpackage contains bkjounal jar
-- Created client subpackage
-- Moved libhdfs to %%{_libdir} (BZ1003036)
-- Added dependency from libhdfs to hdfs (BZ1003039)
-
-* Wed Aug 28 2013 Robert Rati <rrati@redhat> - 2.0.5-8
-- Removed systemPath, version, and scope from tools.jar dependency definition
-
-* Tue Aug 20 2013 Robert Rati <rrati@redhat> - 2.0.5-7
-- Changed hdfs subpackage from hadoop-libhdfs to libhdfs
-- Don't build any packages on arm architectures
-
-* Thu Aug 08 2013 Robert Rati <rrati@redhat> - 2.0.5-6
-- Made libhdfs dependencies arch specific
-- Moved docs into common
-
-* Wed Aug 07 2013 Robert Rati <rrati@redhat> - 2.0.5-5
-- Corrected license info
-- Removed duplicate Requires
-- Removed rpath references
-- Corrected some permissions
-
-* Tue Aug 06 2013 Robert Rati <rrati@redhat> - 2.0.5-4
-- Native bits only built/packaged for intel architectures
-- javadoc only generated on 64-bit intel
-- Updated URL
-
-* Wed Jul 24 2013 Robert Rati <rrati@redhat> - 2.0.5-3
-- Removed gmaven as BR
-
-* Wed Jul 24 2013 Robert Rati <rrati@redhat> - 2.0.5-2
-- Fixed packaging for JNI jar/libraries
-- Made packages noarch that are architecture independent
-- Added cglib as a BuildRequires
-- Removed explicit lib Requires
-- Convert to XMvn macros
-- Packaged the maven plugin
-- Convert to jetty9 jspc compiler
-- Removed xmlenc workaround
-
-* Tue Jul 16 2013 Robert Rati <rrati@redhat> - 2.0.5-1
-- Initial packaging
diff --git a/hdfs-create-dirs b/hdfs-create-dirs
deleted file mode 100644
index 0f0d7d8..0000000
--- a/hdfs-create-dirs
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-hdfs_dirs="/user /var/log /tmp"
-mapred_dirs="/tmp/hadoop-yarn/staging /tmp/hadoop-yarn/staging/history /tmp/hadoop-yarn/staging/history/done /tmp/hadoop-yarn/staging/history/done_intermediate"
-yarn_dirs="/tmp/hadoop-yarn /var/log/hadoop-yarn"
-
-# Must be run as root
-if [[ $EUID -ne 0 ]]
-then
- echo "This must be run as root" 1>&2
- exit 1
-fi
-
-# Start the namenode if it isn't running
-started=0
-systemctl status hadoop-namenode > /dev/null 2>&1
-rc=$?
-if [[ $rc -gt 0 ]]
-then
- # Format the namenode if it hasn't been formatted
- runuser hdfs -s /bin/bash /bin/bash -c "hdfs namenode -format -nonInteractive" > /dev/null 2>&1
- if [[ $? -eq 0 ]]
- then
- echo "Formatted the Hadoop namenode"
- fi
-
- echo "Starting the Hadoop namenode"
- systemctl start hadoop-namenode > /dev/null 2>&1
- rc=$?
- started=1
-fi
-
-if [[ $rc -ne 0 ]]
-then
- echo "The Hadoop namenode failed to start"
- exit 1
-fi
-
-for dir in $hdfs_dirs $yarn_dirs $mapred_dirs
-do
- echo "Creating directory $dir"
- runuser hdfs -s /bin/bash /bin/bash -c "hadoop fs -mkdir -p $dir" > /dev/null 2>&1
-done
-
-echo "Setting permissions on /tmp"
-runuser hdfs -s /bin/bash /bin/bash -c "hadoop fs -chmod 1777 /tmp" > /dev/null 2>&1
-
-for dir in $mapred_dirs
-do
- echo "Setting permissions and ownership for $dir"
- runuser hdfs -s /bin/bash /bin/bash -c "hadoop fs -chown mapred:mapred $dir" > /dev/null 2>&1
- runuser hdfs -s /bin/bash /bin/bash -c "hadoop fs -chmod 1777 $dir" > /dev/null 2>&1
-done
-
-for dir in $yarn_dirs
-do
- echo "Setting permissions and ownership for $dir"
- runuser hdfs -s /bin/bash /bin/bash -c "hadoop fs -chown yarn:mapred $dir" > /dev/null 2>&1
-done
-
-# Stop the namenode if we started it
-if [[ $started -gt 0 ]]
-then
- echo "Stopping the Hadoop namenode"
- systemctl stop hadoop-namenode > /dev/null 2>&1
-fi
diff --git a/protobuf3.patch b/protobuf3.patch
deleted file mode 100644
index 0b65416..0000000
--- a/protobuf3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java 2016-12-20 15:18:20.683682746 -0500
-+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java 2016-12-20 15:18:10.496932909 -0500
-@@ -53,7 +53,7 @@
- import com.google.protobuf.BlockingService;
- import com.google.protobuf.CodedOutputStream;
- import com.google.protobuf.Descriptors.MethodDescriptor;
--import com.google.protobuf.GeneratedMessage;
-+import com.google.protobuf.GeneratedMessageV3;
- import com.google.protobuf.Message;
- import com.google.protobuf.ServiceException;
- import com.google.protobuf.TextFormat;
-@@ -281,7 +281,7 @@
- * Protobuf. Several methods on {@link org.apache.hadoop.ipc.Server and RPC}
- * use type Writable as a wrapper to work across multiple RpcEngine kinds.
- */
-- private static abstract class RpcMessageWithHeader<T extends GeneratedMessage>
-+ private static abstract class RpcMessageWithHeader<T extends GeneratedMessageV3>
- implements RpcWrapper {
- T requestHeader;
- Message theRequest; // for clientSide, the request is here
---- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
-+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
-@@ -584,7 +584,7 @@ private SectionName(String name) {
- }
- }
-
-- private static int getOndiskTrunkSize(com.google.protobuf.GeneratedMessage s) {
-+ private static int getOndiskTrunkSize(com.google.protobuf.GeneratedMessageV3 s) {
- return CodedOutputStream.computeRawVarint32Size(s.getSerializedSize())
- + s.getSerializedSize();
- }
diff --git a/sources b/sources
deleted file mode 100644
index 77befd7..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (hadoop-2.7.6-src.tar.gz) = 8a87bcbd58bd47c996ba6c00739d3261003883fe747d00ed3da8196ae9c625dc6d53e8a25e78eb6bc9fb0b8c975f834a4dca7198e1beb5e4773008eb4726f168
4 years, 10 months
Architecture specific change in rpms/gyachi.git
by githook-noreply@fedoraproject.org
The package rpms/gyachi.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/gyachi.git/commit/?id=87d9a4d3a53....
Change:
-%ifnarch i386
Thanks.
Full change:
============
commit 87d9a4d3a53dbcb0ec81c67c782da6df6f4203a7
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:51:16 2019 +0000
gyachi fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675093
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c722c57..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-gyachi-1.2.10.tar.gz
-/gyachi-1.2.11.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..86a1282
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+gyachi fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675093
diff --git a/format-string.patch b/format-string.patch
deleted file mode 100644
index ea94875..0000000
--- a/format-string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gyachi-1.2.11/webcam/gyachewebcam.c.orig 2013-12-12 14:27:46.912041950 -0500
-+++ gyachi-1.2.11/webcam/gyachewebcam.c 2013-12-12 14:28:44.283994167 -0500
-@@ -550,7 +550,7 @@
- _("Last image received:"), stampbuf );
- }
- else {
-- snprintf( timebuf, 126, _("Connected") );
-+ snprintf( timebuf, 126, "%s", _("Connected") );
- }
- gtk_label_set_markup(GTK_LABEL(vstatuslabel), timebuf );
- }
diff --git a/gyachi.spec b/gyachi.spec
deleted file mode 100644
index d9841fe..0000000
--- a/gyachi.spec
+++ /dev/null
@@ -1,565 +0,0 @@
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-%define _without_photo_album 1
-%undefine _with_photo_album
-%define _without_xmms 1
-%undefine _with_xmms
-
-%ifnarch i386
-%define _without_wine 1
-%undefine _with_wine
-%endif
-
-%if 0%{?fc7}%{?el4}%{?el5}
-%define _without_pulseaudio 1
-%undefine _with_pulseaudio
-%endif
-
-%define _without_gpgme 1
-%undefine _with_gpgme
-
-%if 0%{?el4}
-%define _without_gpgme 1
-%undefine _with_gpgme
-%define _without_libnotify 1
-%undefine _with_libnotify
-%endif
-
-%if 0%{?rhel}
-%define _without_xmms 1
-%undefine _with_xmms
-%endif
-
-Name: gyachi
-Version: 1.2.11
-Release: 21%{?dist}
-Summary: A Yahoo! chat client with Webcam and voice support
-
-License: GPLv2
-URL: http://gyachi.sourceforge.net
-Source0: http://downloads.sourceforge.net/%{name}/%{name}/%{version}/%{name}-%{ver...
-
-Patch1: format-string.patch
-
-BuildRequires: autoconf automake gawk sed
-BuildRequires: expat-devel gettext-devel
-BuildRequires: glibc-devel >= 2.2.0 webkitgtk-devel
-%if 0%{?el4}
-BuildRequires: libtool
-%else
-BuildRequires: libtool libtool-ltdl-devel
-%endif
-%if 0%{?el4}
-BuildRequires: xorg-x11-devel
-%else
-BuildRequires: libXt-devel
-%endif
-BuildRequires: desktop-file-utils ImageMagick
-BuildRequires: openssl-devel
-BuildRequires: gtk2-devel
-BuildRequires: jasper-devel >= 1.701.0
-BuildRequires: libv4l-devel
-
-Requires: gtk2
-#jasper >= 1.701 needed for memory leak fix.
-%if 0%{?fc7}%{?el4}%{?el5}
-Requires: jasper >= 1.701.0
-%else
-Requires: jasper-libs >= 1.701.0
-%endif
-Requires: ImageMagick
-
-%description
-GYachI is a Linux client for Yahoo! Messenger protocol,
-written using GTK+ GUI toolkit. This package includes both
-the external voice chat program, GYVoice, and the
-external webcam program, GyachI-Webcam.
-In addition, this package includes GyachI-Broadcaster for
-sending webcam streams.
-
-%description -l de
-GYachI ist ein Linux client fr das Yahoo! Messenger Protokoll
-und besitzt eine GTK+-Oberflche. Dieses Paket beinhaltet
-auch externe Programme fr Audio- und Videochat.
-
-%description -l sr
-GYachI je klijent za Yahoo! Messenger, napisan pomou GTK+
-grafikog alata. Uz ovaj program isporuuje se eksterni "chat" program,
-kao i programi za korienje web-kamere (slanje i primanje slike).
-
-
-%if 0%{!?_without_blowfish:1}
-%package plugin-blowfish
-Summary: Blowfish encryption plugin for GyachI
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-blowfish
-Blowfish encryption plugin for GyachI
-%endif
-
-
-%if 0%{!?_without_gpgme:1}
-%package plugin-gpgme
-Summary: GPGMe encryption plugin for GyachI
-BuildRequires: gpgme-devel
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-gpgme
-GPGMe encryption plugin for GyachI
-%endif
-
-
-%if 0%{!?_without_mcrypt:1}
-%package plugin-mcrypt
-Summary: MCrypt encryption plugin for GyachI
-Requires: %{name} = %{version}-%{release}
-Requires: libmcrypt >= 2.5.0
-Buildrequires: libmcrypt-devel >= 2.5.0
-
-%description plugin-mcrypt
-MCrypt encryption plugin for GyachI
-%endif
-
-
-%if 0%{?_with_photo_album:1}
-%package plugin-photo_album
-Summary: Photo album plugin for GyachI
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-photo_album
-Photo album plugin for GyachI
-%endif
-
-
-%if 0%{?_with_xmms:1}
-%package plugin-xmms
-Summary: XMMS plugin for GyachI
-Requires: %{name} = %{version}-%{release}
-Requires: xmms >= 1.2.0
-Buildrequires: xmms-devel >= 1.2.0
-
-%description plugin-xmms
-XMMS plugin for GyachI
-%endif
-
-
-%if 0%{!?_without_libnotify:1}
-%package plugin-libnotify
-Summary: libnotify popup replacement
-Requires: %{name} = %{version}-%{release}
-Buildrequires: libnotify-devel
-
-%description plugin-libnotify
-libnotify plugin for GyachI
-%endif
-
-
-%package plugin-alsa
-Summary: libalsa sound driver
-Requires: %{name} = %{version}-%{release}
-BuildRequires: alsa-lib-devel >= 0.9
-Requires: alsa-lib >= 0.9
-
-%description plugin-alsa
-ALSA sound driver for gyachi
-
-
-%if 0%{!?_without_pulseaudio:1}
-%package plugin-pulseaudio
-Summary: pulseaudio sound driver
-Requires: %{name} = %{version}-%{release}
-BuildRequires: pulseaudio-libs-devel
-Requires: pulseaudio-libs
-
-%description plugin-pulseaudio
-PulseAudio sound driver for gyachi
-%endif
-
-
-%if 0%{!?_without_gtkspell:1}
-%package plugin-gtkspell
-Summary: gtkspell spell check
-Requires: %{name} = %{version}-%{release}
-BuildRequires: gtkspell-devel
-Requires: gtkspell
-
-%description plugin-gtkspell
-Spell check plugin for gyachi using gtkspell
-%endif
-
-
-%package recre8-theme
-Summary: GyachI Prototype theme
-Requires: %{name} = %{version}-%{release}
-
-%description recre8-theme
-%{summary} This package supplies the artwork for the GyachI recre8 theme.
-
-
-%package YMlike-theme
-Summary: GyachI Prototype theme
-Requires: %{name} = %{version}-%{release}
-
-%description YMlike-theme
-%{summary} This package supplies the artwork for the GyachI YMlike theme.
-This theme is an independent re-implementation of the yahoo theme.
-
-
-%package pidgy-theme
-Summary: GyachI Prototype theme
-Requires: %{name} = %{version}-%{release}
-
-%description pidgy-theme
-%{summary} This package supplies the artwork for the GyachI pidgy theme.
-This theme uses the pidgin icons, and is copyrighted by it's respective authors.
-
-%prep
-%setup -q
-%patch1 -p1
-
-%build
-./autogen.sh
-
-#NOTE: xmms & photo_album are disabled, by default, in configure.
-# if either are wanted, then they must be explicitly enabled!
-%configure --disable-rpath \
- --libexecdir=%{_libexecdir}/gyachi \
- %{?_without_wine:--disable-wine} \
- %{?_without_blowfish:--disable-plugin_blowfish} \
- %{?_without_mcrypt:--disable-plugin_mcrypt} \
- %{?_without_gpgme:--disable-plugin_gpgme} \
- %{?_without_pulseaudio:--disable-plugin_pulseaudio} \
- %{?_without_libnotify:--disable-plugin_libnotify} \
- %{?_without_gktspell:--disable-plugin_gtkspell} \
- %{?_with_photo_album:--enable-plugin_photo_album} \
- %{?_with_xmms:--enable-plugin_xmms} \
-
-make %{?_smp_mflags}
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
-rm $RPM_BUILD_ROOT%{_libdir}/libgyachi.la
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/libgyachi*.la
-%find_lang %{name}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -sf ../%{name}/themes/gyachi-classic/gyach-icon_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --mode 0644 \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
-
-
-%files -f %{name}.lang
-%{_bindir}/%{name}*
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/audibles
-%{_datadir}/%{name}/smileys
-%{_datadir}/%{name}/sounds
-%{_datadir}/%{name}/tuxvironments
-%{_datadir}/%{name}/voice_servers
-%dir %{_datadir}/%{name}/themes
-%{_datadir}/%{name}/themes/gyachi-classic
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/%{name}-*
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%{_libdir}/libgyachi.so
-%{_docdir}/%{name}-%{version}
-%docdir %{_docdir}/%{name}-%{version}
-
-
-%if 0%{!?_without_blowfish:1}
-%files plugin-blowfish
-%{_libdir}/%{name}/plugins/lib%{name}blowfish.so
-%endif
-
-%if 0%{!?_without_gpgme:1}
-%files plugin-gpgme
-%{_libdir}/%{name}/plugins/lib%{name}gpgme.so
-%endif
-
-%if 0%{!?_without_mcrypt:1}
-%files plugin-mcrypt
-%{_libdir}/%{name}/plugins/lib%{name}mcrypt.so
-%endif
-
-%if 0%{?_with_photo_album:1}
-%files plugin-photo_album
-%{_libdir}/%{name}/plugins/lib%{name}photos.so
-%endif
-
-%if 0%{?_with_xmms:1}
-%files plugin-xmms
-%{_libdir}/%{name}/plugins/lib%{name}xmms.so
-%endif
-
-%if 0%{!?_without_libnotify:1}
-%files plugin-libnotify
-%{_libdir}/%{name}/plugins/lib%{name}libnotify.so
-%endif
-
-%files plugin-alsa
-%{_libdir}/%{name}/plugins/lib%{name}alsa.so
-
-%if 0%{!?_without_pulseaudio:1}
-%files plugin-pulseaudio
-%{_libdir}/%{name}/plugins/lib%{name}pulseaudio.so
-%endif
-
-%if 0%{!?_without_gtkspell:1}
-%files plugin-gtkspell
-%{_libdir}/%{name}/plugins/lib%{name}gtkspell.so
-%endif
-
-%files recre8-theme
-%{_datadir}/%{name}/themes/recre8/
-
-%files YMlike-theme
-%{_datadir}/%{name}/themes/YMlike/
-
-%files pidgy-theme
-%{_datadir}/%{name}/themes/pidgy/
-
-
-%ldconfig_scriptlets
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.11-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.11-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.11-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.11-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.11-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.11-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.11-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.11-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.11-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.11-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.11-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Dec 12 2013 Rahul Sundaram <sundaram(a)fedoraproject.org> - 1.2.11-10
-- add a patch to build with Werror=format-security flag (rhbz#1037117)
-- fix spec to comply with unversioned doc dir change (rhbz#993788)
-- fix bogus dates in spec file
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.11-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Apr 24 2013 Jon Ciesla <limburgher(a)gmail.com> - 1.2.11-8
-- Drop desktop vendor tag.
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.11-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 1.2.11-6
-- rebuild due to "jpeg8-ABI" feature drop
-
-* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.2.11-5
-- rebuild against new libjpeg
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.11-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.11-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 06 2011 Adam Jackson <ajax(a)redhat.com> - 1.2.11-2
-- Rebuild for new libpng
-
-* Sat Sep 03 2011 Rahul Sundaram <sundaram(a)fedoraproject.org> - 1.2.11-1
-- new upstream release
-- drop no longer needed patches
-- build requires on webkitgtk-devel instead of deprecated gtkhtml2-devel
-
-* Tue May 17 2011 Tom Callaway <spot(a)fedoraproject.org> - 1.2.10-5
-- use libv4l1 header instead of obsolete kernel header
-- fix gtk compile issues
-- support notify 0.7
-- cleanup desktop file (bz 616122)
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun Jul 25 2010 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.2.10-3
-- Disabled gpgme until we figure out the new gpgme.
-
-* Sun Jul 25 2010 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.2.10-2
-- Update to upstream. Fix BZ 613527 615624
-
-* Sat Jun 19 2010 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.2.9-3
-- Update to upstream. Fix BZ 565304 583642 586277 603260 546299 550567
-- 554041 577724 553506 578264 605875 541761 541795 562472 564430 571077
-- 599177 600687 602517
-
-* Mon Jun 14 2010 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.2.8-2
-- Update to upstream to fix build/link issue
-
-* Mon Jun 14 2010 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.2.7-2
-- Update to upstream.
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 1.2.1-6
-- rebuilt with new openssl
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jul 3 2009 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.2.1-4
-- Fix double post of YM-9 client text.
-
-* Thu Jul 2 2009 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.2.0-4
-- Fixed Yahoo PM text problem
-
-* Fri May 22 2009 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.71-4
-- Added file %%{_datadir}/%%{name}/voice_servers to payload.
-
-* Thu May 21 2009 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.71-3
-- Update from upstream
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.61-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Jan 19 2009 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.61.3
-- change plugin Obsoletes
-
-* Fri Jan 16 2009 Tomas Mraz <tmraz(a)redhat.com> - 1.1.61-2
-- rebuild with new openssl
-
-* Sat Jan 03 2009 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.61.1
-- Add fix for segfault in file transfer.
-
-* Mon Dec 22 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.60.1
-- Fixed plugin obsoletes.
-
-* Fri Dec 19 2008 Rakesh Pandit <rakesh(a)fedoraproject.org> - 1.1.59-7
-- Fixed wrong obsoletes names for xmms and photo album plugin
-- Fixed rpmlint noise for changelog and removed mix of space and tabs on SRPM
-
-* Fri Nov 28 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.59.6
-- Added Obsoletes for previous versions of modules no longer being built.
-
-* Tue Nov 25 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.59.5
-- Upstream updates. Added gtkspell spellchecker.
-
-* Sat Nov 22 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.58.5
-- Upstream updates - added a [Revert] button to webcam upload, to revert cam
-- settings to saved rc settings.
-
-* Fri Nov 21 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.57.5
-- Upstream updates - better support of webcam features.
-
-* Fri Nov 21 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.56-5
-- Upstream updates - webcam viewer/uploader fix for segfault. Cache "custom
-- away message" between runs, convert the systray icon to a GtkStatusIcon
-
-* Wed Nov 19 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.55-5
-- Upstream fix for Y15 login seg fault.
-
-* Wed Nov 19 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.53-14
-- obsoleted photo_album plugin.
-
-* Mon Nov 17 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.53-10
-- updated from upstream.
-
-* Thu Nov 6 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.50-10
-- updated from upstream.
-
-* Mon Oct 20 2008 Gregory D Hosler <ghosler(a)users.sourceforge.net> - 1.1.49-3
-- Added pidgy theme
-- Added support for libv4l
-
-* Sun Sep 7 2008 Hans de Goede <hdegoede(a)redhat.com> - 1.1.46-10
-- Patch to use libv4l for support for more webcams
-
-* Thu Aug 28 2008 Michael Schwendt <mschwendt(a)fedoraproject.org> - 1.1.46-9
-- include %%_libdir/gyachi directory
-- include recre8 theme directory
-- post+postun: run /sbin/ldconfig directly
-
-* Fri Aug 8 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.46-8
-- sync with upstream patchs
-
-* Fri Aug 8 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.45-8
-- sync with upstream patchs
-
-* Sun Aug 3 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.43-8
-- removed DEPRECATED compile option for GTK.
-
-* Sun Aug 3 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.43-7
-- removed unnecessary reference to theme-patch formerly as Patch0
-
-* Sun Aug 3 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.43-6
-- update to upstream 1.1.43
-
-* Sat Jul 12 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.35-16
-- gyachi obsoletes gyachi-plugin-photosharing
-
-* Tue Jul 8 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.35-15
-- plugin-photo_album obsoletes plugin-photosharing
-
-* Fri Jun 20 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.35-12
-- Changed jasper-libs back to jasper for el4/el5
-
-* Fri Jun 20 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.35-8
-- disabled libnotify, gpgme for RHEL4, changed libXt-devel and
-- libtool-ltdl-devel for RHEL4
-
-* Mon Jun 16 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.35-7
-- disabled xmms plugin for rhel, pulseaudio for EL4/EL5
-- removed a gnu extension strchrnul in theme_support.c
-
-* Mon Jun 16 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.35-6
-- Made Alsa driver a plugin, added pulseaudio support as a plugin.
-- Disabled pulseaudio plugin for F7
-
-* Tue May 20 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.32-3
-- added openssl-devel as dependency
-
-* Tue May 20 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.32-2
-- updated configure to automatically build xmms & photo_album plugins.
-
-* Mon May 05 2008 Gregory D Hosler <ghosler(a)fedoraproject.org> - 1.1.32-1
-- updated gyachi to 1.1.32 from upstream
-- fixed %%files to include the full documentation directory, and the new
-- libgyachi library.
-- updated configure to set libdir & libexecdir to be %%{_libdir} (x64 lib fix)
-- added new gyachi modules (libnotify, and recre8)
-- updated the name change of the old photosharing module to photo_album
-
-* Mon Feb 05 2007 Rahul Sundaram <sundaram(a)fedoraproject.org> - 1.1.0-7
-- Fix directory ownership and timestamp issues highlighted by Mamoru Tasaka and Parag Nemade
-
-* Mon Feb 05 2007 Rahul Sundaram <sundaram(a)fedoraproject.org> - 1.1.0-6
-- Apply upstream patch to make it build on all arch's
-
-* Sun Feb 04 2007 Rahul Sundaram <sundaram(a)fedoraproject.org> - 1.1.0-5
-- Add ExcludeArchs
-
-* Sun Feb 04 2007 Rahul Sundaram <sundaram(a)fedoraproject.org> - 1.1.0-4
-- Fix review as per Parag Nemade
-
-* Sat Feb 03 2007 Rahul Sundaram <sundaram(a)fedoraproject.org> - 1.1.0-3
-- Initial spec file based on spec from Christopher Polyte (drpixel)
diff --git a/sources b/sources
deleted file mode 100644
index a8d4a2e..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-c2cb665ced3bbdc66cf37320f291726c gyachi-1.2.11.tar.gz
4 years, 10 months
Architecture specific change in rpms/gstreamer-plugins-good.git
by githook-noreply@fedoraproject.org
The package rpms/gstreamer-plugins-good.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/gstreamer-plugins-good.git/commit....
Change:
-%ifnarch s390 s390x
Thanks.
Full change:
============
commit 981f05f58de8ffd1a6894c53b1e7b3d07b337a06
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 13:50:34 2019 +0000
gstreamer-plugins-good fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675065
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 48fe863..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/gst-plugins-good-0.10.29.tar.bz2
-/gst-plugins-good-0.10.30.tar.xz
-/gst-plugins-good-0.10.31.tar.xz
diff --git a/0001-fix-v4l2_munmap.patch b/0001-fix-v4l2_munmap.patch
deleted file mode 100644
index 1913fb0..0000000
--- a/0001-fix-v4l2_munmap.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4cd9255f0a8a9e15d81561f00f02d275b5095f70 Mon Sep 17 00:00:00 2001
-From: Oleksij Rempel (Alexey Fisher) <bug-track(a)fisher-privat.net>
-Date: Thu, 01 Mar 2012 13:15:29 +0000
-Subject: v4l2src: fix v4l2_munmap() for compressed formats
-
-Make sure we always call munmap() with the same size we called mmap()
-with before.
-
-Current v4l2src uses the same structure for VIDIOC_QUERYBUF, VIDIOC_QBUF
-and v4l2_munmap calls. The problem is that the video buffer size (length)
-may vary for compressed or emulated bufs. VIDIOC_QBUF will change it if
-we pass the pointer of a v4l2_buffer. This is why we should avoid using
-same variable for mmap and video buffers.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=671126
----
-(limited to 'sys/v4l2')
-
-diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
-index b81c6a4..51419ff 100644
---- a/sys/v4l2/gstv4l2bufferpool.c
-+++ b/sys/v4l2/gstv4l2bufferpool.c
-@@ -106,9 +106,9 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer * buffer)
- if (!resuscitated) {
- GST_LOG_OBJECT (pool->v4l2elem,
- "buffer %p (data %p, len %u) not recovered, unmapping",
-- buffer, GST_BUFFER_DATA (buffer), buffer->vbuffer.length);
-+ buffer, GST_BUFFER_DATA (buffer), buffer->mmap_length);
- gst_mini_object_unref (GST_MINI_OBJECT (pool));
-- v4l2_munmap ((void *) GST_BUFFER_DATA (buffer), buffer->vbuffer.length);
-+ v4l2_munmap ((void *) GST_BUFFER_DATA (buffer), buffer->mmap_length);
-
- GST_MINI_OBJECT_CLASS (v4l2buffer_parent_class)->finalize (GST_MINI_OBJECT
- (buffer));
-@@ -183,6 +183,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
- GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
-
-+ ret->mmap_length = ret->vbuffer.length;
- data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
- PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,
- ret->vbuffer.m.offset);
-diff --git a/sys/v4l2/gstv4l2bufferpool.h b/sys/v4l2/gstv4l2bufferpool.h
-index caad9ac..36ea323 100644
---- a/sys/v4l2/gstv4l2bufferpool.h
-+++ b/sys/v4l2/gstv4l2bufferpool.h
-@@ -70,6 +70,9 @@ struct _GstV4l2Buffer {
- GstBuffer buffer;
-
- struct v4l2_buffer vbuffer;
-+ /* warning: the size of mmap buffer and
-+ * the actual frame-buffer can be different. */
-+ size_t mmap_length;
-
- /* FIXME: have GstV4l2Src* instead, as this has GstV4l2BufferPool* */
- /* FIXME: do we really want to fix this if GstV4l2Buffer/Pool is shared
---
-cgit v0.9.0.2-2-gbebe
diff --git a/0001-sys-v4l2-Some-blind-compilation-fixes.patch b/0001-sys-v4l2-Some-blind-compilation-fixes.patch
deleted file mode 100644
index e03fdac..0000000
--- a/0001-sys-v4l2-Some-blind-compilation-fixes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From fa21c0bb253213c9dc48ce72faaf7090dc8a3554 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters(a)verbum.org>
-Date: Thu, 2 May 2013 16:16:46 -0400
-Subject: [PATCH] sys/v4l2: Some blind compilation fixes
-
----
- sys/v4l2/gstv4l2bufferpool.c | 1 -
- sys/v4l2/v4l2_calls.c | 12 ++++--------
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
-index a0b4c84..3916815 100644
---- a/sys/v4l2/gstv4l2bufferpool.c
-+++ b/sys/v4l2/gstv4l2bufferpool.c
-@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
- GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
- ret->vbuffer.m.offset);
- GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
-- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
-
- ret->mmap_length = ret->vbuffer.length;
- data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
-diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
-index 309bfb6..ee3ff9f 100644
---- a/sys/v4l2/v4l2_calls.c
-+++ b/sys/v4l2/v4l2_calls.c
-@@ -53,14 +53,6 @@
-
- #include "gst/gst-i18n-plugin.h"
-
--/* Those are ioctl calls */
--#ifndef V4L2_CID_HCENTER
--#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
--#endif
--#ifndef V4L2_CID_VCENTER
--#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
--#endif
--
- GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
- #define GST_CAT_DEFAULT v4l2_debug
-
-@@ -294,8 +286,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
- break;
- case V4L2_CID_HFLIP:
- case V4L2_CID_VFLIP:
-+#ifdef V4L2_CID_HCENTER
- case V4L2_CID_HCENTER:
-+#endif
-+#ifdef V4L2_CID_VCENTER
- case V4L2_CID_VCENTER:
-+#endif
- #ifdef V4L2_CID_PAN_RESET
- case V4L2_CID_PAN_RESET:
- #endif
---
-1.7.1
-
diff --git a/0002-clear_DISCONT_flag.patch b/0002-clear_DISCONT_flag.patch
deleted file mode 100644
index 53a9887..0000000
--- a/0002-clear_DISCONT_flag.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6f707fcbca2c60aed565247567bafdd168980161 Mon Sep 17 00:00:00 2001
-From: Tim-Philipp Mller <tim.muller(a)collabora.co.uk>
-Date: Sat, 03 Mar 2012 13:04:48 +0000
-Subject: v4l2: clear DISCONT flag when recycling buffers into the buffer pool
-
-The base class may have set the DISCONT flag on the first buffer pushed
-out. We need to clear that when recycling buffers back into the buffer
-pool, otherwise we constantly push out buffers with the discont flag
-set, which might upset downstream elements, esp. for compressed
-formats like mpeg-ts.
----
-(limited to 'sys/v4l2')
-
-diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
-index 51419ff..a0b4c84 100644
---- a/sys/v4l2/gstv4l2bufferpool.c
-+++ b/sys/v4l2/gstv4l2bufferpool.c
-@@ -98,6 +98,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer * buffer)
- GST_LOG_OBJECT (pool->v4l2elem, "reviving buffer %p, %d", buffer, index);
- gst_buffer_ref (GST_BUFFER (buffer));
- GST_BUFFER_SIZE (buffer) = 0;
-+ GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DISCONT);
- pool->buffers[index] = buffer;
- }
-
---
-cgit v0.9.0.2-2-gbebe
diff --git a/0003-v4l2src-fix.patch b/0003-v4l2src-fix.patch
deleted file mode 100644
index a4bc90e..0000000
--- a/0003-v4l2src-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- gst-plugins-good-0.10.31/sys/v4l2/gstv4l2object.c 2011-12-30 14:59:13.000000000 +0100
-+++ gst-plugins-good-0.10.31.fixed/sys/v4l2/gstv4l2object.c 2012-06-05 23:45:16.670981047 +0200
-@@ -1583,6 +1583,7 @@
-
- if (ival.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
- GValue rate = { 0, };
-+ guint i;
-
- g_value_init (&rates, GST_TYPE_LIST);
- g_value_init (&rate, GST_TYPE_FRACTION);
-@@ -1602,7 +1603,16 @@
-
- /* swap to get the framerate */
- gst_value_set_fraction (&rate, denom, num);
-- gst_value_list_append_value (&rates, &rate);
-+ /* avoid duplicate framerates, yes some hw reports duplicates :( */
-+ for (i = 0; i < gst_value_list_get_size(&rates); i++) {
-+ const GValue *val = gst_value_list_get_value(&rates, i);
-+ if (gst_value_compare(val, &rate) == GST_VALUE_EQUAL) {
-+ break;
-+ }
-+ }
-+ if (i == gst_value_list_get_size(&rates)) {
-+ gst_value_list_append_value(&rates, &rate);
-+ }
-
- ival.index++;
- } while (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) >= 0);
diff --git a/0004-v4l2object-Don-t-probe-UVC-devices-for-being-interla.patch b/0004-v4l2object-Don-t-probe-UVC-devices-for-being-interla.patch
deleted file mode 100644
index 4162cf1..0000000
--- a/0004-v4l2object-Don-t-probe-UVC-devices-for-being-interla.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From fefa084bde0850447ca5ed84775c094fcf0b2351 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede(a)redhat.com>
-Date: Fri, 8 Jun 2012 20:38:34 +0200
-Subject: [PATCH] v4l2object: Don't probe UVC devices for being interlaced
-
-UVC devices are never interlaced, and doing VIDIOC_TRY_FMT on them
-causes expensive and slow USB IO, so don't probe them for interlaced.
-
-This shaves 2 seconds of the startup time of cheese with a Logitech
-Webcam Pro 9000.
-
-Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
----
- sys/v4l2/gstv4l2object.c | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
-index 6564b91..ce52547 100644
---- a/sys/v4l2/gstv4l2object.c
-+++ b/sys/v4l2/gstv4l2object.c
-@@ -1561,10 +1561,18 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l2Object * v4l2object,
- gint int_width = width;
- gint int_height = height;
-
-- /* interlaced detection using VIDIOC_TRY/S_FMT */
-- if (!gst_v4l2_object_get_nearest_size (v4l2object, pixelformat,
-- &int_width, &int_height, &interlaced))
-- return NULL;
-+ if (!strcmp((char *)v4l2object->vcap.driver, "uvcvideo")) {
-+ /*
-+ * UVC devices are never interlaced, and doing VIDIOC_TRY_FMT on them
-+ * causes expensive and slow USB IO, so don't probe them for interlaced
-+ */
-+ interlaced = FALSE;
-+ } else {
-+ /* Interlaced detection using VIDIOC_TRY/S_FMT */
-+ if (!gst_v4l2_object_get_nearest_size (v4l2object, pixelformat,
-+ &int_width, &int_height, &interlaced))
-+ return NULL;
-+ }
-
- memset (&ival, 0, sizeof (struct v4l2_frmivalenum));
- ival.index = 0;
---
-1.7.10.2
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..da8cf29
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+gstreamer-plugins-good fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675065
diff --git a/gnome-724085.patch b/gnome-724085.patch
deleted file mode 100644
index 5276c0f..0000000
--- a/gnome-724085.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 2d489753eb7fe7571ac93b38a319bc59c7451d38 Mon Sep 17 00:00:00 2001
-From: Sebastian Rasmussen <sebras(a)hotmail.com>
-Date: Tue, 11 Feb 2014 01:53:26 +0100
-Subject: [PATCH] docs: Rebalance docbook tags in comments
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=724085
----
- gst/audiofx/audiocheblimit.c | 4 ++--
- gst/udp/gstudpsrc.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c
-index 549a9d2..7568d6a 100644
---- a/gst/audiofx/audiocheblimit.c
-+++ b/gst/audiofx/audiocheblimit.c
-@@ -46,12 +46,12 @@
- * be at most this value. A lower ripple value will allow a faster rolloff.
- *
- * As a special case, a Chebyshev type 1 filter with no ripple is a Butterworth filter.
-- * </para>
-+ * <para>
- * <note><para>
- * Be warned that a too large number of poles can produce noise. The most poles are possible with
- * a cutoff frequency at a quarter of the sampling rate.
- * </para></note>
-- * <para>
-+ * </para>
- * <refsect2>
- * <title>Example launch line</title>
- * |[
-diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
-index c2cbd92..7dffef8 100644
---- a/gst/udp/gstudpsrc.c
-+++ b/gst/udp/gstudpsrc.c
-@@ -78,14 +78,14 @@
- * </itemizedlist>
- * The message is typically used to detect that no UDP arrives in the receiver
- * because it is blocked by a firewall.
-- * </para>
-+ *
- * <para>
- * A custom file descriptor can be configured with the
- * #GstUDPSrc:sockfd property. The socket will be closed when setting the
- * element to READY by default. This behaviour can be
- * overriden with the #GstUDPSrc:closefd property, in which case the application
- * is responsible for closing the file descriptor.
-- *
-+ * </para>
- * <refsect2>
- * <title>Examples</title>
- * |[
---
-1.8.5.3
-
diff --git a/gstreamer-plugins-good.spec b/gstreamer-plugins-good.spec
deleted file mode 100644
index 4ba6b03..0000000
--- a/gstreamer-plugins-good.spec
+++ /dev/null
@@ -1,814 +0,0 @@
-%define gstreamer gstreamer
-%define majorminor 0.10
-
-%define _gst 0.10.36
-%define _gstpb %{_gst}
-
-# Turn of extras package on RHEL.
-%if ! 0%{?rhel}
-%bcond_without extras
-%else
-%bcond_with extras
-%endif
-
-Name: %{gstreamer}-plugins-good
-Version: 0.10.31
-Release: 24%{?dist}
-Summary: GStreamer plug-ins with good code and licensing
-
-License: LGPLv2+
-URL: http://gstreamer.freedesktop.org/
-#Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/pre/gst-plugins-goo...
-Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{...
-# Cherry picks from upstream git which hopefully fix rhbz#815581
-Patch1: 0001-fix-v4l2_munmap.patch
-Patch2: 0002-clear_DISCONT_flag.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=677516
-Patch3: 0003-v4l2src-fix.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=677722
-Patch4: 0004-v4l2object-Don-t-probe-UVC-devices-for-being-interla.patch
-Patch5: 0001-sys-v4l2-Some-blind-compilation-fixes.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=724085
-Patch6: gnome-724085.patch
-Patch7: put-api-version-in-html-book-name.patch
-
-Requires: %{gstreamer} >= %{_gst}
-Requires(pre): GConf2
-Requires(preun): GConf2
-Requires(post): GConf2
-Requires: gstreamer-plugins-base
-# superceded by the package above and ourselves
-Obsoletes: gstreamer-plugins
-
-BuildRequires: %{gstreamer}-devel >= %{_gst}
-BuildRequires: %{gstreamer}-plugins-base-devel >= %{_gstpb}
-
-BuildRequires: liboil-devel >= 0.3.6
-BuildRequires: gettext
-BuildRequires: gcc-c++
-
-BuildRequires: cairo-devel
-BuildRequires: flac-devel >= 1.1.3
-BuildRequires: GConf2-devel
-BuildRequires: glibc-devel
-BuildRequires: gtk2-devel
-BuildRequires: kernel-headers
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel >= 1.2.0
-BuildRequires: libshout-devel
-BuildRequires: libsoup-devel
-BuildRequires: libX11-devel
-%if !0%{?rhel}
-BuildRequires: mikmod
-%endif
-BuildRequires: orc-devel
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: speex-devel
-BuildRequires: taglib-devel
-BuildRequires: wavpack-devel
-BuildRequires: libv4l-devel
-
-%ifnarch s390 s390x
-BuildRequires: libavc1394-devel
-BuildRequires: libdv-devel
-BuildRequires: libiec61883-devel
-BuildRequires: libraw1394-devel
-%endif
-
-# documentation
-BuildRequires: gtk-doc
-BuildRequires: python-devel
-
-# extras
-%if %{with extras}
-BuildRequires: jack-audio-connection-kit-devel
-%endif
-
-Provides: gstreamer-plugins-pulse = 0.9.8-1
-Obsoletes: gstreamer-plugins-pulse < 0.9.8
-
-%description
-GStreamer is a streaming media framework, based on graphs of filters which
-operate on media data. Applications using this library can do anything
-from real-time sound processing to playing videos, and just about anything
-else media-related. Its plugin-based architecture means that new data
-types or processing capabilities can be added simply by installing new
-plug-ins.
-
-GStreamer Good Plug-ins is a collection of well-supported plug-ins of
-good quality and under the LGPL license.
-
-%package devel-docs
-Summary: Documentation for gstreamer-plugins-good
-
-Requires: %{name} = %{version}-%{release}
-# for /usr/share/gtk-doc/html
-Requires: gtk-doc
-BuildArch: noarch
-# Providing the devel package here as its the docs package's old name.
-# Remove this line once we get a real -devel package again.
-Provides: %{name}-devel = %{version}-%{release}
-Obsoletes: %{name}-devel < %{version}-%{release}
-
-%description devel-docs
-GStreamer is a streaming media framework, based on graphs of filters which
-operate on media data. Applications using this library can do anything
-from real-time sound processing to playing videos, and just about anything
-else media-related. Its plugin-based architecture means that new data
-types or processing capabilities can be added simply by installing new
-plug-ins.
-
-GStreamer Good Plug-ins is a collection of well-supported plug-ins of
-good quality and under the LGPL license.
-
-This package contains documentation for the provided plugins.
-
-%if %{with extras}
-%package extras
-Summary: Extra GStreamer plug-ins with good code and licensing
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description extras
-GStreamer is a streaming media framework, based on graphs of filters which
-operate on media data.
-
-GStreamer Good Plug-ins is a collection of well-supported plug-ins of
-good quality and under the LGPL license.
-
-This package (gstreamer-plugins-good-extras) contains extra "good" plugins
-which are not used very much and require additional libraries to be installed.
-%endif
-
-%prep
-%setup -q -n gst-plugins-good-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-
-%build
-
-%configure \
- --with-package-name='Fedora gstreamer-plugins-good package' \
- --with-package-origin='http://download.fedora.redhat.com/fedora' \
- --enable-experimental \
- --enable-gtk-doc \
- --enable-orc \
- --disable-monoscope \
- --disable-aalib \
- --disable-esd \
- --disable-libcaca \
- --disable-flx \
-%if %{with extras}
- --enable-jack \
-%else
- --disable-jack \
-%endif
- --with-default-visualizer=autoaudiosink
-
-make %{?_smp_mflags}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-# Clean out files that should not be part of the rpm.
-rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%find_lang gst-plugins-good-%{majorminor}
-
-%files -f gst-plugins-good-%{majorminor}.lang
-%doc AUTHORS COPYING README REQUIREMENTS
-
-# Equaliser presets
-%{_datadir}/gstreamer-%{majorminor}/
-
-# non-core plugins without external dependencies
-%{_libdir}/gstreamer-%{majorminor}/libgstalaw.so
-%{_libdir}/gstreamer-%{majorminor}/libgstalphacolor.so
-%{_libdir}/gstreamer-%{majorminor}/libgstalpha.so
-%{_libdir}/gstreamer-%{majorminor}/libgstannodex.so
-%{_libdir}/gstreamer-%{majorminor}/libgstapetag.so
-%{_libdir}/gstreamer-%{majorminor}/libgstaudiofx.so
-%{_libdir}/gstreamer-%{majorminor}/libgstaudioparsers.so
-%{_libdir}/gstreamer-%{majorminor}/libgstauparse.so
-%{_libdir}/gstreamer-%{majorminor}/libgstautodetect.so
-%{_libdir}/gstreamer-%{majorminor}/libgstavi.so
-%{_libdir}/gstreamer-%{majorminor}/libgstcutter.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdebug.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so
-%{_libdir}/gstreamer-%{majorminor}/libgstefence.so
-%{_libdir}/gstreamer-%{majorminor}/libgsteffectv.so
-%{_libdir}/gstreamer-%{majorminor}/libgstequalizer.so
-%{_libdir}/gstreamer-%{majorminor}/libgstflv.so
-%{_libdir}/gstreamer-%{majorminor}/libgstgoom2k1.so
-%{_libdir}/gstreamer-%{majorminor}/libgstgoom.so
-%{_libdir}/gstreamer-%{majorminor}/libgsticydemux.so
-%{_libdir}/gstreamer-%{majorminor}/libgstid3demux.so
-%{_libdir}/gstreamer-%{majorminor}/libgstimagefreeze.so
-%{_libdir}/gstreamer-%{majorminor}/libgstinterleave.so
-%{_libdir}/gstreamer-%{majorminor}/libgstisomp4.so
-%{_libdir}/gstreamer-%{majorminor}/libgstlevel.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmatroska.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmulaw.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmultifile.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmultipart.so
-%{_libdir}/gstreamer-%{majorminor}/libgstnavigationtest.so
-%{_libdir}/gstreamer-%{majorminor}/libgstoss4audio.so
-%{_libdir}/gstreamer-%{majorminor}/libgstreplaygain.so
-%{_libdir}/gstreamer-%{majorminor}/libgstrtp.so
-%{_libdir}/gstreamer-%{majorminor}/libgstrtsp.so
-%{_libdir}/gstreamer-%{majorminor}/libgstshapewipe.so
-%{_libdir}/gstreamer-%{majorminor}/libgstsmpte.so
-%{_libdir}/gstreamer-%{majorminor}/libgstspectrum.so
-%{_libdir}/gstreamer-%{majorminor}/libgstudp.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvideobox.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvideocrop.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvideofilter.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvideomixer.so
-%{_libdir}/gstreamer-%{majorminor}/libgstwavenc.so
-%{_libdir}/gstreamer-%{majorminor}/libgstwavparse.so
-%{_libdir}/gstreamer-%{majorminor}/libgstximagesrc.so
-%{_libdir}/gstreamer-%{majorminor}/libgsty4menc.so
-
-# gstreamer-plugins with external dependencies but in the main package
-%{_libdir}/gstreamer-%{majorminor}/libgstcairo.so
-%{_libdir}/gstreamer-%{majorminor}/libgstflac.so
-%{_libdir}/gstreamer-%{majorminor}/libgstgconfelements.so
-%{_libdir}/gstreamer-%{majorminor}/libgstgdkpixbuf.so
-%{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so
-%{_libdir}/gstreamer-%{majorminor}/libgstossaudio.so
-%{_libdir}/gstreamer-%{majorminor}/libgstpng.so
-%{_libdir}/gstreamer-%{majorminor}/libgstpulse.so
-%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
-%{_libdir}/gstreamer-%{majorminor}/libgstshout2.so
-%{_libdir}/gstreamer-%{majorminor}/libgstsouphttpsrc.so
-%{_libdir}/gstreamer-%{majorminor}/libgstspeex.so
-%{_libdir}/gstreamer-%{majorminor}/libgsttaglib.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so
-%{_libdir}/gstreamer-%{majorminor}/libgstwavpack.so
-
-%ifnarch s390 s390x
-%{_libdir}/gstreamer-%{majorminor}/libgstdv.so
-%{_libdir}/gstreamer-%{majorminor}/libgst1394.so
-%endif
-
-## Libraries
-
-# schema files
-%{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas
-
-%files devel-docs
-
-# gtk-doc documentation
-%doc %{_datadir}/gtk-doc/html/gst-plugins-good-plugins-%{majorminor}
-
-%if %{with extras}
-%files extras
-# Plugins with external dependencies
-%{_libdir}/gstreamer-%{majorminor}/libgstjack.so
-%endif
-
-%pre
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
-fi
-
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.31-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.31-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.31-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.31-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.31-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.31-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.31-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Dec 06 2016 Wim Taymans <wtaymans(a)redhat.com> - 0.10.31-17
-- Disable insecure FLX plugin (rhbz#1397441)
-- fix doc build
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.31-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.31-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 0.10.31-14
-- Rebuilt for GCC 5 C++11 ABI change
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.31-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.10.31-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Mar 12 2014 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 0.10.31-11
-- Apply fix from GNOME #724085 to fix building docs
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.31-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu May 02 2013 Colin Walters <walters(a)verbum.org>
-- Blindly stab at the v4l2 code until it emits binaries
-
-* Thu May 02 2013 Colin Walters <walters(a)verbum.org>
-- Drop PyXML dependency (rhbz#914060)
-
-* Wed Mar 27 2013 Adam Jackson <ajax(a)redhat.com>
-- Tweak BRs for RHEL
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.31-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 0.10.31-6
-- rebuild against new libjpeg
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.31-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jun 11 2012 Nils Philippsen <nils(a)redhat.com> - 0.10.31-4
-- add extras subpackage with jack source/sink (#714481)
-
-* Fri Jun 10 2012 Hans de Goede <hdegoede(a)redhat.com> - 0.10.31-3
-- v4l2: Don't probe UVC devices for being interlaced, this saves seconds when
- starting a pipeline with a v4l2 element (rhbz#797188, gnome#677722)
-
-* Wed Jun 6 2012 Hans de Goede <hdegoede(a)redhat.com> 0.10.31-2
-- v4l2src: Cherry pick some patches from upstream hopefully fixing #815581
-- v4l2src: Deal with uvc cams which report duplicate framerates, such as
- on the Thinkpad x121e (rhbz#815134, gnome#677516)
-
-* Tue Feb 28 2012 Benjamin Otte <otte(a)redhat.com> 0.10.31-1
-- Update to 0.10.31
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.30-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Dec 05 2011 Adam Jackson <ajax(a)redhat.com> 0.10.30-6
-- Rebuild for new libpng
-
-* Sun Nov 27 2011 Brian Pepple <bpepple(a)fedoraproject.org> - 0.10.30-5
-- Backport patch to correct flacdec sample number rounding. (#722667)
-- Drop clean section. No longer needed.
-- Drop buildroot. No longer needed.
-
-* Fri Nov 4 2011 Adam Williamson <awilliam(a)redhat.com> - 0.10.30-4
-- backport more upstream flacparse fixes to complete #650785 fix
-
-* Fri Oct 14 2011 Adam Williamson <awilliam(a)redhat.com> - 0.10.30-3
-- backport a couple of patches to fix GNOME #650785
-
-* Sun Jul 3 2011 Ville Skytt <ville.skytta(a)iki.fi> - 0.10.30-2
-- Own the /usr/share/gstreamer-0.10 dir (#681625).
-
-* Fri Jun 17 2011 Tomas Bzatek <tbzatek(a)redhat.com> 0.10.30-1
-- Update to 0.10.30
-
-* Tue May 10 2011 Benjamin Otte <otte(a)redhat.com> 0.10.29-1
-- Update to 0.10.29
-
-* Sun May 01 2011 Benjamin Otte <otte(a)redhat.com> 0.10.28.4-1
-- Update prerelease
-
-* Wed Apr 27 2011 Benjamin Otte <otte(a)redhat.com> 0.10.28.3-1
-- Update prerelease
-
-* Mon Apr 16 2011 Benjamin Otte <otte(a)redhat.com> 0.10.28.2-1
-- Update to prerelease
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.27-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Feb 03 2011 Dan Hork <dan[at]danny.cz> 0.10.27-2
-- we have libv4l on s390(x), otherwise the build fails with "linux/videodev.h"
- not found in v4l2_calls.h
-
-* Wed Jan 26 2011 Benjamin Otte <otte(a)redhat.com> 0.10.27-1
-- Update to 0.10.27
-
-* Wed Jan 12 2011 Benjamin Otte <otte(a)redhat.com> 0.10.26.3-1
-- Update to prerelease
-
-* Thu Dec 02 2010 Benjamin Otte <otte(a)redhat.com> 0.10.26-1
-- Update to 0.10.26
-
-* Mon Sep 06 2010 Benjamin Otte <otte(a)redhat.com> 0.10.25-1
-- Update to 0.10.25
-
-* Fri Jul 16 2010 Benjamin Otte <otte(a)redhat.com> 0.10.24-1
-- Update to 0.10.24
-
-* Wed Jul 07 2010 Benjamin Otte <otte(a)redhat.com> 0.10.23.4-1
-- Update prerelease
-
-* Wed Jun 30 2010 Benjamin Otte <otte(a)redhat.com> 0.10.23.3-1
-- Update prerelease
-
-* Sun Jun 27 2010 Benjamin Otte <otte(a)redhat.com> 0.10.23.2-1
-- Update to prerelease
-
-* Mon May 31 2010 Benjamin Otte <otte(a)redhat.com> 0.10.23-1
-- Update to 0.10.23
-
-* Wed May 26 2010 Benjamin Otte <otte(a)redhat.com> 0.10.22.3-1
-- Update pre-release
-
-* Fri May 14 2010 Benjamin Otte <otte(a)redhat.com> 0.10.22.2-1
-- Update to pre-release
-
-* Tue May 04 2010 Benjamin Otte <otte(a)redhat.com> 0.10.22-3
-- Provide -devel in -devel-docs
-
-* Tue May 04 2010 Benjamin Otte <otte(a)redhat.com> 0.10.22-2
-- Obsolete -devel in -devel-docs
-
-* Wed Apr 28 2010 Benjamin Otte <otte(a)redhat.com> 0.10.22-1
-- Update to 0.10.22
-- Replace devel package by noarch devel-docs package
-
-* Mon Apr 26 2010 Benjamin Otte <otte(a)redhat.com> 0.10.21.3-1
-- Update pre-release
-
-* Thu Apr 15 2010 Benjamin Otte <otte(a)redhat.com> 0.10.21.2-1
-- Update pre-release
-
-* Wed Apr 07 2010 Benjamin Otte <otte(a)redhat.com> 0.10.21-2
-- Enable gtk-doc
-
-* Tue Mar 09 2010 Benjamin Otte <otte(a)redhat.com> 0.10.21-1
-- Update to 0.10.21
-
-* Mon Mar 08 2010 Benjamin Otte <otte(a)redhat.com> 0.10.19-1
-- Update to 0.10.19
-
-* Thu Mar 06 2010 Benjamin Otte <otte(a)redhat.com> 0.10.18.4-1
-- Update pre-release
-
-* Thu Feb 25 2010 Benjamin Otte <otte(a)redhat.com> 0.10.18.3-1
-- Update to pre-release
-
-* Fri Feb 19 2010 Benjamin Otte <otte(a)redhat.com> 0.10.18.2-2
-- Use correct dependency requirements
-
-* Fri Feb 19 2010 Benjamin Otte <otte(a)redhat.com> 0.10.18.2-1
-- Update to prerelease
-
-* Fri Feb 11 2010 Benjamin Otte <otte(a)redhat.com> 0.10.18-1
-- Update to 0.10.18
-
-* Fri Feb 05 2010 Benjamin Otte <otte(a)redhat.com> 0.10.17.3-1
-- Update pre-release
-
-* Mon Feb 01 2010 Bastien Nocera <bnocera(a)redhat.com> 0.10.17.2-2
-- Remove farsight plugins, now in gstreamer-plugins-bad-free
-
-* Wed Jan 27 2010 Bastien Nocera <bnocera(a)redhat.com> 0.10.17.2-1
-- Update to pre-release
-
-* Fri Jan 08 2010 Bastien Nocera <bnocera(a)redhat.com> 0.10.17-5
-- Update Farsight plugins from -bad 0.10.17
-
-* Mon Dec 07 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.17-4
-- Remove HAL elements, they're unused and obsolete
-
-* Fri Dec 04 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.17-3
-- Disable LADSPA plugins, they should be in -bad (#540198)
-
-* Mon Nov 30 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.17-2
-- Add support for authenticating RTSP sources
-
-* Tue Nov 17 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.17-1
-- Update to 0.10.17
-
-* Fri Nov 13 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.16.3-1
-- Update to 0.10.16.3 pre-release
-
-* Tue Nov 10 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.16.2-1
-- Update to 0.10.16.2 pre-release
-
-* Tue Nov 03 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.16-7
-- Add patch from upstream to avoid volume lowering in PA < 0.9.20
-
-* Thu Oct 22 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.16-5
-- Update farsight plugins from -bad
-- Drop copy/pasted rtpmanager plugin, it's now in -good
-
-* Mon Oct 19 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.16-4
-- Fix pulsesink not advertising the StreamVolume interface
-
-* Sat Oct 17 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.16-3
-- Finally fix pulsesink volume lowering problems (#488532)
-
-* Fri Oct 16 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.16-2
-- Fix autoconvert caps negotiation
-
-* Tue Sep 01 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.16-1
-- Update to 0.10.16
-
-* Fri Aug 14 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.15.3-1
-- Update to 0.10.15.3
-
-* Tue Aug 11 2009 Hans de Goede <hdegoede(a)redhat.com> 0.10.15-6
-- Fix usage of webcamdrivers which do not implement VIDIOC_G_PARM (#467961)
-- Include "Fix FLAC seeking" patch from F-11 package (#515886)
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.15-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Jul 21 2009 Brian Pepple <bpepple(a)fedoraproject.org> - 0.10.15-4
-- Add missing provides on gst-plugins-farsight.
-
-* Mon Jun 22 2009 Brian Pepple <bpepple(a)fedoraproject.org> - 0.10.15-3
-- Add obsolete for gst-plugins-farsight.
-
-* Mon Jun 22 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.15-2
-- Add the farsight plugins from gst-plugins-bad 0.10.13 (#507009)
-
-* Thu May 21 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.15-1
-- Update to 0.10.15
-
-* Sat May 16 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.14.3-1
-- Update to 0.10.14.3
-
-* Tue May 12 2009 Bastien Nocera <bnocera(a)redhat.com> 0.10.14.2-1
-- Update to 0.10.14.2
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Feb 19 2009 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.14-1
-- Update to 0.10.14
-
-* Mon Feb 16 2009 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.13.3-1
-- Updat eto 0.10.13.3 pre-release
-
-* Tue Feb 10 2009 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.13.2-2
-- Add patches to fix compilation
-
-* Sun Feb 08 2009 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.13.2-1
-- Update to 0.10.13.2 pre-release
-
-* Mon Feb 02 2009 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.13-3
-- Remove (unapplied) patch, it's not needed on this version
-
-* Mon Feb 02 2009 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.13-2
-- Patch for overflows in the QT demuxer (#481267)
-
-* Mon Jan 26 2009 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.13-1
-- Update to 0.10.13
-- Update libv4l patch
-
-* Wed Jan 21 2009 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.11-5
-- Rebuild for new gstreamer base library
-
-* Wed Jan 14 2009 Warren Togami <wtogami(a)redhat.com> 0.10.11-4
-- Bug #477877 Fix multilib conflict in -devel
-- Bug #478449 Fix ladspa on lib64
-
-* Wed Jan 14 2009 Lennart Poettering <lpoetter(a)redhat.com> 0.10.11-3
-- Bug #470000 Fix thread/memleak due to ref-loop
-
-* Tue Jan 13 2009 Bastien Nocera <bnocera(a)redhat.com> - 0.10.11-2
-- Avoid pulsesink hang when PulseAudio disappears
-
-* Sat Oct 25 2008 Bastien Nocera <bnocera(a)redhat.com> - 0.10.11-1
-- Update to 0.10.11
-- Update libv4l patch
-
-* Thu Oct 23 2008 Lennart Poettering <lpoetter(a)redhat.com> 0.10.10-6
-- Enable the PulseAudio element and make it replace the old
- pulseaudio-plugins-pulse package
-
-* Sun Oct 5 2008 Hans de Goede <hdegoede(a)redhat.com> 0.10.10-5
-- Fix gst-plugins-good-0.10.9-libv4l.patch to also patch config.in and
- Makefile.in so that the libv4l code actually gets enabled for real this time
- and remove plenty of egg from face for not fixing this properly in 0.10.10-2
- (rh465599)
-- Explicitly disable pulse plugin so the spec builds even if you
- have the pulse devel packages installed.
-
-* Fri Sep 12 2008 - Bastien Nocera <bnocera(a)redhat.com> 0.10.10-4
-- Another rebuild
-
-* Thu Sep 11 2008 - Bastien Nocera <bnocera(a)redhat.com> 0.10.10-3
-- Rebuild for GStreamer RPM provides
-
-* Sun Aug 31 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.10-2
-- Fix gst-plugins-good-0.10.9-libv4l.patch to not only patch configure.ac
- but also configure so that the libv4l code actually gets enabled
-
-* Wed Aug 27 2008 - Bastien Nocera <bnocera(a)redhat.com> 0.10.10-1
-- Update to 0.10.10
-- Remove cdio plugin, as it was moved to -ugly upstream
-
-* Sun Aug 10 2008 Adam Jackson <ajax(a)redhat.com> 0.10.9-2
-- gst-plugins-good-0.10.9-libv4l.patch: Use libv4l. (#456825)
-- Explicitly disable esd/caca/aalib plugins so the spec builds even if you
- have their devel packages installed.
-
-* Mon Aug 04 2008 Adam Jackson <ajax(a)redhat.com> 0.10.9-1
-- Update to 0.10.9
-
-* Wed Jul 30 2008 - Bastien Nocera <bnocera(a)redhat.com> 0.10.8-10
-- Build the docs ourselves
-
-* Tue Jul 22 2008 Jarod Wilson <jwilson(a)redhat.com> 0.10.8-9
-- Bump and rebuild for libraw1394 v2.0.0
-
-* Mon Jul 21 2008 Adam Jackson <ajax(a)redhat.com> 0.10.8-8
-- gst-plugins-good-0.10.8-v4l2-progressive-fix.patch: Backport v4l2
- interlace/progressive fixes. (#454534)
-
-* Thu Jun 19 2008 Adam Jackson <ajax(a)redhat.com> 0.10.8-7
-- gst-plugins-good-0.10.8-speex-nego.patch: Backport speex channel and
- rate negotiation from 0.10.9. (#451391)
-
-* Tue Jun 17 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.8-6
-- Really fix the default audio output not being correct
-
-* Tue Jun 03 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.8-5
-- Fix compilation of the v4l2 plugin with newer kernels
-
-* Mon Jun 02 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.8-4
-- Work-around bug that would set the default audio output to "GOOM!"
- See http://bugzilla.gnome.org/show_bug.cgi?id=532295
-
-* Wed May 21 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.10.8-3
-- fix license tag
-
-* Wed May 21 2008 Adam Jackson <ajax(a)redhat.com> 0.10.8-2
-- BR: libsoup-devel and package the soup http src plugin. (#447604)
-- s/Fedora Core/Fedora/
-
-* Thu Apr 24 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.8-1
-- Update to 0.10.8
-
-* Thu Apr 10 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.7-2
-- Add patch to unbreak the QuickTime demuxer plugin
-
-* Thu Feb 21 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.7-1
-- Update to 0.10.7
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.10.6-8
-- Autorebuild for GCC 4.3
-
-* Fri Jan 11 2008 Adam Jackson <ajax(a)redhat.com> 0.10.6-7
-- gst-plugins-good-0.10.6-v4l2-min-buffers.patch: Be sure to get at least
- GST_V4L2_MIN_BUFFERS from the source. (#316931)
-- gst-plugins-good-0.10.6-artist-sortname.patch: Avoid using a deprecated
- #define.
-
-* Mon Oct 08 2007 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.6-6
-- Kill esound output, as we don't have esound installed anymore, just
- Pulseaudio (#323061)
-
-* Sun Sep 02 2007 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.6-5
-- Add a patch to fix id3demux, so that MP3s can be played back
- (#273561)
-
-* Tue Aug 28 2007 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.6-4
-- Add the ladspa plugins (#253375)
-
-* Tue Aug 21 2007 Adam Jackson <ajax(a)redhat.com> - 0.10.6-3
-- Rebuild for build id
-
-* Sun Aug 12 2007 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.6-2
-- Enable experimental plugins, the wavepack and v4l2src plugins (#250886)
-
-* Tue Jun 19 2007 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.6-1
-- Update to 0.10.6
-- Remove outdated FLAC patch
-- Add new plugins
-
-* Sat May 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 0.10.5-6
-- Add libshout-devel, taglib-devel, libcdio-devel as BRs (#136268)
-
-* Tue Feb 13 2007 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.5-5
-- Don't forget to run autoreconf when modifiying the configure.ac
-
-* Tue Feb 13 2007 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.5-4
-- Move cyclic dependency with -plugins-good and -plugins-base from
- gstreamer to here
-
-* Tue Feb 13 2007 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.5-3
-- Patch from Matthias Clasen <mclasen(a)redhat.com> for the libFLAC
- 1.1.3 update (#222946)
-
-* Wed Jan 24 2007 Adam Jackson <ajax(a)redhat.com> - 0.10.5-2
-- Re-add the gdkpixbuf loader. (#222837)
-
-* Wed Jan 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 0.10.5-1
-- Update to 0.10.5
-
-* Wed Oct 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 0.10.4-2
-- Fix scripts according to the packaging guidelines
-
-* Sat Aug 26 2006 Matthias Clasen <mclasen(a)redhat.com> - 0.10.4-1
-- Update to 0.10.4
-
-* Thu Jul 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 0.10.3-5
-- Disable gtk-doc to fix multilib conflicts
-
-* Wed Jul 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 0.10.3-4
-- Rebuild
-
-* Tue Jul 18 2006 John (J5) Palmieri <johnp(a)redhat.com> - 0.10.3-3
-- rebuild
-
-* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0.10.3-2.1
-- rebuild
-
-* Wed May 31 2006 Dan Williams <dcbw(a)redhat.com> - 0.10.3-2
-- Package gsthalelements plugin so this can be pushed out
-
-* Mon May 22 2006 Matthias Clasen <mclasen(a)redhat.com> - 0.10.3-1
-- Update to 0.10.3
-
-* Fri Feb 10 2006 Christopher Aillon <caillon(a)redhat.com> - 0.10.2-1
-- Update to 0.10.2
-
-* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 0.10.1-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Jan 18 2006 John (J5) Palmieri <johnp(a)redhat.com> 0.10.1-1
-- Upgrade to 0.10.1
-- Add libgstid3demux.so to the files section
-
-* Wed Jan 04 2006 Warren Togami <wtogami(a)redhat.com> 0.10.0-2
-- exclude 1394 stuff from s390 and s390x
-
-* Sat Dec 17 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.10.0-1
-- rebuilt for FC devel
-
-* Wed Dec 14 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.10.0-0.gst.2
-- glib 2.8
-- added cairo
-
-* Mon Dec 05 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.10.0-0.gst.1
-- new release
-
-* Thu Dec 01 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.9.7-0.gst.1
-- new release for major/minor 0.10
-- removed pango
-- removed videofilter
-- added cutter, multipart
-
-* Sat Nov 12 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.9.5-0.gst.1
-- new release
-
-* Mon Oct 24 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.9.4-0.gst.1
-- new release
-- added alphacolor, debug, flxdec, matroska, navigationtest, videomixer
- plug-ins
-
-* Mon Oct 03 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.9.3-0.gst.1
-- new release
-- fdsrc moved back to core
-- added auparse and efence plugins
-- added gtk-doc
-
-* Fri Sep 09 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- Initial package
-
-* Fri Sep 02 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- clean up for splitup
diff --git a/put-api-version-in-html-book-name.patch b/put-api-version-in-html-book-name.patch
deleted file mode 100644
index de81729..0000000
--- a/put-api-version-in-html-book-name.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ru gst-plugins-good-0.10.31/common/gtk-doc.mak gst-plugins-good-0.10.31.docbook/common/gtk-doc.mak
---- gst-plugins-good-0.10.31/common/gtk-doc.mak 2011-12-30 14:59:21.000000000 +0100
-+++ gst-plugins-good-0.10.31.docbook/common/gtk-doc.mak 2016-12-06 14:06:06.953785693 +0100
-@@ -130,10 +130,7 @@
- if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(abs_srcdir)"; \
- fi; \
-- cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-- @mv html/index.sgml html/index.sgml.bak
-- @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
-- @rm -f html/index.sgml.bak
-+ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE)-@GST_MAJORMINOR@ ../$(DOC_MAIN_SGML_FILE)
- @rm -rf html/xml
- @rm -f version.entities
- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html )
-@@ -189,9 +186,9 @@
- echo '-- Installing '$$i ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- done; \
-- echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
-- if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
-- $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
-+ echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \
-+ if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \
-+ $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \
- $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
- fi; \
- (which gtkdoc-rebase >/dev/null && \
-diff -ru gst-plugins-good-0.10.31/common/gtk-doc-plugins.mak gst-plugins-good-0.10.31.docbook/common/gtk-doc-plugins.mak
---- gst-plugins-good-0.10.31/common/gtk-doc-plugins.mak 2011-12-30 14:59:21.000000000 +0100
-+++ gst-plugins-good-0.10.31.docbook/common/gtk-doc-plugins.mak 2016-12-06 14:06:55.123696984 +0100
-@@ -223,10 +223,7 @@
- mkhtml_options="$$mkhtml_options --verbose"; \
- fi; \
- fi; \
-- cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
-- @mv html/index.sgml html/index.sgml.bak
-- @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
-- @rm -f html/index.sgml.bak
-+ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE)
- @rm -f html/$(DOC_MAIN_SGML_FILE)
- @rm -rf html/xml
- @rm -f html/version.entities
-@@ -290,9 +287,9 @@
- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- done; \
- fi; \
-- echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
-- if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
-- $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
-+ echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \
-+ if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \
-+ $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \
- $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
- fi; \
- (which gtkdoc-rebase >/dev/null && \
-diff -ru gst-plugins-good-0.10.31/docs/plugins/Makefile.in gst-plugins-good-0.10.31.docbook/docs/plugins/Makefile.in
---- gst-plugins-good-0.10.31/docs/plugins/Makefile.in 2012-02-21 01:08:52.000000000 +0100
-+++ gst-plugins-good-0.10.31.docbook/docs/plugins/Makefile.in 2016-12-06 14:08:18.480812994 +0100
-@@ -1153,10 +1153,7 @@
- @ENABLE_GTK_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \
- @ENABLE_GTK_DOC_TRUE@ fi; \
- @ENABLE_GTK_DOC_TRUE@ fi; \
--@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
--@ENABLE_GTK_DOC_TRUE@ @mv html/index.sgml html/index.sgml.bak
--@ENABLE_GTK_DOC_TRUE@ @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
--@ENABLE_GTK_DOC_TRUE@ @rm -f html/index.sgml.bak
-+@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE)
- @ENABLE_GTK_DOC_TRUE@ @rm -f html/$(DOC_MAIN_SGML_FILE)
- @ENABLE_GTK_DOC_TRUE@ @rm -rf html/xml
- @ENABLE_GTK_DOC_TRUE@ @rm -f html/version.entities
-@@ -1216,9 +1213,9 @@
- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- done; \
- fi; \
-- echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
-- if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
-- $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
-+ echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \
-+ if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \
-+ $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \
- $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
- fi; \
- (which gtkdoc-rebase >/dev/null && \
diff --git a/sources b/sources
deleted file mode 100644
index ce50b25..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-555845ceab722e517040bab57f9ace95 gst-plugins-good-0.10.31.tar.xz
4 years, 10 months