turkmen-linux/binary-repo
1
0 Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
sulincix committed 2023-05-21 20:22:25 +00:00
1 parent c35c0143aa
commit 4e0462d190
13 files changed
+54 -191
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/admin/chrpath/ympbuild
+3 -6
View File
@@ -17,11 +17,8 @@ arch=('x86_64')
cd $name-$version
setup(){
#./configure --prefix=/usr \
#--libdir=/usr/lib64/
echo ""
./configure --prefix=/usr --mandir=/usr/share/man
./configure --prefix=/usr \
--mandir=/usr/share/man
}
build(){
@@ -29,7 +26,7 @@ build(){
}
package(){
make DESTDIR="${DESTDIR}" docdir=/usr/share/doc/chrpath install
make docdir=/usr/share/doc/chrpath install
}
dev/libs/iniparser/ympbuild
+1 -7
View File
@@ -16,19 +16,13 @@ uses=()
arch=('x86_64')
cd $name-$version
setup(){
#./configure --prefix=/usr \
#--libdir=/usr/lib64/
echo ""
}
build(){
make $jobs
}
package(){
install -Dm0644 src/iniparser.h "${DESTDIR}"/usr/include/iniparser.h
install -Dm0644 src/iniparser.h "${DESTDIR}"/usr/include/iniparser.h
install -Dm0644 src/dictionary.h "${DESTDIR}"/usr/include/dictionary.h
install -Dm0644 libiniparser.so.1 "$DESTDIR"/usr/lib/libiniparser.so.1
install -Dm0644 LICENSE "${DESTDIR}"/usr/share/licenses/iniparser/LICENSE
dev/python/py3-cython/ympbuild
+1 -1
View File
@@ -8,7 +8,7 @@ email='bayramk@gmail.com'
maintainer='bk'
license=('GPLv3')
source=("https://github.com/cython/cython/archive/refs/tags/$version.tar.gz")
depends=(python libxml2 libxslt)
depends=(python3.11 libxml2 libxslt)
makedepends=()
md5sums=('e8fb3a99e91c8e7713a9609315f5063e')
group=(dev.python)
dev/python/py3-lxml/ympbuild
+1 -1
View File
@@ -8,7 +8,7 @@ email='bayramk@gmail.com'
maintainer='bk'
license=('GPLv3')
source=("https://github.com/lxml/lxml/archive/refs/tags/lxml-$version.tar.gz")
depends=(python libxml2 libxslt py3-cython)
depends=(python3.11 libxml2 libxslt py3-cython)
makedepends=()
md5sums=('08379bd7d53386d636db7ff3d0e05fde')
group=(dev.python)
dev/python/py3-sphinx/ympbuild
-32
View File
@@ -1,32 +0,0 @@
#!/usr/bin/env bash
name='py3-sphinx'
release='1'
version='7.0.1'
url='https://www.sphinx-doc.org/'
description='Python documentation generator'
email='bayramk@gmail.com'
maintainer='bk'
license=('GPLv3')
source=("https://pypi.org/packages/source/S/Sphinx/Sphinx-$version.tar.gz")
depends=(python)
makedepends=()
md5sums=('9b5357daa219d036f1220e44bf1c9512')
group=(dev.python)
uses=()
arch=('x86_64')
echo "adres: $pkgdir"
cd Sphinx-$version
build() {
#python --skip-dependency-check --no-isolation
echo "build"
}
package() {
#python3 -m installer -d "$pkgdir" dist/sphinx-*.whl
pip install .
}
net/libs/libtrace/ympbuild
+1 -2
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
x#!/usr/bin/env bash
name='libtrace'
release='1'
version='4.0.21-1'
@@ -20,7 +20,6 @@ setup(){
autoreconf -fvi
./configure --prefix=/usr \
--libdir=/usr/lib64/
echo ""
}
build(){
net/libs/libtracefs/ympbuild
+1 -7
View File
@@ -8,7 +8,7 @@ email='bayramk@gmail.com'
maintainer='bk'
license=('GPLv3')
source=("https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-$version.tar.gz")
depends=()
depends=(libtraceevent)
makedepends=()
md5sums=('eca92add29926d718bcdc8184358ab18')
group=(net.libs)
@@ -16,12 +16,6 @@ uses=()
arch=('x86_64')
cd $name-$version
setup(){
#./configure --prefix=/usr \
#--libdir=/usr/lib64/
echo ""
}
build(){
make $jobs
sys/apps/gptfdisk/gptfdisk-1.0.9-convenience-1.patch
+27
View File
@@ -0,0 +1,27 @@
Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
Date: 2015-10-19
Initial Package Version: 1.0.1
Upstream Status: None. BLFS specific.
Origin: BLFS
Description: Updates Makefile enabling parameter passing.
Rediffed for version 1.0.1
Updates: Rediffed for version 1.0.3 (P. Labastie)
Patch version 2 for version 1.0.3: Removed ICU
and POPT switches, keeping only the
install target (P. Labastie)
diff -Naur gptfdisk-1.0.3.old/Makefile gptfdisk-1.0.3.new/Makefile
--- gptfdisk-1.0.3.old/Makefile 2017-07-28 03:41:20.000000000 +0200
+++ gptfdisk-1.0.3.new/Makefile 2018-04-20 10:04:18.896802047 +0200
@@ -37,6 +37,11 @@
clean: #no pre-reqs
rm -f core *.o *~ gdisk sgdisk cgdisk fixparts
+install: gdisk cgdisk sgdisk fixparts
+ install -dm 755 $(DESTDIR)/sbin $(DESTDIR)/usr/share/man/man8
+ install -m755 gdisk cgdisk sgdisk fixparts $(DESTDIR)/sbin
+ install -m644 *.8 $(DESTDIR)/usr/share/man/man8
+
# what are the source dependencies
depend: $(SRCS)
$(DEPEND) $(SRCS)
sys/apps/gptfdisk/popt-1.19-follow-up.patch
-37
View File
@@ -1,37 +0,0 @@
From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001
From: Damian Kurek <starfire24680@gmail.com>
Date: Thu, 7 Jul 2022 03:39:16 +0000
Subject: [PATCH] Fix NULL dereference when duplicating string argument
poptGetArg can return NULL if there are no additional arguments, which
makes strdup dereference NULL on strlen
---
gptcl.cc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gptcl.cc b/gptcl.cc
index 0d578eb..ab95239 100644
--- a/gptcl.cc
+++ b/gptcl.cc
@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
} // while
// Assume first non-option argument is the device filename....
- device = strdup((char*) poptGetArg(poptCon));
- poptResetContext(poptCon);
+ device = (char*) poptGetArg(poptCon);
if (device != NULL) {
+ device = strdup(device);
+ poptResetContext(poptCon);
JustLooking(); // reset as necessary
BeQuiet(); // Tell called functions to be less verbose & interactive
if (LoadPartitions((string) device)) {
@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
cerr << "Error encountered; not saving changes.\n";
retval = 4;
} // if
+ free(device);
} // if (device != NULL)
poptFreeContext(poptCon);
return retval;
sys/apps/gptfdisk/popt-1.19.patch
-37
View File
@@ -1,37 +0,0 @@
From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001
From: Rod Smith <rodsmith@rodsbooks.com>
Date: Fri, 15 Apr 2022 18:10:14 -0400
Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest popt
(commit 740; presumably eventually release 1.19)
---
gptcl.cc | 2 +-
support.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gptcl.cc b/gptcl.cc
index 34c9421..0d578eb 100644
--- a/gptcl.cc
+++ b/gptcl.cc
@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
} // while
// Assume first non-option argument is the device filename....
- device = (char*) poptGetArg(poptCon);
+ device = strdup((char*) poptGetArg(poptCon));
poptResetContext(poptCon);
if (device != NULL) {
diff --git a/support.h b/support.h
index 8ba9ad1..f91f1bc 100644
--- a/support.h
+++ b/support.h
@@ -8,7 +8,7 @@
#include <stdlib.h>
#include <string>
-#define GPTFDISK_VERSION "1.0.9"
+#define GPTFDISK_VERSION "1.0.9.1"
#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
// Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64
sys/apps/gptfdisk/util-linux-2.38.patch
-22
View File
@@ -1,22 +0,0 @@
From 6a8416cbd12d55f882bb751993b94f72d338d96f Mon Sep 17 00:00:00 2001
From: Rod Smith <rodsmith@rodsbooks.com>
Date: Sat, 16 Apr 2022 09:32:04 -0400
Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid
---
guid.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guid.cc b/guid.cc
index 1e73ab7..d3e4fd5 100644
--- a/guid.cc
+++ b/guid.cc
@@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
void GUIDData::Randomize(void) {
int i, uuidGenerated = 0;
-#ifdef _UUID_UUID_H
+#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
uuid_generate(uuidData);
ReverseBytes(&uuidData[0], 4);
ReverseBytes(&uuidData[4], 2);
sys/apps/gptfdisk/ympbuild
+15 -32
View File
@@ -2,43 +2,32 @@
name='gptfdisk'
release='1'
version='1.0.9'
url='https://www.rodsbooks.com/gdisk/'
url='https://salsa.debian.org/debian/gdisk'
description='GPT partition table manipulator for Linux'
email='bayramk@gmail.com'
maintainer='bk'
license=('GPLv3')
source=("https://www.rodsbooks.com/gdisk/gptfdisk-$version.tar.gz"
"popt-1.19.patch"
"popt-1.19-follow-up.patch"
"util-linux-2.38.patch"
)
source=("https://salsa.debian.org/debian/gdisk/-/archive/debian/$version-2.1/gdisk-debian-$version-2.1.tar.gz"
"gptfdisk-1.0.9-convenience-1.patch")
depends=(popt)
makedepends=()
md5sums=('01c11ecfa454096543562e3068530e01'
'SKIP'
'SKIP'
'SKIP'
)
md5sums=('c01c07ce8570ec39129fa1682174f711'
'SKIP')
group=(sys.apps)
uses=()
arch=('x86_64')
cd $name-$version
prepare() {
patch -Np1 -i ../popt-1.19.patch
patch -Np1 -i ../util-linux-2.38.patch
# https://sourceforge.net/p/gptfdisk/code/merge-requests/28/
patch -Np1 -i ../popt-1.19-follow-up.patch
# https://sourceforge.net/p/gptfdisk/discussion/939590/thread/bc29ca06f8/
sed -i '/^#include /s:ncursesw/::' gptcurses.cc
}
cd gdisk-debian-$version-2.1
# tinfo is not symlink of ncurses for turkman
export LDFLAGS="$LDFLAGS -ltinfo"
setup(){
#./autogen.sh
#./configure --prefix=/usr \
#--libdir=/usr/lib64/
echo ""
prepare(){
patch -Np1 -i ../gptfdisk-1.0.9-convenience-1.patch
sed -i 's|ncursesw/||' gptcurses.cc &&
sed -i 's|sbin|usr/sbin|' Makefile &&
sed -i '/UUID_H/s/^.*$/#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)/' guid.cc &&
sed -i "/device =/s/= \(.*\);/= strdup(\1);/" gptcl.cc
}
build(){
@@ -46,12 +35,6 @@ build(){
}
package(){
# make install $jobs
#install -d "$pkgdir"/usr/{bin,share/{doc/gdisk,man/man8}}
#install -t "$DESTDIR/usr/bin" {,c,s}gdisk fixparts
#install -m644 -t "$pkgdir/usr/share/man/man8" {{,c,s}gdisk,fixparts}.8
#install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS
echo ""
make install $jobs
}
sys/apps/keyutils/ympbuild
+4 -7
View File
@@ -16,18 +16,15 @@ uses=()
arch=('x86_64')
cd $name-$version
setup(){
#./configure --prefix=/usr \
#--libdir=/usr/lib64/
echo ""
}
build(){
make $jobs
}
package(){
make install $jobs
make DESTDIR="$DESTDIR" install $jobs
# fix symlink
rm -f $DESTDIR/lib64/libkeyutils.so
ln -s libkeyutils.so.1 $DESTDIR/lib64/libkeyutils.so
}