-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathp7zip-norar.patch
149 lines (142 loc) · 6.18 KB
/
p7zip-norar.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
diff '--color=auto' -ru p7z-orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip-17.04/CPP/7zip/Bundles/Format7zFree/makefile.list
--- p7z-orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2021-04-04 05:11:06.000000000 +0200
+++ p7zip-17.04/CPP/7zip/Bundles/Format7zFree/makefile.list 2021-11-26 09:28:06.528954935 +0100
@@ -90,8 +90,6 @@
../../../../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 \
@@ -218,9 +216,6 @@
../../../../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 \
@@ -817,10 +812,6 @@
$(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
@@ -1073,12 +1064,6 @@
$(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
@@ -1364,8 +1349,6 @@
PeHandler.o \
PpmdHandler.o \
QcowHandler.o \
- RarHandler.o \
- Rar5Handler.o \
RpmHandler.o \
SplitHandler.o \
SquashfsHandler.o \
@@ -1492,9 +1475,6 @@
MyAesReg.o \
Pbkdf2HmacSha1.o \
RandGen.o \
- Rar20Crypto.o \
- Rar5Aes.o \
- RarAes.o \
WzAes.o \
ZipCrypto.o \
ZipStrong.o \
diff '--color=auto' -ru p7z-orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip-17.04/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
--- p7z-orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2021-04-04 05:11:06.000000000 +0200
+++ p7zip-17.04/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2021-11-26 09:28:33.919148657 +0100
@@ -225,8 +225,6 @@
"../../../../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"
@@ -353,9 +351,6 @@
"../../../../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 '--color=auto' -ru p7z-orig/CPP/7zip/CMAKE/generate.sh p7zip-17.04/CPP/7zip/CMAKE/generate.sh
--- p7z-orig/CPP/7zip/CMAKE/generate.sh 2021-04-04 05:11:06.000000000 +0200
+++ p7zip-17.04/CPP/7zip/CMAKE/generate.sh 2021-11-26 09:29:04.786057324 +0100
@@ -15,15 +15,15 @@
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 '--color=auto' -ru p7z-orig/DOC/License.txt p7zip-17.04/DOC/License.txt
--- p7z-orig/DOC/License.txt 2021-04-04 05:11:06.000000000 +0200
+++ p7zip-17.04/DOC/License.txt 2021-11-26 09:29:20.982860082 +0100
@@ -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 '--color=auto' -ru p7z-orig/makefile p7zip-17.04/makefile
--- p7z-orig/makefile 2021-04-04 05:11:06.000000000 +0200
+++ p7zip-17.04/makefile 2021-11-26 09:29:45.853080173 +0100
@@ -31,7 +31,6 @@
$(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 @@
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 @@
$(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