diff options
Diffstat (limited to 'media-gfx/jhead')
-rw-r--r-- | media-gfx/jhead/Manifest | 1 | ||||
-rw-r--r-- | media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch | 53 |
2 files changed, 0 insertions, 54 deletions
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest index f11e57a9a4f4..c88696f44dca 100644 --- a/media-gfx/jhead/Manifest +++ b/media-gfx/jhead/Manifest @@ -1,4 +1,3 @@ -AUX jhead-3.04-mkstemp-fix-makefile.patch 1496 BLAKE2B 99266c5b86f94e6b173ae48e72990503fdb9d6d55e10f509e94d08fa0e821f25075868c8c6587b69c0299caac738b4872f46473236cf714eb5ed7ff0cacbf1f4 SHA512 f1f682a7b24e5e6e31125f80cae48e6c9e1af1e9f21b347784da0724a73e10082ff45b5bd36210883e8163048e3174efe927db95ceb660de821338ff77b05575 AUX jhead-3.06.0.1-CVE-2021-34055.patch 3779 BLAKE2B dfecaac2276d5b9c3fb85f0826bf814f468ba18d78baa2b1a979393cc08d24d00c639462ef470f1c4d3c4889add34a89941798b896971e8b868538ea691af253 SHA512 8d586c3805574b9b2332ddda0693c93052cbf7bc4930694e485bd7a3d85a2255f86d5222d99da851d3d81491ad61ddca4810c23d528f41b1b0784145f4f50dd9 AUX jhead-3.06.0.1-mkstemp-fix-makefile.patch 1575 BLAKE2B a3f7defa7fdcb547d0f9ed2d06c690effabd4435769fadd26cc26c939dda7ec865eb4ff9ffaf5cd6e817caa759d1bcdb741c6b2105b32d1954703d595d0c16a0 SHA512 36b15c3b557be1bfbfffec5e821389cdf9fa9549d5d8b60d5e30edf4177b29f4f34895763f722b7e5b5510ff7f1b46f6c35f13345750a408f2d500ddd4687144 DIST jhead-3.06.0.1.tgz 1144608 BLAKE2B 100eaddd8585e8845e83c3eb24aefb0a0a2d477f0ee818c212cc39ad88f39cbac5532979dbe7ee8c4d7b9475fdf4cce4257679d996e4fae14ef1902ef2f8e5a2 SHA512 7804f4bab1b07eb08ed981364b3634b1c25e0657d57651871aede640254c33f9d2307ba7c9fb3bc81eb06b71ba5d27437275a3fe53859e9e9457e37e12545db9 diff --git a/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch b/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch deleted file mode 100644 index 0bb634b6f5b9..000000000000 --- a/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/jhead.c b/jhead.c -index f78127a..d8d1472 100644 ---- a/jhead.c -+++ b/jhead.c -@@ -376,7 +376,7 @@ static void DoCommand(const char * FileName, int ShowIt) - // as mktemp - that is, that between getting the random name, and making the file - // some other program could snatch that exact same name! - // also, not all platforms support mkstemp. -- mktemp(TempName); -+ mkstemp(TempName); - - - if(!TempName[0]) { -diff --git a/makefile b/makefile -index f8f195e..c36d34f 100644 ---- a/makefile -+++ b/makefile -@@ -3,17 +3,20 @@ - #-------------------------------- - OBJ=. - SRC=. --CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) --CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) --LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -+LFLAGS = -fPIC -shared -Wl,-soname,libjhead.so.1 - --all: jhead -+TARGET = libjhead.so.1.0.0 -+TARGET0 = libjhead.so -+TARGET1 = libjhead.so.1 -+TARGET2 = libjhead.so.1.0 -+ -+all: jhead $(TARGET) - - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/jpgqguess.o $(OBJ)/paths.o \ - $(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o - - $(OBJ)/%.o:$(SRC)/%.c -- ${CC} $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -+ ${CC} -fPIC $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - jhead: $(objs) jhead.h - ${CC} $(LDFLAGS) -o jhead $(objs) -lm -@@ -23,3 +26,9 @@ clean: - - install: - cp jhead ${DESTDIR}/usr/bin/ -+ -+$(TARGET): $(objs) jhead -+ ${CC} $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs) -+ ln -s ${TARGET} ${TARGET0} -+ ln -s ${TARGET} ${TARGET1} -+ ln -s ${TARGET} ${TARGET2} |