diff --git a/create-JD-git-bare-tarball.sh b/create-JD-git-bare-tarball.sh new file mode 100644 index 0000000..519bcfa --- /dev/null +++ b/create-JD-git-bare-tarball.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +set -x +set -e + +REPONAME=JD +GITURL=https://github.com/yama-natuki/${REPONAME}.git + +DATE=$(date '+%Y%m%d') +TIME=$(date '+%H%M') + +TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz + +PWDDIR=$(pwd) +TMPDIR=$(mktemp -d /var/tmp/${REPONAME}-XXXXXX) +pushd $TMPDIR + +git clone --mirror $GITURL +tar czf ${TARNAME} ${REPONAME}.git/ + +cp -p ${TARNAME} $PWDDIR +popd +rm -rf $TMPDIR diff --git a/jd-2.8.9-gcc8-strict-array-check.patch b/jd-2.8.9-gcc8-strict-array-check.patch deleted file mode 100644 index bd1eb5f..0000000 --- a/jd-2.8.9-gcc8-strict-array-check.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- jd-2.8.9-150226/src/jdlib/miscutil.cpp.debug 2014-04-27 20:09:24.000000000 +0900 -+++ jd-2.8.9-150226/src/jdlib/miscutil.cpp 2018-02-15 22:48:48.623663599 +0900 -@@ -136,7 +136,7 @@ - - // " から始まる ( \"は除く ) - dquote = false; -- if( str[ i ] == '\"' && str[ i -1 ] != '\\' ){ -+ if( str[ i ] == '\"' && (i < 1 || str[ i -1 ] != '\\') ){ - dquote = true; - ++i; - } -@@ -184,7 +184,7 @@ - for(;;){ - - while( i2 < lng && str[ i2++ ] != delim ); -- int tmp = ( str[ i2-1 ] == delim || str[ i2 -1 ] == '\n' ) ? 1 : 0; -+ int tmp = ( i2 >= 1 && ( str[ i2-1 ] == delim || str[ i2 -1 ] == '\n' ) ) ? 1 : 0; - if( i2 - i ) list_str.push_back( str.substr( i, i2 - i - tmp ) ); - if( i2 >= lng ) break; - i = i2; -@@ -324,7 +324,8 @@ - if( str[ i2 ] == ' ' ) --i2; - - // 全角 -- else if( str[ i2 - lng_space +1 ] == str_space[ 0 ] && -+ else if( i2 +1 >= lng_space && -+ str[ i2 - lng_space +1 ] == str_space[ 0 ] && - str[ i2 - lng_space +2 ] == str_space[ 1 ] && - ( lng_space == 2 || str[ i2 - lng_space +3 ] == str_space[ 2 ] ) ) i2 -= lng_space; - else break; diff --git a/jd-2.8.9-glibmm2450.patch b/jd-2.8.9-glibmm2450.patch deleted file mode 100644 index 1b9b955..0000000 --- a/jd-2.8.9-glibmm2450.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- jd-2.8.9-150226/src/article/drawareabase.h.glibmm2450 2015-01-30 21:32:48.000000000 +0900 -+++ jd-2.8.9-150226/src/article/drawareabase.h 2017-02-16 22:23:47.331706453 +0900 -@@ -330,7 +330,7 @@ - - // リアライズしたか - // Gtk::Widget::is_realized() はうまく動作しない -- const bool is_drawarea_realized(){ return m_window; } -+ const bool is_drawarea_realized(){ return static_cast(m_window); } - - // 文字色のID( colorid.h にある ID を指定) - const int get_colorid_text() const{ return m_colorid_text; } diff --git a/jd-2.8.9-xcrypt.patch b/jd-2.8.9-xcrypt.patch deleted file mode 100644 index 85aeb06..0000000 --- a/jd-2.8.9-xcrypt.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- jd-2.8.9-150226/src/jdlib/misctrip.cpp.xcrypt 2009-06-25 21:21:08.000000000 +0900 -+++ jd-2.8.9-150226/src/jdlib/misctrip.cpp 2018-02-15 16:07:32.197448696 +0900 -@@ -21,9 +21,7 @@ - #include - #endif - --#ifdef _WIN32 - #include --#endif - - - /*--------------------------------------------------------------------*/ diff --git a/jd-rev3850-segv-with-long-URL.patch b/jd-rev3850-segv-with-long-URL.patch deleted file mode 100644 index 18d7a56..0000000 --- a/jd-rev3850-segv-with-long-URL.patch +++ /dev/null @@ -1,68 +0,0 @@ -Index: src/dbtree/nodetreebase.cpp -=================================================================== ---- src/dbtree/nodetreebase.cpp (revision 3849) -+++ src/dbtree/nodetreebase.cpp (revision 3850) -@@ -2010,7 +2010,7 @@ - // アンカーのチェック - int n_in = 0; - int n_out = 0; -- char tmpstr[ LNG_LINK ], tmplink[ LNG_LINK ]; -+ char tmpstr[ LNG_LINK +16 ], tmplink[ LNG_LINK +16 ]; - int lng_str = 0, lng_link = strlen( PROTO_ANCHORE ); - ANCINFO ancinfo[ MAX_ANCINFO ]; - int lng_anc = 0; -@@ -2504,7 +2504,7 @@ - } - } - -- if( n_in + offset > lng_link ) return MISC::SCHEME_NONE; -+ if( n_in + offset >= lng_link ) return MISC::SCHEME_NONE; - - if( ! url_encode ){ - memcpy( str_link + offset, str_in, n_in ); -@@ -2513,19 +2513,32 @@ - else{ // URLエンコードが必要な場合 - - char *pos = str_link + offset; -+ int tmp_out = offset; - for( int i = 0; i < n_in; ++i, ++pos ){ - - if( str_in[ i ] == '^' ){ // '^' -> %5e - *( pos++ ) = '%'; - *( pos++ ) = '5'; - *pos = 'e'; -+ tmp_out += 3; - } - else if( str_in[ i ] == '|' ){ // '|' -> %7c - *( pos++ ) = '%'; - *( pos++ ) = '7'; - *pos = 'c'; -+ tmp_out += 3; - } -- else *pos = str_in[ i ]; -+ else{ -+ *pos = str_in[ i ]; -+ ++tmp_out; -+ } -+ -+ if( tmp_out >= lng_link ){ -+#ifdef _DEBUG -+ std::cout << " tmp_out = " << tmp_out << " lng_link = " << lng_link << " n_in + offset = " << n_in + offset << std::endl; -+#endif -+ return MISC::SCHEME_NONE; -+ } - } - *pos = '\0'; - } -@@ -2537,6 +2550,11 @@ - str_link[ 2 ] = 't'; - } - -+#ifdef _DEBUG -+ std::cout << str_link << std::endl -+ << "len = " << strlen( str_link ) << " lng_link = " << lng_link << " n_in + offset = " << n_in + offset << std::endl; -+#endif -+ - return linktype; - } -