main/ciwiki: upgrade to 3.0.4

This commit is contained in:
omni 2022-09-03 20:29:42 +00:00 committed by Natanael Copa
parent 7dff0145b2
commit ff2a62d9c4
3 changed files with 22 additions and 9 deletions

View File

@ -1,8 +1,8 @@
# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
pkgname=ciwiki
pkgver=2.0.8
pkgrel=2
pkgver=3.0.4
pkgrel=0
pkgdesc="personal lightweight wiki written in C"
url="https://ciwiki.sourceforge.net/"
arch="all"
@ -11,6 +11,7 @@ options="!check"
subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/project/ciwiki/ciwiki-$pkgver.tar.gz
gcc-10.patch
musl.patch
"
build() {
@ -29,6 +30,7 @@ package() {
}
sha512sums="
0686f01837add6d88f21e4f8f81e719515909515274ca7a91032eeaf3cf06b43a0cac6aaff69e088032652646b3602be1f970145a76fb96e05a9fe6fc7b1757d ciwiki-2.0.8.tar.gz
c023a1e94e5a69c42640b9b0f3cf9ded4201f8116eb815c73cdd93718abe75d5d1e5d8875112acb8fc789664f6fdbcdedd054525185d983c5fec0d34bb0fe3d3 gcc-10.patch
378d5355190a5f858b05a108817a4c6c8631a529366c77a3a1d31fde3628868f359a400f51ec817662d6919b241fb9839c4e40ecf88de14067182c10b9ce4d99 ciwiki-3.0.4.tar.gz
f5fa892f36d2341f37ffedf088231eb471cd8609330fa6e5b830a87bbc3c46ab25284973cdf166a61c10d3dcf4a8ac8c85b88e21a02c5f0869a845d0ef97ce11 gcc-10.patch
e5f3fc048f8ab7eaa9fdd6b12792140dc2a7f0e56336ef513765b8c177b2756e9f27346660bb715908bd99c1abf56906821ab67d1058357964843d59591b50ff musl.patch
"

View File

@ -3,12 +3,12 @@ Reason: Fixes compilation under gcc-10
--- a/src/wiki.c
+++ b/src/wiki.c
@@ -30,7 +30,7 @@ extern int lgindex;
extern int Exec_allowed;
extern int Upload_allowed;
@@ -50,7 +50,7 @@ extern int secureLogin;
extern char* secureKey;
-int loginform;
+extern int loginform;
/* read wiki page */
static char *
/* read wiki page, styles.css, header, forms and allocate enough mem
* don't forget to free() the allocated memory */

11
main/ciwiki/musl.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/ci.c
+++ b/src/ci.c
@@ -175,7 +175,7 @@ main(int argc, char **argv)
if( toupper(getchar()) == 'Y'){
create_htmlHome=1;
fprintf(stderr,"Redirection to /html/index.html is enabled.\n");
- stdin = freopen(NULL,"r",stdin); //cleanup stdin to remove \n
+ freopen(NULL,"r",stdin); //cleanup stdin to remove \n
}
else {
fprintf(stderr,"\nCanceled!\n");