mirror of
https://github.com/gryf/gryf-overlay.git
synced 2026-03-26 22:53:32 +01:00
Compare commits
2 Commits
86a37de680
...
f92f1be5ff
| Author | SHA1 | Date | |
|---|---|---|---|
| f92f1be5ff | |||
| 0e1efada07 |
@@ -1,12 +0,0 @@
|
||||
DIST chezmoi_2.26.0_linux_amd64.deb 10379350 BLAKE2B 8627ee06dbafe7f935314081dec58ca290c2608efe2cb3d7e2e7fea92397273d230225a1d403b25a514b2d3b53e389312135317bf4c3b8580befea36e389fee5 SHA512 1f2622e81965332bdd6353d73285cd981f2126ec8d7f3a9399b1a99e7cca7750310b501c159fa7634dd9a121e781477deb2e47dcd006927b068d5e9445f99b06
|
||||
DIST chezmoi_2.26.0_linux_arm64.deb 9320380 BLAKE2B 1b7a0100a6d65d54b66563aca563f19c038ac9b2850e61d2cbc83c820c1338b2531cd4cdcf492a4fc4c36801d4ef1d881609cd2586d79d4d90d4f301798d8cf7 SHA512 57d619933bc45c3164e2775940bd9c05a27af2c49d2e5baf5201b923c8b54c823d97e6cca84bdb35a52b726393493cba2be13c1f3c5c8ce24974c043c7712236
|
||||
DIST chezmoi_2.26.0_linux_armel.deb 9838392 BLAKE2B 2a8fefa7ad946f61b2a034d086d28eddde57c4e3db867e3e297c76d698dab6e3794e4656f456c99cebf18920d4886e3e6013ca57c4e92840629bbba790bdff65 SHA512 937f1eae53773f422f0258317014196ab11e6c1dd4a407603ececb3c35c093875080a287dd5c41b2751dbc90f2fe00171cbaa342aa3a9d4ec55bfd18a3997d14
|
||||
DIST chezmoi_2.26.0_linux_i386.deb 9629066 BLAKE2B dda7fa5dcb8cfa6677b1f11f509947585823bfc90134c43034e1e1aa15499ef1958d7aab6f010b848bd3fe2d9d9bbfdc954469f68556e11254c879a2a8dace3f SHA512 e3166d9844e020c1a3072640df48513dcad64791b6343f6c3560aa54623e1a5162c7cbbd4e98a3182a72407d305f34d00fe9de83d1ce955217cd1279f84c5e78
|
||||
DIST chezmoi_2.26.0_linux_ppc64.deb 9079632 BLAKE2B e22dcc1067bbfb37b659ebfe2696a87271c32514824da8d21f7dc0f52ecb084cc0a1e30ee2d1abae650c331abc7ac9fa4573bf28549705c4a0b43f40972fe976 SHA512 a260fabc71d5d66978765e209e48c18ba495ad9216a50bbb312665956d903ddadb5e4b549d2ed29bb899bddea78345d6d2efa40490975d0bc71e84f6f0bf41cf
|
||||
DIST chezmoi_2.34.0_linux_amd64.deb 11243138 BLAKE2B 5cebb6b1c1cca31efb24ecac0735fc98b22a82c1f1d6cec6d338fefde2e79a93a885cbf167decc735ce6b5bb8234293c3fbd64cd2c237b6a450def7c17132321 SHA512 e207a738b4732e97b72e43739b236395b2ddc2e9511fa1f2946b95e88d65f08eb92c7397bf01fdcb6a9c1d1e8b1ff2695c11920b6affc7f349a592520c445b0e
|
||||
DIST chezmoi_2.34.0_linux_arm64.deb 10069394 BLAKE2B 088294cef4c6f06e7178554c6e36b056c79a5045a4e91262352e9757b0cd2aba2cf38d4d0ce11a530ab224c86d875c269352229fafa467de0c8052278ad2f1a2 SHA512 613f61e913cc3c07d25499f03c9066d719a69d26f572b8c4137b40ee0313e6e8cd571d60faac05408abad4c960ed038b069af1f00e571024a6f41eb4f51522a3
|
||||
DIST chezmoi_2.34.0_linux_armel.deb 10729586 BLAKE2B 906d9fab7b0265522382e6d7c789f75134e58f0d1f1f7aba584eddd9cd0a42be69c2ea60574c3a98eeaf8f54f94f691c5b0bc87a20d0554260d37cba44b3a11b SHA512 2e2db2db656d0aece0d6befc0f76abbe513d827dacd43efd9f9384193ef39869bdbc11808e2050ab5a514898edc53f2ffa9bf2292a46e6207be86d34d65319bd
|
||||
DIST chezmoi_2.34.0_linux_i386.deb 10510852 BLAKE2B e8b7cbf216be96d8b16b4ecd621b1bb8b54db4bd3eca81f276b78dfb8409dda1c0a49cb389a4fbed3247067b885dacd398cd4b140de8ae1b777ff6e088ff535e SHA512 0a2f6670fdb91a965615f33c3cc111118c955ddaec9445f4bc93cc4b89020b6c41c096aa421c60514cef5ecc9f31154a3bb9729e0864f376b545e0fbc0f71917
|
||||
DIST chezmoi_2.34.0_linux_ppc64.deb 9911348 BLAKE2B 8f4b6980bdb7154d47b6f40fa71580b9d2e3c071d31c1585196d12fd4dddac8dbe36abb33bdb310f4d2a587144fd29142f52026a838c2d5e17c52163cac7539b SHA512 e52e87194e3d4fc5660c0df7ea427713b4d66e74caaf4da3ae75f8a548c1400b5fa2908d1c00546504bb183719e953e6c1e74fc271b24424f6750579e27ec142
|
||||
EBUILD chezmoi-bin-2.26.0.ebuild 1083 BLAKE2B 0eb343ba6f18107bf802b6eba63c9cde78269800fd3184b31d9a10642d38e2ca4c573292f6111ffaacdef9be50bf7522f89098817d3d77d44257bd6f796f340f SHA512 abd7f836f330d2fe7a01289c7cf840255ebe02cda18ce985c2fe151189d2f913e322a1d45348981c14a5083245495ac0887803071840ad6aae039211f191b550
|
||||
EBUILD chezmoi-bin-2.34.0.ebuild 1083 BLAKE2B 0eb343ba6f18107bf802b6eba63c9cde78269800fd3184b31d9a10642d38e2ca4c573292f6111ffaacdef9be50bf7522f89098817d3d77d44257bd6f796f340f SHA512 abd7f836f330d2fe7a01289c7cf840255ebe02cda18ce985c2fe151189d2f913e322a1d45348981c14a5083245495ac0887803071840ad6aae039211f191b550
|
||||
@@ -1,43 +0,0 @@
|
||||
# Copyright 2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit unpacker
|
||||
|
||||
MY_PN="${PN%-bin}"
|
||||
|
||||
DESCRIPTION="Manage your dotfiles across multiple diverse machines, securely."
|
||||
HOMEPAGE="https://www.chezmoi.io/"
|
||||
SRC_URI="
|
||||
amd64? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_amd64.deb )
|
||||
arm? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_armel.deb )
|
||||
arm64? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_arm64.deb )
|
||||
ppc64? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_ppc64.deb )
|
||||
x86? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_i386.deb )"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
|
||||
|
||||
DEPEND="dev-vcs/git"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND=""
|
||||
|
||||
RESTRICT="mirror"
|
||||
|
||||
QA_PREBUILT="
|
||||
usr/bin/${MY_PN}"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_unpack() {
|
||||
unpack_deb "${A}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /
|
||||
doins -r *
|
||||
|
||||
fperms +x /usr/bin/${MY_PN}
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
# Copyright 2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit unpacker
|
||||
|
||||
MY_PN="${PN%-bin}"
|
||||
|
||||
DESCRIPTION="Manage your dotfiles across multiple diverse machines, securely."
|
||||
HOMEPAGE="https://www.chezmoi.io/"
|
||||
SRC_URI="
|
||||
amd64? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_amd64.deb )
|
||||
arm? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_armel.deb )
|
||||
arm64? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_arm64.deb )
|
||||
ppc64? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_ppc64.deb )
|
||||
x86? ( https://github.com/twpayne/${MY_PN}/releases/download/v${PV}/${MY_PN}_${PV}_linux_i386.deb )"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
|
||||
|
||||
DEPEND="dev-vcs/git"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND=""
|
||||
|
||||
RESTRICT="mirror"
|
||||
|
||||
QA_PREBUILT="
|
||||
usr/bin/${MY_PN}"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_unpack() {
|
||||
unpack_deb "${A}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /
|
||||
doins -r *
|
||||
|
||||
fperms +x /usr/bin/${MY_PN}
|
||||
}
|
||||
@@ -1,4 +1 @@
|
||||
AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
|
||||
AUX unadf-0.7.12_separate_comment.patch 4846 BLAKE2B a58dfab3190e02ddb41c2632c62ebf40eaf8240430e8c2e146c34a30bda5956706c1927d3236d73fa8d0b2731a574b3402f25a8ebab6ba0fc11d2f92982449ef SHA512 9d1e608eae1e8cbd20051c18dff8f53aee7c3d7ef57c1c5527006c6f3af3d72dd92f8b0aee62f3ea06872d00a6a42f89105800f6fbff385830bd10486ceedbf0
|
||||
DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
|
||||
EBUILD unadf-0.7.12.ebuild 768 BLAKE2B 9913d790bc0e21cd74985b6a3868d0fbad4fbd14a964dbfffa52bec469e5ed3e9caa11d7af10cd1995090f8c540f5269f1927291ed95a55ae6ffe026607fe4d5 SHA512 13bf269898d20bce71dc0250fc849ebcb864e03f8e29ae9706f57fa82b7987878a9ad692e4c80adf26e15028dcad911b53ec73a240a41b1dd7207704009917b3
|
||||
EBUILD unadf-0.8.0.ebuild 638 BLAKE2B 57726bedc71bfbbfb1edde4f68361363282420c2953261e9daa4b4eb1ddd0ad8aaf051fe5dab9d76cb3cfe3403815fabe3a7779a346c50fefb3fe8d741550484 SHA512 b3176d5b2e18dfe76b09cda35c94f49a4bac756953b04535c140e03a5d9cb20c0aa5d66e3805f71c596a82ef7782f495c72b6ca7210daf2e8500306dc2f230df
|
||||
|
||||
@@ -1,146 +0,0 @@
|
||||
Description: Fix unsafe extraction by using mkdir() instead of shell command
|
||||
This commit fixes following vulnerabilities:
|
||||
|
||||
- CVE-2016-1243: stack buffer overflow caused by blindly trusting on
|
||||
pathname lengths of archived files
|
||||
|
||||
Stack allocated buffer sysbuf was filled with sprintf() without any
|
||||
bounds checking in extracTree() function.
|
||||
|
||||
- CVE-2016-1244: execution of unsanitized input
|
||||
|
||||
Shell command used for creating directory paths was constructed by
|
||||
concatenating names of archived files to the end of the command
|
||||
string.
|
||||
|
||||
So, if the user was tricked to extract a specially crafted .adf file,
|
||||
the attacker was able to execute arbitrary code with privileges of the
|
||||
user.
|
||||
|
||||
This commit fixes both issues by
|
||||
|
||||
1) replacing mkdir shell commands with mkdir() function calls
|
||||
2) removing redundant sysbuf buffer
|
||||
|
||||
Author: Tuomas Räsänen <tuomasjjrasanen@tjjr.fi>
|
||||
Last-Update: 2016-09-20
|
||||
--
|
||||
--- a/examples/unadf.c
|
||||
+++ b/examples/unadf.c
|
||||
@@ -24,6 +24,8 @@
|
||||
|
||||
#define UNADF_VERSION "1.0"
|
||||
|
||||
+#include <sys/stat.h>
|
||||
+#include <sys/types.h>
|
||||
|
||||
#include<stdlib.h>
|
||||
#include<errno.h>
|
||||
@@ -31,17 +33,15 @@
|
||||
|
||||
#include "adflib.h"
|
||||
|
||||
-/* The portable way used to create a directory is to call the MKDIR command via the
|
||||
- * system() function.
|
||||
- * It is used to create the 'dir1' directory, like the 'dir1/dir11' directory
|
||||
+/* The portable way used to create a directory is to call mkdir()
|
||||
+ * which is defined by following standards: SVr4, BSD, POSIX.1-2001
|
||||
+ * and POSIX.1-2008
|
||||
*/
|
||||
|
||||
/* the portable way to check if a directory 'dir1' already exists i'm using is to
|
||||
* do fopen('dir1','rb'). NULL is returned if 'dir1' doesn't exists yet, an handle instead
|
||||
*/
|
||||
|
||||
-#define MKDIR "mkdir"
|
||||
-
|
||||
#ifdef WIN32
|
||||
#define DIRSEP '\\'
|
||||
#else
|
||||
@@ -51,6 +51,13 @@
|
||||
#define EXTBUFL 1024*8
|
||||
|
||||
|
||||
+static void mkdirOrLogErr(const char *const path)
|
||||
+{
|
||||
+ if (mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO))
|
||||
+ fprintf(stderr, "mkdir: cannot create directory '%s': %s\n",
|
||||
+ path, strerror(errno));
|
||||
+}
|
||||
+
|
||||
void help()
|
||||
{
|
||||
puts("unadf [-lrcsp -v n] dumpname.adf [files-with-path] [-d extractdir]");
|
||||
@@ -152,7 +159,6 @@ void extractTree(struct Volume *vol, str
|
||||
{
|
||||
struct Entry* entry;
|
||||
char *buf;
|
||||
- char sysbuf[200];
|
||||
|
||||
while(tree) {
|
||||
entry = (struct Entry*)tree->content;
|
||||
@@ -162,16 +168,14 @@ void extractTree(struct Volume *vol, str
|
||||
buf=(char*)malloc(strlen(path)+1+strlen(entry->name)+1);
|
||||
if (!buf) return;
|
||||
sprintf(buf,"%s%c%s",path,DIRSEP,entry->name);
|
||||
- sprintf(sysbuf,"%s %s",MKDIR,buf);
|
||||
if (!qflag) printf("x - %s%c\n",buf,DIRSEP);
|
||||
+ if (!pflag) mkdirOrLogErr(buf);
|
||||
}
|
||||
else {
|
||||
- sprintf(sysbuf,"%s %s",MKDIR,entry->name);
|
||||
if (!qflag) printf("x - %s%c\n",entry->name,DIRSEP);
|
||||
+ if (!pflag) mkdirOrLogErr(entry->name);
|
||||
}
|
||||
|
||||
- if (!pflag) system(sysbuf);
|
||||
-
|
||||
if (tree->subdir!=NULL) {
|
||||
if (adfChangeDir(vol,entry->name)==RC_OK) {
|
||||
if (buf!=NULL)
|
||||
@@ -301,21 +305,20 @@ void processFile(struct Volume *vol, cha
|
||||
extractFile(vol, name, path, extbuf, pflag, qflag);
|
||||
}
|
||||
else {
|
||||
- /* the all-in-one string : to call system(), to find the filename, the convert dir sep char ... */
|
||||
- bigstr=(char*)malloc(strlen(MKDIR)+1+strlen(path)+1+strlen(name)+1);
|
||||
+ bigstr=(char*)malloc(strlen(path)+1+strlen(name)+1);
|
||||
if (!bigstr) { fprintf(stderr,"processFile : malloc"); return; }
|
||||
|
||||
/* to build to extract path */
|
||||
if (strlen(path)>0) {
|
||||
- sprintf(bigstr,"%s %s%c%s",MKDIR,path,DIRSEP,name);
|
||||
- cdstr = bigstr+strlen(MKDIR)+1+strlen(path)+1;
|
||||
+ sprintf(bigstr,"%s%c%s",path,DIRSEP,name);
|
||||
+ cdstr = bigstr+strlen(path)+1;
|
||||
}
|
||||
else {
|
||||
- sprintf(bigstr,"%s %s",MKDIR,name);
|
||||
- cdstr = bigstr+strlen(MKDIR)+1;
|
||||
+ sprintf(bigstr,"%s",name);
|
||||
+ cdstr = bigstr;
|
||||
}
|
||||
/* the directory in which the file will be extracted */
|
||||
- fullname = bigstr+strlen(MKDIR)+1;
|
||||
+ fullname = bigstr;
|
||||
|
||||
/* finds the filename, and separates it from the path */
|
||||
filename = strrchr(bigstr,'/')+1;
|
||||
@@ -333,7 +336,7 @@ void processFile(struct Volume *vol, cha
|
||||
return;
|
||||
tfile = fopen(fullname,"r"); /* the only portable way to test if the dir exists */
|
||||
if (tfile==NULL) { /* does't exist : create it */
|
||||
- if (!pflag) system(bigstr);
|
||||
+ if (!pflag) mkdirOrLogErr(bigstr);
|
||||
if (!qflag) printf("x - %s%c\n",fullname,DIRSEP);
|
||||
}
|
||||
else
|
||||
@@ -350,7 +353,7 @@ void processFile(struct Volume *vol, cha
|
||||
return;
|
||||
tfile = fopen(fullname,"r");
|
||||
if (tfile==NULL) {
|
||||
- if (!pflag) system(bigstr);
|
||||
+ if (!pflag) mkdirOrLogErr(bigstr);
|
||||
if (!qflag) printf("x - %s%c\n",fullname,DIRSEP);
|
||||
}
|
||||
else
|
||||
@@ -1,137 +0,0 @@
|
||||
--- adflib-0.7.12_a/examples/unadf.c 2021-07-09 17:38:47.980770205 +0200
|
||||
+++ adflib-0.7.12_b/examples/unadf.c 2021-07-09 17:54:32.548793259 +0200
|
||||
@@ -65,6 +65,7 @@
|
||||
puts(" -r : lists directory tree contents");
|
||||
puts(" -c : use dircache data (must be used with -l)");
|
||||
puts(" -s : display entries logical block pointer (must be used with -l)");
|
||||
+ puts(" -m : display file comments, if exists (must be used with -l)");
|
||||
putchar('\n');
|
||||
puts(" -v n : mount volume #n instead of default #0 volume");
|
||||
putchar('\n');
|
||||
@@ -72,7 +73,8 @@
|
||||
puts(" -d dir : extract to 'dir' directory");
|
||||
}
|
||||
|
||||
-void printEnt(struct Volume *vol, struct Entry* entry, char *path, BOOL sect)
|
||||
+void printEnt(struct Volume *vol, struct Entry* entry, char *path, BOOL sect,
|
||||
+ BOOL comment)
|
||||
{
|
||||
/* do not print the links entries, ADFlib do not support them yet properly */
|
||||
if (entry->type==ST_LFILE || entry->type==ST_LDIR || entry->type==ST_LSOFT)
|
||||
@@ -81,12 +83,12 @@
|
||||
if (entry->type==ST_DIR)
|
||||
printf(" ");
|
||||
else
|
||||
- printf("%7ld ",entry->size);
|
||||
+ printf("%7d ",entry->size);
|
||||
|
||||
printf("%4d/%02d/%02d %2d:%02d:%02d ",entry->year, entry->month, entry->days,
|
||||
entry->hour, entry->mins, entry->secs);
|
||||
if (sect)
|
||||
- printf(" %06ld ",entry->sector);
|
||||
+ printf(" %06d ",entry->sector);
|
||||
|
||||
if (strlen(path)>0)
|
||||
printf(" %s/",path);
|
||||
@@ -96,7 +98,7 @@
|
||||
printf("%s/",entry->name);
|
||||
else
|
||||
printf("%s",entry->name);
|
||||
- if (entry->comment!=NULL && strlen(entry->comment)>0)
|
||||
+ if (comment && entry->comment!=NULL && strlen(entry->comment)>0)
|
||||
printf(", %s",entry->comment);
|
||||
putchar('\n');
|
||||
|
||||
@@ -203,13 +205,14 @@
|
||||
}
|
||||
|
||||
|
||||
-void printTree(struct Volume *vol, struct List* tree, char* path, BOOL sect)
|
||||
+void printTree(struct Volume *vol, struct List* tree, char* path, BOOL sect,
|
||||
+ BOOL comment)
|
||||
{
|
||||
char *buf;
|
||||
struct Entry* entry;
|
||||
|
||||
while(tree) {
|
||||
- printEnt(vol, tree->content, path, sect);
|
||||
+ printEnt(vol, tree->content, path, sect, comment);
|
||||
if (tree->subdir!=NULL) {
|
||||
entry = (struct Entry*)tree->content;
|
||||
if (strlen(path)>0) {
|
||||
@@ -219,11 +222,11 @@
|
||||
return;
|
||||
}
|
||||
sprintf(buf,"%s/%s", path, entry->name);
|
||||
- printTree(vol, tree->subdir, buf, sect);
|
||||
+ printTree(vol, tree->subdir, buf, sect, comment);
|
||||
free(buf);
|
||||
}
|
||||
else
|
||||
- printTree(vol, tree->subdir, entry->name, sect);
|
||||
+ printTree(vol, tree->subdir, entry->name, sect, comment);
|
||||
}
|
||||
tree = tree->next;
|
||||
}
|
||||
@@ -247,7 +250,7 @@
|
||||
printf("???"); break;
|
||||
}
|
||||
|
||||
- printf(". Cylinders = %ld, Heads = %ld, Sectors = %ld",dev->cylinders,dev->heads,dev->sectors);
|
||||
+ printf(". Cylinders = %d, Heads = %d, Sectors = %d",dev->cylinders,dev->heads,dev->sectors);
|
||||
|
||||
printf(". Volumes = %d\n",dev->nVol);
|
||||
}
|
||||
@@ -277,7 +280,7 @@
|
||||
if (vol->volName!=NULL)
|
||||
printf(" \"%s\"", vol->volName);
|
||||
|
||||
- printf(" between sectors [%ld-%ld].",vol->firstBlock, vol->lastBlock);
|
||||
+ printf(" between sectors [%d-%d].",vol->firstBlock, vol->lastBlock);
|
||||
|
||||
printf(" %s ",isFFS(vol->dosType) ? "FFS" : "OFS");
|
||||
if (isINTL(vol->dosType))
|
||||
@@ -373,7 +376,7 @@
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
int i, j;
|
||||
- BOOL rflag, lflag, xflag, cflag, vflag, sflag, dflag, pflag, qflag;
|
||||
+ BOOL rflag, lflag, xflag, cflag, vflag, sflag, dflag, pflag, qflag, mflag;
|
||||
struct List* files, *rtfiles;
|
||||
char *devname, *dirname;
|
||||
char strbuf[80];
|
||||
@@ -392,7 +395,7 @@
|
||||
exit(0);
|
||||
}
|
||||
|
||||
- rflag = lflag = cflag = vflag = sflag = dflag = pflag = qflag = FALSE;
|
||||
+ rflag = lflag = cflag = vflag = sflag = dflag = pflag = qflag = mflag = FALSE;
|
||||
vInd = dInd = fInd = aInd = -1;
|
||||
xflag = TRUE;
|
||||
dirname = NULL;
|
||||
@@ -433,6 +436,9 @@
|
||||
case 's':
|
||||
sflag = TRUE;
|
||||
break;
|
||||
+ case 'm':
|
||||
+ mflag = TRUE;
|
||||
+ break;
|
||||
case 'c':
|
||||
cflag = TRUE;
|
||||
break;
|
||||
@@ -526,13 +532,13 @@
|
||||
if (!rflag) {
|
||||
cell = list = adfGetDirEnt(vol,vol->curDirPtr);
|
||||
while(cell) {
|
||||
- printEnt(vol,cell->content,"", sflag);
|
||||
+ printEnt(vol,cell->content,"", sflag, mflag);
|
||||
cell = cell->next;
|
||||
}
|
||||
adfFreeDirList(list);
|
||||
} else {
|
||||
cell = list = adfGetRDirEnt(vol,vol->curDirPtr,TRUE);
|
||||
- printTree(vol,cell,"", sflag);
|
||||
+ printTree(vol,cell,"", sflag, mflag);
|
||||
adfFreeDirList(list);
|
||||
}
|
||||
}else if (xflag) {
|
||||
@@ -3,24 +3,20 @@
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools
|
||||
inherit autotools git-r3
|
||||
|
||||
MY_PN="adflib"
|
||||
|
||||
DESCRIPTION="Extract files from Amiga adf disk images"
|
||||
HOMEPAGE="http://lclevy.free.fr/adflib/"
|
||||
SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
|
||||
HOMEPAGE="https://github.com/lclevy/adflib"
|
||||
EGIT_REPO_URI="https://github.com/lclevy/adflib"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
|
||||
IUSE="static-libs"
|
||||
|
||||
S="${WORKDIR}/${MY_PN}-${PV}"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.7.12-CVE-2016-1243_CVE-2016-1244.patch"
|
||||
"${FILESDIR}/${PN}-0.7.12_separate_comment.patch"
|
||||
)
|
||||
#S="${WORKDIR}/${MY_PN}-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
Reference in New Issue
Block a user