diff -rup p7zip_15.14.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_15.14/CPP/7zip/Bundles/Format7zFree/makefile.list
--- p7zip_15.14.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2016-03-10 07:27:16.000000000 +0000
+++ p7zip_15.14/CPP/7zip/Bundles/Format7zFree/makefile.list 2016-03-15 13:50:22.638470716 +0000
@@ -87,8 +87,6 @@ SRCS=\
../../../../CPP/7zip/Archive/PeHandler.cpp \
../../../../CPP/7zip/Archive/PpmdHandler.cpp \
../../../../CPP/7zip/Archive/QcowHandler.cpp \
- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \
../../../../CPP/7zip/Archive/RpmHandler.cpp \
../../../../CPP/7zip/Archive/SplitHandler.cpp \
../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
@@ -191,9 +189,6 @@ SRCS=\
../../../../CPP/7zip/Crypto/MyAesReg.cpp \
../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
../../../../CPP/7zip/Crypto/RandGen.cpp \
- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \
- ../../../../CPP/7zip/Crypto/RarAes.cpp \
../../../../CPP/7zip/Crypto/WzAes.cpp \
../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
../../../../CPP/7zip/Crypto/ZipStrong.cpp \
@@ -485,10 +480,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Arc
$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp
QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp
$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp
-RarHandler.o : ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp
-Rar5Handler.o : ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp
RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp
$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp
SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp
@@ -693,12 +684,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/
$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp
RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp
$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp
-Rar20Crypto.o : ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp
-Rar5Aes.o : ../../../../CPP/7zip/Crypto/Rar5Aes.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar5Aes.cpp
-RarAes.o : ../../../../CPP/7zip/Crypto/RarAes.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RarAes.cpp
WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp
$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp
ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp
@@ -869,8 +854,6 @@ OBJS=\
PeHandler.o \
PpmdHandler.o \
QcowHandler.o \
- RarHandler.o \
- Rar5Handler.o \
RpmHandler.o \
SplitHandler.o \
SquashfsHandler.o \
@@ -973,9 +956,6 @@ OBJS=\
MyAesReg.o \
Pbkdf2HmacSha1.o \
RandGen.o \
- Rar20Crypto.o \
- Rar5Aes.o \
- RarAes.o \
WzAes.o \
ZipCrypto.o \
ZipStrong.o \
diff -rup p7zip_15.14.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.14/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
--- p7zip_15.14.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2016-03-10 07:27:16.000000000 +0000
+++ p7zip_15.14/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2016-03-15 13:50:22.639470728 +0000
@@ -126,8 +126,6 @@ add_library(7z MODULE
"../../../../CPP/7zip/Archive/PeHandler.cpp"
"../../../../CPP/7zip/Archive/PpmdHandler.cpp"
"../../../../CPP/7zip/Archive/QcowHandler.cpp"
- "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp"
- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp"
"../../../../CPP/7zip/Archive/RpmHandler.cpp"
"../../../../CPP/7zip/Archive/SplitHandler.cpp"
"../../../../CPP/7zip/Archive/SquashfsHandler.cpp"
@@ -230,9 +228,6 @@ add_library(7z MODULE
"../../../../CPP/7zip/Crypto/MyAesReg.cpp"
"../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp"
"../../../../CPP/7zip/Crypto/RandGen.cpp"
- "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp"
- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp"
- "../../../../CPP/7zip/Crypto/RarAes.cpp"
"../../../../CPP/7zip/Crypto/WzAes.cpp"
"../../../../CPP/7zip/Crypto/ZipCrypto.cpp"
"../../../../CPP/7zip/Crypto/ZipStrong.cpp"
diff -rup p7zip_15.14.orig/CPP/7zip/CMAKE/generate.sh p7zip_15.14/CPP/7zip/CMAKE/generate.sh
--- p7zip_15.14.orig/CPP/7zip/CMAKE/generate.sh 2016-02-03 04:54:00.000000000 +0000
+++ p7zip_15.14/CPP/7zip/CMAKE/generate.sh 2016-03-15 13:50:47.596758591 +0000
@@ -15,15 +15,15 @@ CURDIR=$PWD
cd $CURDIR
doit "Unix" "Unix Makefiles"
-cd $CURDIR
-doit "codeblocks" "CodeBlocks - Unix Makefiles"
+#cd $CURDIR
+#doit "codeblocks" "CodeBlocks - Unix Makefiles"
#cd $CURDIR
#doit "KDevelop3" "KDevelop3"
-cd $CURDIR
-doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles"
+#cd $CURDIR
+#doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles"
-cd $CURDIR
-doit "ninja" "Ninja"
+#cd $CURDIR
+#doit "ninja" "Ninja"
diff -rup p7zip_15.14.orig/DOC/License.txt p7zip_15.14/DOC/License.txt
--- p7zip_15.14.orig/DOC/License.txt 2016-03-02 05:57:39.000000000 +0000
+++ p7zip_15.14/DOC/License.txt 2016-03-15 13:50:22.640470740 +0000
@@ -1,3 +1,6 @@
+ Fedora package note: non-Free unrar code have been removed from the sources
+ (#190277)
+
7-Zip source code
~~~~~~~~~~~~~~~~~
License for use and distribution
diff -rup p7zip_15.14.orig/makefile p7zip_15.14/makefile
--- p7zip_15.14.orig/makefile 2016-02-29 06:28:31.000000000 +0000
+++ p7zip_15.14/makefile 2016-03-15 13:50:22.640470740 +0000
@@ -31,7 +31,6 @@ depend:
$(MAKE) -C CPP/7zip/UI/Client7z depend
$(MAKE) -C CPP/7zip/UI/Console depend
$(MAKE) -C CPP/7zip/Bundles/Format7zFree depend
- $(MAKE) -C CPP/7zip/Compress/Rar depend
$(MAKE) -C CPP/7zip/UI/GUI depend
$(MAKE) -C CPP/7zip/UI/FileManager depend
@@ -42,7 +41,6 @@ sfx: common
common7z:common
$(MKDIR) bin/Codecs
$(MAKE) -C CPP/7zip/Bundles/Format7zFree all
- $(MAKE) -C CPP/7zip/Compress/Rar all
lzham:common
$(MKDIR) bin/Codecs
@@ -67,7 +65,6 @@ clean_C:
$(MAKE) -C CPP/7zip/UI/FileManager clean
$(MAKE) -C CPP/7zip/UI/GUI clean
$(MAKE) -C CPP/7zip/Bundles/Format7zFree clean
- $(MAKE) -C CPP/7zip/Compress/Rar clean
$(MAKE) -C CPP/7zip/Compress/Lzham clean
$(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2
$(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean