From 7bfe2665bca28f68e7ed60f2902b282c6fe1c60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 16 Apr 2024 01:45:56 +0200 Subject: openslp: Remove remaining 'register' instruction. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../openslp-dfsg-1.2.1/debian/changelog | 6 + .../patches/remove-register-instruction.diff | 360 +++++++++++++++++++++ .../openslp-dfsg-1.2.1/debian/patches/series | 1 + 3 files changed, 367 insertions(+) create mode 100644 debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/patches/remove-register-instruction.diff diff --git a/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/changelog b/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/changelog index 0f814451..2443990c 100644 --- a/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/changelog +++ b/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/changelog @@ -1,3 +1,9 @@ +openslp-dfsg (1.2.1-11debian13.0.0+2~a) trixie; urgency=high + + * Remove remaining 'register' instruction. + + -- Slávek Banko Tue, 16 Apr 2024 01:43:17 +0200 + openslp-dfsg (1.2.1-11debian11.0.0+1~a) bullseye; urgency=high * CVE-2017-17833 diff --git a/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/patches/remove-register-instruction.diff b/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/patches/remove-register-instruction.diff new file mode 100644 index 00000000..e1112754 --- /dev/null +++ b/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/patches/remove-register-instruction.diff @@ -0,0 +1,360 @@ +Index: b/common/slp_attr_l.c +=================================================================== +--- a/common/slp_attr_l.c ++++ b/common/slp_attr_l.c +@@ -680,9 +680,9 @@ + + YY_DECL + { +- register yy_state_type yy_current_state; +- register char *yy_cp, *yy_bp; +- register int yy_act; ++ yy_state_type yy_current_state; ++ char *yy_cp, *yy_bp; ++ int yy_act; + + #line 123 "slp_attr_l.l" + +@@ -729,7 +729,7 @@ + yy_match: + do + { +- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; ++ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + yy_last_accepting_state = yy_current_state; +@@ -1057,9 +1057,9 @@ + + static int yy_get_next_buffer() + { +- register char *dest = yy_current_buffer->yy_ch_buf; +- register char *source = yytext_ptr; +- register int number_to_move, i; ++ char *dest = yy_current_buffer->yy_ch_buf; ++ char *source = yytext_ptr; ++ int number_to_move, i; + int ret_val; + + if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) +@@ -1189,14 +1189,14 @@ + + static yy_state_type yy_get_previous_state() + { +- register yy_state_type yy_current_state; +- register char *yy_cp; ++ yy_state_type yy_current_state; ++ char *yy_cp; + + yy_current_state = yy_start; + + for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + { +- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); ++ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + yy_last_accepting_state = yy_current_state; +@@ -1228,10 +1228,10 @@ + yy_state_type yy_current_state; + #endif + { +- register int yy_is_jam; +- register char *yy_cp = yy_c_buf_p; ++ int yy_is_jam; ++ char *yy_cp = yy_c_buf_p; + +- register YY_CHAR yy_c = 1; ++ YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + yy_last_accepting_state = yy_current_state; +@@ -1252,14 +1252,14 @@ + + #ifndef YY_NO_UNPUT + #ifdef YY_USE_PROTOS +-static void yyunput( int c, register char *yy_bp ) ++static void yyunput( int c, char *yy_bp ) + #else + static void yyunput( c, yy_bp ) + int c; +-register char *yy_bp; ++char *yy_bp; + #endif + { +- register char *yy_cp = yy_c_buf_p; ++ char *yy_cp = yy_c_buf_p; + + /* undo effects of setting up yytext */ + *yy_cp = yy_hold_char; +@@ -1267,10 +1267,10 @@ + if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ +- register int number_to_move = yy_n_chars + 2; +- register char *dest = &yy_current_buffer->yy_ch_buf[ ++ int number_to_move = yy_n_chars + 2; ++ char *dest = &yy_current_buffer->yy_ch_buf[ + yy_current_buffer->yy_buf_size + 2]; +- register char *source = ++ char *source = + &yy_current_buffer->yy_ch_buf[number_to_move]; + + while ( source > yy_current_buffer->yy_ch_buf ) +@@ -1731,7 +1731,7 @@ + int n; + #endif + { +- register int i; ++ int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; + } +@@ -1745,7 +1745,7 @@ + yyconst char *s; + #endif + { +- register int n; ++ int n; + for ( n = 0; s[n]; ++n ) + ; + +Index: b/common/slp_attr_y.c +=================================================================== +--- a/common/slp_attr_y.c ++++ b/common/slp_attr_y.c +@@ -248,7 +248,7 @@ + # define YYCOPY(To, From, Count) \ + do \ + { \ +- register YYSIZE_T yyi; \ ++ YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ +@@ -661,7 +661,7 @@ + const char *yystr; + # endif + { +- register const char *yys = yystr; ++ const char *yys = yystr; + + while (*yys++ != '\0') + continue; +@@ -686,8 +686,8 @@ + const char *yysrc; + # endif + { +- register char *yyd = yydest; +- register const char *yys = yysrc; ++ char *yyd = yydest; ++ const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; +@@ -817,8 +817,8 @@ + #endif + { + +- register int yystate; +- register int yyn; ++ int yystate; ++ int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; +@@ -836,12 +836,12 @@ + /* The state stack. */ + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; +- register short *yyssp; ++ short *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; +- register YYSTYPE *yyvsp; ++ YYSTYPE *yyvsp; + + + +Index: b/common/slp_filter_l.c +=================================================================== +--- a/common/slp_filter_l.c ++++ b/common/slp_filter_l.c +@@ -638,9 +638,9 @@ + + YY_DECL + { +- register yy_state_type yy_current_state; +- register char *yy_cp, *yy_bp; +- register int yy_act; ++ yy_state_type yy_current_state; ++ char *yy_cp, *yy_bp; ++ int yy_act; + + #line 97 "slp_filter_l.l" + +@@ -687,7 +687,7 @@ + yy_match: + do + { +- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; ++ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + yy_last_accepting_state = yy_current_state; +@@ -993,9 +993,9 @@ + + static int yy_get_next_buffer() + { +- register char *dest = yy_current_buffer->yy_ch_buf; +- register char *source = yytext_ptr; +- register int number_to_move, i; ++ char *dest = yy_current_buffer->yy_ch_buf; ++ char *source = yytext_ptr; ++ int number_to_move, i; + int ret_val; + + if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) +@@ -1125,14 +1125,14 @@ + + static yy_state_type yy_get_previous_state() + { +- register yy_state_type yy_current_state; +- register char *yy_cp; ++ yy_state_type yy_current_state; ++ char *yy_cp; + + yy_current_state = yy_start; + + for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + { +- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); ++ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + yy_last_accepting_state = yy_current_state; +@@ -1164,10 +1164,10 @@ + yy_state_type yy_current_state; + #endif + { +- register int yy_is_jam; +- register char *yy_cp = yy_c_buf_p; ++ int yy_is_jam; ++ char *yy_cp = yy_c_buf_p; + +- register YY_CHAR yy_c = 1; ++ YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + yy_last_accepting_state = yy_current_state; +@@ -1188,14 +1188,14 @@ + + #ifndef YY_NO_UNPUT + #ifdef YY_USE_PROTOS +-static void yyunput( int c, register char *yy_bp ) ++static void yyunput( int c, char *yy_bp ) + #else + static void yyunput( c, yy_bp ) + int c; +-register char *yy_bp; ++char *yy_bp; + #endif + { +- register char *yy_cp = yy_c_buf_p; ++ char *yy_cp = yy_c_buf_p; + + /* undo effects of setting up yytext */ + *yy_cp = yy_hold_char; +@@ -1203,10 +1203,10 @@ + if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ +- register int number_to_move = yy_n_chars + 2; +- register char *dest = &yy_current_buffer->yy_ch_buf[ ++ int number_to_move = yy_n_chars + 2; ++ char *dest = &yy_current_buffer->yy_ch_buf[ + yy_current_buffer->yy_buf_size + 2]; +- register char *source = ++ char *source = + &yy_current_buffer->yy_ch_buf[number_to_move]; + + while ( source > yy_current_buffer->yy_ch_buf ) +@@ -1667,7 +1667,7 @@ + int n; + #endif + { +- register int i; ++ int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; + } +@@ -1681,7 +1681,7 @@ + yyconst char *s; + #endif + { +- register int n; ++ int n; + for ( n = 0; s[n]; ++n ) + ; + +Index: b/common/slp_filter_y.c +=================================================================== +--- a/common/slp_filter_y.c ++++ b/common/slp_filter_y.c +@@ -262,7 +262,7 @@ + # define YYCOPY(To, From, Count) \ + do \ + { \ +- register YYSIZE_T yyi; \ ++ YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ +@@ -681,7 +681,7 @@ + const char *yystr; + # endif + { +- register const char *yys = yystr; ++ const char *yys = yystr; + + while (*yys++ != '\0') + continue; +@@ -706,8 +706,8 @@ + const char *yysrc; + # endif + { +- register char *yyd = yydest; +- register const char *yys = yysrc; ++ char *yyd = yydest; ++ const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; +@@ -837,8 +837,8 @@ + #endif + { + +- register int yystate; +- register int yyn; ++ int yystate; ++ int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; +@@ -856,12 +856,12 @@ + /* The state stack. */ + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; +- register short *yyssp; ++ short *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; +- register YYSTYPE *yyvsp; ++ YYSTYPE *yyvsp; + + + diff --git a/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/patches/series b/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/patches/series index f5cabd15..cdb19b8e 100644 --- a/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/patches/series +++ b/debian/openslp-dfsg/openslp-dfsg-1.2.1/debian/patches/series @@ -6,3 +6,4 @@ fix-automake-cond-spelling.patch CVE-2012-4428.patch CVE-2015-5177.patch CVE-2017-17833.patch +remove-register-instruction.diff -- cgit v1.2.3