October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit apper for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '14

02 Oct '14

Hello community, here is the log from the commit of package apper for openSUSE:Factory checked in at 2014-10-02 14:13:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apper (Old) and /work/SRC/openSUSE:Factory/.apper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apper" Changes: -------- --- /work/SRC/openSUSE:Factory/apper/apper.changes 2014-09-23 17:16:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apper.new/apper.changes 2014-10-02 14:13:36.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 30 10:13:20 UTC 2014 - tittiatcoke(a)gmail.com + +- Add patch apper-adjust-to-latest-packagekitqt.diff to make the + plasmoid work based on the latest PackageKit Qt bindings. The + patch should be pushed upstream. + +------------------------------------------------------------------- New: ---- apper-adjust-to-latest-packagekitqt.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apper.spec ++++++ --- /var/tmp/diff_new_pack.JBkXdc/_old 2014-10-02 14:13:37.000000000 +0200 +++ /var/tmp/diff_new_pack.JBkXdc/_new 2014-10-02 14:13:37.000000000 +0200 @@ -30,6 +30,8 @@ # setting proxy requires polkit permissions - for very little gain Patch2: apper-no-user-proxy.diff Patch3: no-popup-for-background-actions.patch +# PATCH-FIX-UPSTREAM Update Apper to reflect the latest PackageKit-Qt. +Patch4: apper-adjust-to-latest-packagekitqt.diff Url: http://kde-apps.org/content/show.php/Apper?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: PackageKit-Qt-devel >= 0.9.0 @@ -52,6 +54,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %cmake_kde4 -d build -- -DSCREENSHOT_PROVIDER=openSUSE ++++++ apper-adjust-to-latest-packagekitqt.diff ++++++ diff -urB apper/declarative-plugins/qmlplugins.cpp apper-new/declarative-plugins/qmlplugins.cpp --- a/declarative-plugins/qmlplugins.cpp 2014-09-29 16:46:32.253737256 +0200 +++ b/declarative-plugins/qmlplugins.cpp 2014-09-29 16:55:43.475756886 +0200 @@ -50,6 +50,25 @@ qmlRegisterType<PackageKit::Transaction>(uri, 0, 1, "Transaction"); qmlRegisterUncreatableType<PackageKit::Daemon>(uri, 0, 1, "Daemon", "Global"); qRegisterMetaType<PkTransaction::ExitStatus>("PkTransaction::ExitStatus"); + qRegisterMetaType<PackageKit::Daemon::Network>("PackageKit::Daemon::Network"); + qRegisterMetaType<PackageKit::Daemon::Authorize>("PackageKit::Daemon::Authorize"); + qRegisterMetaType<PackageKit::Transaction::InternalError>("PackageKit::Transaction::InternalError"); + qRegisterMetaType<PackageKit::Transaction::Role>("PackageKit::Transaction::Role"); + qRegisterMetaType<PackageKit::Transaction::Error>("PackageKit::Transaction::Error"); + qRegisterMetaType<PackageKit::Transaction::Exit>("PackageKit::Transaction::Exit"); + qRegisterMetaType<PackageKit::Transaction::Filter>("PackageKit::Transaction::Filter"); + qRegisterMetaType<PackageKit::Transaction::Message>("PackageKit::Transaction::Message"); + qRegisterMetaType<PackageKit::Transaction::Status>("PackageKit::Transaction::Status"); + qRegisterMetaType<PackageKit::Transaction::MediaType>("PackageKit::Transaction::MediaType"); + qRegisterMetaType<PackageKit::Transaction::DistroUpgrade>("PackageKit::Transaction::DistroUpgrade"); + qRegisterMetaType<PackageKit::Transaction::TransactionFlag>("PackageKit::Transaction::TransactionFlag"); + qRegisterMetaType<PackageKit::Transaction::TransactionFlags>("PackageKit::Transaction::TransactionFlags"); + qRegisterMetaType<PackageKit::Transaction::Restart>("PackageKit::Transaction::Restart"); + qRegisterMetaType<PackageKit::Transaction::UpdateState>("PackageKit::Transaction::UpdateState"); + qRegisterMetaType<PackageKit::Transaction::Group>("PackageKit::Transaction::Group"); + qRegisterMetaType<PackageKit::Transaction::Info>("PackageKit::Transaction::Info"); + qRegisterMetaType<PackageKit::Transaction::SigType>("PackageKit::Transaction::SigType"); + } void QmlPlugins::initializeEngine(QDeclarativeEngine *engine, const char *uri) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '14

02 Oct '14

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2014-10-02 14:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2014-09-23 13:45:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2014-10-02 14:13:33.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Sep 29 14:53:45 UTC 2014 - lbsousajr(a)gmail.com + +- Backport upstream patches to enable Xephyr window placement + via new "-output" option or new "-screen WxH+X+Y" syntax. + * U_kdrive_extend_screen_option_syntax.patch + * U_ephyr_enable_screen_window_placement.patch + * U_ephyr_add_output_option_support.patch + +------------------------------------------------------------------- New: ---- U_ephyr_add_output_option_support.patch U_ephyr_enable_screen_window_placement.patch U_kdrive_extend_screen_option_syntax.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.sQvgUR/_old 2014-10-02 14:13:35.000000000 +0200 +++ /var/tmp/diff_new_pack.sQvgUR/_new 2014-10-02 14:13:35.000000000 +0200 @@ -164,6 +164,10 @@ Patch1211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch Patch1222: b_sync-fix.patch +Patch200: U_kdrive_extend_screen_option_syntax.patch +Patch201: U_ephyr_enable_screen_window_placement.patch +Patch202: U_ephyr_add_output_option_support.patch + %description This package contains the X.Org Server. @@ -248,6 +252,10 @@ ### patch222 might not be applicable anymore #%patch1222 -p1 +%patch200 -p1 +%patch201 -p1 +%patch202 -p1 + %build autoreconf -fi %configure CFLAGS="%{optflags} -fno-strict-aliasing" \ ++++++ U_ephyr_add_output_option_support.patch ++++++ >From 3a51418b2db353519a1779cf3cebbcc9afba2520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= <laerciosousa(a)sme-mogidascruzes.sp.gov.br> Date: Mon, 18 Aug 2014 08:45:43 -0300 Subject: ephyr: set screen size & origin from host X server output's CRTC geometry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If a given output is passed via new -output option, Xephyr will query host X server for its info. If the following conditions are met: a. RandR extension is enabled in host X server; b. supported RandR version in host X server is 1.2 or newer; c. the given output name is valid; d. the given output is connected; then Xephyr will get output's CRTC geometry and use it to set its own screen size and origin. It's just like starting Xephyr in fullscreen mode, but restricted to the given output's CRTC geometry (fake "Zaphod mode"). This is the main feature needed for Xephyr-based single-card multiseat setups where we don't have separate screens to start Xephyr in fullscreen mode safely. Signed-off-by: Laércio de Sousa <laerciosousa(a)sme-mogidascruzes.sp.gov.br> Reviewed-by: Keith Packard <keithp(a)keithp.com> Signed-off-by: Keith Packard <keithp(a)keithp.com> diff --git a/configure.ac b/configure.ac index f3d9654..cba7d24 100644 --- a/configure.ac +++ b/configure.ac @@ -2364,7 +2364,7 @@ if test "$KDRIVE" = yes; then AC_DEFINE(KDRIVE_MOUSE, 1, [Enable KDrive mouse driver]) fi - XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-aux xcb-image xcb-icccm xcb-shm xcb-keysyms" + XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-aux xcb-image xcb-icccm xcb-shm xcb-keysyms xcb-randr" if test "x$XV" = xyes; then XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv" fi diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index b039c68..85d4193 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -111,13 +111,16 @@ Bool ephyrScreenInitialize(KdScreenInfo *screen) { EphyrScrPriv *scrpriv = screen->driver; + int x = 0, y = 0; int width = 640, height = 480; CARD32 redMask, greenMask, blueMask; - if (hostx_want_screen_size(screen, &width, &height) + if (hostx_want_screen_geometry(screen, &width, &height, &x, &y) || !screen->width || !screen->height) { screen->width = width; screen->height = height; + screen->x = x; + screen->y = y; } if (EphyrWantGrayScale) diff --git a/hw/kdrive/ephyr/ephyr.h b/hw/kdrive/ephyr/ephyr.h index 5c4936b..4e753f1 100644 --- a/hw/kdrive/ephyr/ephyr.h +++ b/hw/kdrive/ephyr/ephyr.h @@ -74,8 +74,10 @@ typedef struct _ephyrScrPriv { xcb_window_t peer_win; /* Used for GL; should be at most one */ xcb_image_t *ximg; Bool win_explicit_position; + int win_x, win_y; int win_width, win_height; int server_depth; + const char *output; /* Set via -output option */ unsigned char *fb_data; /* only used when host bpp != server bpp */ xcb_shm_segment_info_t shminfo; diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index e04c8dc..38acc52 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -47,6 +47,8 @@ extern KdPointerDriver LinuxEvdevMouseDriver; extern KdKeyboardDriver LinuxEvdevKeyboardDriver; #endif +void processScreenOrOutputArg(const char *screen_size, const char *output, char *parent_id); +void processOutputArg(const char *output, char *parent_id); void processScreenArg(const char *screen_size, char *parent_id); void @@ -134,6 +136,7 @@ ddxUseMsg(void) ErrorF("-parent <XID> Use existing window as Xephyr root win\n"); ErrorF("-sw-cursor Render cursors in software in Xephyr\n"); ErrorF("-fullscreen Attempt to run Xephyr fullscreen\n"); + ErrorF("-output <NAME> Attempt to run Xephyr fullscreen (restricted to given output geometry)\n"); ErrorF("-grayscale Simulate 8bit grayscale\n"); ErrorF("-resizeable Make Xephyr windows resizeable\n"); #ifdef GLAMOR @@ -154,7 +157,7 @@ ddxUseMsg(void) } void -processScreenArg(const char *screen_size, char *parent_id) +processScreenOrOutputArg(const char *screen_size, const char *output, char *parent_id) { KdCardInfo *card; @@ -178,13 +181,25 @@ processScreenArg(const char *screen_size, char *parent_id) use_geometry = (strchr(screen_size, '+') != NULL); EPHYR_DBG("screen number:%d\n", screen->mynum); - hostx_add_screen(screen, p_id, screen->mynum, use_geometry); + hostx_add_screen(screen, p_id, screen->mynum, use_geometry, output); } else { ErrorF("No matching card found!\n"); } } +void +processScreenArg(const char *screen_size, char *parent_id) +{ + processScreenOrOutputArg(screen_size, NULL, parent_id); +} + +void +processOutputArg(const char *output, char *parent_id) +{ + processScreenOrOutputArg("100x100+0+0", output, parent_id); +} + int ddxProcessArgument(int argc, char **argv, int i) { @@ -226,6 +241,15 @@ ddxProcessArgument(int argc, char **argv, int i) UseMsg(); exit(1); } + else if (!strcmp(argv[i], "-output")) { + if (i + 1 < argc) { + processOutputArg(argv[i + 1], NULL); + return 2; + } + + UseMsg(); + exit(1); + } else if (!strcmp(argv[i], "-sw-cursor")) { hostx_use_sw_cursor(); return 1; diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 92a8ada..2161ad5 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -51,6 +51,7 @@ #include <xcb/xcb_image.h> #include <xcb/shape.h> #include <xcb/xcb_keysyms.h> +#include <xcb/randr.h> #ifdef XF86DRI #include <xcb/xf86dri.h> #include <xcb/glx.h> @@ -104,12 +105,15 @@ static void #define host_depth_matches_server(_vars) (HostX.depth == (_vars)->server_depth) int -hostx_want_screen_size(KdScreenInfo *screen, int *width, int *height) +hostx_want_screen_geometry(KdScreenInfo *screen, int *width, int *height, int *x, int *y) { EphyrScrPriv *scrpriv = screen->driver; if (scrpriv && (scrpriv->win_pre_existing != None || + scrpriv->output != NULL || HostX.use_fullscreen == TRUE)) { + *x = scrpriv->win_x; + *y = scrpriv->win_y; *width = scrpriv->win_width; *height = scrpriv->win_height; return 1; @@ -119,7 +123,7 @@ hostx_want_screen_size(KdScreenInfo *screen, int *width, int *height) } void -hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, int screen_num, Bool use_geometry) +hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, int screen_num, Bool use_geometry, const char *output) { EphyrScrPriv *scrpriv = screen->driver; int index = HostX.n_screens; @@ -132,6 +136,7 @@ hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, int screen_num, Boo scrpriv->screen = screen; scrpriv->win_pre_existing = win_id; scrpriv->win_explicit_position = use_geometry; + scrpriv->output = output; } void @@ -211,6 +216,119 @@ hostx_want_preexisting_window(KdScreenInfo *screen) } void +hostx_get_output_geometry(const char *output, + int *x, int *y, + int *width, int *height) +{ + int i, name_len = 0, output_found = FALSE; + char *name = NULL; + xcb_generic_error_t *error; + xcb_randr_query_version_cookie_t version_c; + xcb_randr_query_version_reply_t *version_r; + xcb_randr_get_screen_resources_cookie_t screen_resources_c; + xcb_randr_get_screen_resources_reply_t *screen_resources_r; + xcb_randr_output_t *randr_outputs; + xcb_randr_get_output_info_cookie_t output_info_c; + xcb_randr_get_output_info_reply_t *output_info_r; + xcb_randr_get_crtc_info_cookie_t crtc_info_c; + xcb_randr_get_crtc_info_reply_t *crtc_info_r; + + /* First of all, check for extension */ + if (!xcb_get_extension_data(HostX.conn, &xcb_randr_id)->present) + { + fprintf(stderr, "\nHost X server does not support RANDR extension (or it's disabled).\n"); + exit(1); + } + + /* Check RandR version */ + version_c = xcb_randr_query_version(HostX.conn, 1, 2); + version_r = xcb_randr_query_version_reply(HostX.conn, + version_c, + &error); + + if (error != NULL || version_r == NULL) + { + fprintf(stderr, "\nFailed to get RandR version supported by host X server.\n"); + exit(1); + } + else if (version_r->major_version < 1 || version_r->minor_version < 2) + { + free(version_r); + fprintf(stderr, "\nHost X server doesn't support RandR 1.2, needed for -output usage.\n"); + exit(1); + } + + free(version_r); + + /* Get list of outputs from screen resources */ + screen_resources_c = xcb_randr_get_screen_resources(HostX.conn, + HostX.winroot); + screen_resources_r = xcb_randr_get_screen_resources_reply(HostX.conn, + screen_resources_c, + NULL); + randr_outputs = xcb_randr_get_screen_resources_outputs(screen_resources_r); + + for (i = 0; !output_found && i < screen_resources_r->num_outputs; i++) + { + /* Get info on the output */ + output_info_c = xcb_randr_get_output_info(HostX.conn, + randr_outputs[i], + XCB_CURRENT_TIME); + output_info_r = xcb_randr_get_output_info_reply(HostX.conn, + output_info_c, + NULL); + + /* Get output name */ + name_len = xcb_randr_get_output_info_name_length(output_info_r); + name = malloc(name_len + 1); + strncpy(name, (char*)xcb_randr_get_output_info_name(output_info_r), name_len); + name[name_len] = '\0'; + + if (!strcmp(name, output)) + { + output_found = TRUE; + + /* Check if output is connected */ + if (output_info_r->crtc == XCB_NONE) + { + free(name); + free(output_info_r); + free(screen_resources_r); + fprintf(stderr, "\nOutput %s is currently disabled (or not connected).\n", output); + exit(1); + } + + /* Get CRTC from output info */ + crtc_info_c = xcb_randr_get_crtc_info(HostX.conn, + output_info_r->crtc, + XCB_CURRENT_TIME); + crtc_info_r = xcb_randr_get_crtc_info_reply(HostX.conn, + crtc_info_c, + NULL); + + /* Get CRTC geometry */ + *x = crtc_info_r->x; + *y = crtc_info_r->y; + *width = crtc_info_r->width; + *height = crtc_info_r->height; + + free(crtc_info_r); + } + + free(name); + free(output_info_r); + } + + free(screen_resources_r); + + if (!output_found) + { + fprintf(stderr, "\nOutput %s not available in host X server.\n", output); + exit(1); + } +} + +void hostx_use_fullscreen(void) { HostX.use_fullscreen = TRUE; @@ -359,6 +477,8 @@ hostx_init(void) scrpriv->win = xcb_generate_id(HostX.conn); scrpriv->server_depth = HostX.depth; scrpriv->ximg = NULL; + scrpriv->win_x = 0; + scrpriv->win_y = 0; if (scrpriv->win_pre_existing != XCB_WINDOW_NONE) { xcb_get_geometry_reply_t *prewin_geom; @@ -416,6 +536,17 @@ hostx_init(void) hostx_set_fullscreen_hint(); } + else if (scrpriv->output) { + hostx_get_output_geometry(scrpriv->output, + &scrpriv->win_x, + &scrpriv->win_y, + &scrpriv->win_width, + &scrpriv->win_height); + + HostX.use_fullscreen = TRUE; + hostx_set_fullscreen_hint(); + } + tmpstr = getenv("RESOURCE_NAME"); if (tmpstr && (!ephyrResNameFromCmd)) @@ -759,6 +890,8 @@ hostx_screen_init(KdScreenInfo *screen, scrpriv->win_width = width; scrpriv->win_height = height; + scrpriv->win_x = x; + scrpriv->win_y = y; #ifdef GLAMOR if (ephyr_glamor) { diff --git a/hw/kdrive/ephyr/hostx.h b/hw/kdrive/ephyr/hostx.h index c554ca3..80894c8 100644 --- a/hw/kdrive/ephyr/hostx.h +++ b/hw/kdrive/ephyr/hostx.h @@ -74,7 +74,7 @@ typedef struct { } EphyrRect; int -hostx_want_screen_size(KdScreenInfo *screen, int *width, int *height); +hostx_want_screen_geometry(KdScreenInfo *screen, int *width, int *height, int *x, int *y); int hostx_want_host_cursor(void); @@ -83,6 +83,11 @@ void hostx_use_sw_cursor(void); void + hostx_get_output_geometry(const char *output, + int *x, int *y, + int *width, int *height); + +void hostx_use_fullscreen(void); int @@ -107,7 +112,7 @@ int hostx_init(void); void -hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, int screen_num, Bool use_geometry); +hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, int screen_num, Bool use_geometry, const char *output); void hostx_set_display_name(char *name); -- cgit v0.10.2 ++++++ U_ephyr_enable_screen_window_placement.patch ++++++ >From 84b02469ef97e6f85d074d220a517d752180045f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= <laerciosousa(a)sme-mogidascruzes.sp.gov.br> Date: Mon, 18 Aug 2014 08:45:42 -0300 Subject: ephyr: enable screen window placement following kdrive -screen option extended syntax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this patch, one can launch Xephyr with option "-screen WxH+X+Y" to place its window origin at (X,Y). This patch relies on a previous one that extends kdrive -screen option syntax to parse +X+Y substring as expected. If +X+Y is not passed in -screen argument string, let the WM place the window for us, as before. Signed-off-by: Laércio de Sousa <laerciosousa(a)sme-mogidascruzes.sp.gov.br> Reviewed-by: Keith Packard <keithp(a)keithp.com> Signed-off-by: Keith Packard <keithp(a)keithp.com> diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index d57e9f3..b039c68 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -242,7 +242,8 @@ ephyrMapFramebuffer(KdScreenInfo * screen) buffer_height = ephyrBufferHeight(screen); priv->base = - hostx_screen_init(screen, screen->width, screen->height, buffer_height, + hostx_screen_init(screen, screen->x, screen->y, + screen->width, screen->height, buffer_height, &priv->bytes_per_line, &screen->fb.bitsPerPixel); if ((scrpriv->randr & RR_Rotate_0) && !(scrpriv->randr & RR_Reflect_All)) { diff --git a/hw/kdrive/ephyr/ephyr.h b/hw/kdrive/ephyr/ephyr.h index dfd93c9..5c4936b 100644 --- a/hw/kdrive/ephyr/ephyr.h +++ b/hw/kdrive/ephyr/ephyr.h @@ -73,6 +73,7 @@ typedef struct _ephyrScrPriv { xcb_window_t win_pre_existing; /* Set via -parent option like xnest */ xcb_window_t peer_win; /* Used for GL; should be at most one */ xcb_image_t *ximg; + Bool win_explicit_position; int win_width, win_height; int server_depth; unsigned char *fb_data; /* only used when host bpp != server bpp */ diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index fc00010..e04c8dc 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -164,6 +164,7 @@ processScreenArg(const char *screen_size, char *parent_id) if (card) { KdScreenInfo *screen; unsigned long p_id = 0; + Bool use_geometry; screen = KdScreenInfoAdd(card); KdParseScreen(screen, screen_size); @@ -174,8 +175,10 @@ processScreenArg(const char *screen_size, char *parent_id) if (parent_id) { p_id = strtol(parent_id, NULL, 0); } + + use_geometry = (strchr(screen_size, '+') != NULL); EPHYR_DBG("screen number:%d\n", screen->mynum); - hostx_add_screen(screen, p_id, screen->mynum); + hostx_add_screen(screen, p_id, screen->mynum, use_geometry); } else { ErrorF("No matching card found!\n"); diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 1c75974..92a8ada 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -119,7 +119,7 @@ hostx_want_screen_size(KdScreenInfo *screen, int *width, int *height) } void -hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, int screen_num) +hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, int screen_num, Bool use_geometry) { EphyrScrPriv *scrpriv = screen->driver; int index = HostX.n_screens; @@ -131,6 +131,7 @@ hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, int screen_num) scrpriv->screen = screen; scrpriv->win_pre_existing = win_id; + scrpriv->win_explicit_position = use_geometry; } void @@ -637,6 +638,7 @@ hostx_set_cmap_entry(unsigned char idx, */ void * hostx_screen_init(KdScreenInfo *screen, + int x, int y, int width, int height, int buffer_height, int *bytes_per_line, int *bits_per_pixel) { @@ -648,8 +650,8 @@ hostx_screen_init(KdScreenInfo *screen, exit(1); } - EPHYR_DBG("host_screen=%p wxh=%dx%d, buffer_height=%d", - host_screen, width, height, buffer_height); + EPHYR_DBG("host_screen=%p x=%d, y=%d, wxh=%dx%d, buffer_height=%d", + host_screen, x, y, width, height, buffer_height); if (scrpriv->ximg != NULL) { /* Free up the image data if previously used @@ -740,6 +742,19 @@ hostx_screen_init(KdScreenInfo *screen, xcb_map_window(HostX.conn, scrpriv->win); + /* Set explicit window position if it was informed in + * -screen option (WxH+X or WxH+X+Y). Otherwise, accept the + * position set by WM. + * The trick here is putting this code after xcb_map_window() call, + * so these values won't be overriden by WM. */ + if (scrpriv->win_explicit_position) + { + uint32_t mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y; + uint32_t values[2] = {x, y}; + xcb_configure_window(HostX.conn, scrpriv->win, mask, values); + } + + xcb_aux_sync(HostX.conn); scrpriv->win_width = width; diff --git a/hw/kdrive/ephyr/hostx.h b/hw/kdrive/ephyr/hostx.h index e83323a..c554ca3 100644 --- a/hw/kdrive/ephyr/hostx.h +++ b/hw/kdrive/ephyr/hostx.h @@ -107,7 +107,7 @@ int hostx_init(void); void -hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, int screen_num); +hostx_add_screen(KdScreenInfo *screen, unsigned long win_id, int screen_num, Bool use_geometry); void hostx_set_display_name(char *name); @@ -136,6 +136,7 @@ hostx_set_cmap_entry(unsigned char idx, unsigned char r, unsigned char g, unsigned char b); void *hostx_screen_init(KdScreenInfo *screen, + int x, int y, int width, int height, int buffer_height, int *bytes_per_line, int *bits_per_pixel); -- cgit v0.10.2 ++++++ U_kdrive_extend_screen_option_syntax.patch ++++++ >From 376f4de8ae927748417046390c24afbda24b0583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= <laerciosousa(a)sme-mogidascruzes.sp.gov.br> Date: Mon, 18 Aug 2014 08:45:41 -0300 Subject: kdrive: add support to +X+Y syntax in -screen option parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch enhances current -screen option parsing for kdrive-based applications. It can parse strings like <WIDTH>x<HEIGHT>+<XOFFSET>+<YOFFSET>, storing X and Y offsets in KdScreenInfo instances. For negative values, this patch supports +-X+-Y (not -X-Y) syntax. It will allow e.g. proper Xephyr window placement for multiseat purposes. Signed-off-by: Laércio de Sousa <laerciosousa(a)sme-mogidascruzes.sp.gov.br> Reviewed-by: Keith Packard <keithp(a)keithp.com> Signed-off-by: Keith Packard <keithp(a)keithp.com> diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index b5b91c0..5dbff3f 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -300,6 +300,8 @@ KdParseScreen(KdScreenInfo * screen, const char *arg) screen->softCursor = kdSoftCursor; screen->origin = kdOrigin; screen->randr = RR_Rotate_0; + screen->x = 0; + screen->y = 0; screen->width = 0; screen->height = 0; screen->width_mm = 0; @@ -313,7 +315,7 @@ KdParseScreen(KdScreenInfo * screen, const char *arg) return; for (i = 0; i < 2; i++) { - arg = KdParseFindNext(arg, "x/@XY", save, &delim); + arg = KdParseFindNext(arg, "x/+@XY", save, &delim); if (!save[0]) return; @@ -321,7 +323,7 @@ KdParseScreen(KdScreenInfo * screen, const char *arg) mm = 0; if (delim == '/') { - arg = KdParseFindNext(arg, "x@XY", save, &delim); + arg = KdParseFindNext(arg, "x+@XY", save, &delim); if (!save[0]) return; mm = atoi(save); @@ -335,7 +337,8 @@ KdParseScreen(KdScreenInfo * screen, const char *arg) screen->height = pixels; screen->height_mm = mm; } - if (delim != 'x' && delim != '@' && delim != 'X' && delim != 'Y' && + if (delim != 'x' && delim != '+' && delim != '@' && + delim != 'X' && delim != 'Y' && (delim != '\0' || i == 0)) return; } @@ -346,6 +349,18 @@ KdParseScreen(KdScreenInfo * screen, const char *arg) kdSoftCursor = FALSE; kdSubpixelOrder = SubPixelUnknown; + if (delim == '+') { + arg = KdParseFindNext(arg, "+@xXY", save, &delim); + if (save[0]) + screen->x = atoi(save); + } + + if (delim == '+') { + arg = KdParseFindNext(arg, "@xXY", save, &delim); + if (save[0]) + screen->y = atoi(save); + } + if (delim == '@') { arg = KdParseFindNext(arg, "xXY", save, &delim); if (save[0]) { @@ -425,7 +440,7 @@ KdUseMsg(void) { ErrorF("\nTinyX Device Dependent Usage:\n"); ErrorF - ("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][@ROTATION][X][Y][xDEPTH/BPP[xFREQ]] Specify screen characteristics\n"); + ("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][+[-]XOFFSET][+[-]YOFFSET][@ROTATION][X][Y][xDEPTH/BPP[xFREQ]] Specify screen characteristics\n"); ErrorF ("-rgba rgb/bgr/vrgb/vbgr/none Specify subpixel ordering for LCD panels\n"); ErrorF diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index 08b1681..066a134 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -89,6 +89,8 @@ typedef struct _KdScreenInfo { ScreenPtr pScreen; void *driver; Rotation randr; /* rotation and reflection */ + int x; + int y; int width; int height; int rate; -- cgit v0.10.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_7_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '14

02 Oct '14

Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2014-10-02 14:13:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes 2014-09-24 13:09:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes 2014-10-02 14:13:29.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Sep 29 08:31:47 UTC 2014 - fstrba(a)suse.com + +- Do not waste time building javadoc when building bootstrap +- Ignore ant's java-devel require - we already have + java-bootstrap-devel + +------------------------------------------------------------------- +Mon Sep 29 06:40:39 UTC 2014 - fstrba(a)suse.com + +- Reformat the spec files with newer version of spec-cleaner +- Use more generic requires and provides: + * java-bootstrap and + * java-bootstrap-devel + - Allows us to use the same boostrap packages for building of + java-1_8_0-openjdk + +------------------------------------------------------------------- java-1_7_0-openjdk.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.SAV2TA/_old 2014-10-02 14:13:32.000000000 +0200 +++ /var/tmp/diff_new_pack.SAV2TA/_new 2014-10-02 14:13:32.000000000 +0200 @@ -116,7 +116,17 @@ %global with_default_hotspot_tarball 0 %endif %endif - +%if %{with bootstrap} +%define _unpackaged_files_terminate_build 0 +BuildRequires: ecj-bootstrap +BuildRequires: java-1_5_0-gcj-compat-devel +Conflicts: java-1_7_0-openjdk +%else +BuildRequires: java-bootstrap >= 1.7.0 +BuildRequires: java-bootstrap-devel >= 1.7.0 +#!BuildIgnore: %{name} %{name}-devel %{name}-headless java java-devel +BuildRequires: ecj +%endif Name: java-1_7_0-openjdk-bootstrap Version: %{javaver}.%{buildver} Release: 0 @@ -223,6 +233,7 @@ #was bnc#634793 Requires: mozilla-nss Requires(pre): update-alternatives +BuildRoot: %{_tmppath}/%{name}-%{version}-build # Standard JPackage base provides. %if ! %{with bootstrap} Provides: java = %{javaver} @@ -230,12 +241,6 @@ Provides: java-%{javaver}-openjdk = %{version}-%{release} Provides: java-openjdk = %{version}-%{release} Provides: jre = %{javaver} -%ifarch %{ix86} ppc -Provides: jre-32 = %{javaver} -%endif -%ifarch x86_64 -Provides: jre-64 = %{javaver} -%endif Provides: jre-%{javaver} = %{version}-%{release} Provides: jre-%{javaver}-openjdk = %{version}-%{release} Provides: jre-openjdk = %{version}-%{release} @@ -264,8 +269,15 @@ Provides: jre1.5.x Provides: jre1.6.x Provides: jre1.7.x +%ifarch %ix86 ppc +Provides: jre-32 = %{javaver} +%endif +%ifarch x86_64 +Provides: jre-64 = %{javaver} +%endif +%else +Provides: java-bootstrap = %{javaver} %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build # Reduce build time from 27 hours to 12 hours by only running test # suites on JIT architectures. %ifarch %{test_arches} @@ -287,17 +299,6 @@ %if 0%{?suse_version} >= 1220 BuildRequires: xprop %endif -%if %{with bootstrap} -BuildRequires: ecj-bootstrap -BuildRequires: java-1_5_0-gcj-compat-devel -Conflicts: java-1_7_0-openjdk -%define _unpackaged_files_terminate_build 0 -%else -BuildRequires: %{name}-bootstrap >= 1.7.0 -BuildRequires: %{name}-bootstrap-devel >= 1.7.0 -#!BuildIgnore: %{name} %{name}-devel %{name}-headless java -BuildRequires: ecj -%endif # Mauve build requirements. %if %{with tests} BuildRequires: ecj @@ -403,6 +404,7 @@ Provides: java-sdk-%{javaver}-openjdk = %{version} Provides: java-sdk-openjdk = %{version} %else +Provides: java-bootstrap-devel = %{javaver} Conflicts: java-1_7_0-openjdk-devel %endif @@ -418,6 +420,8 @@ line. Except for the appletviewer, these tools do not provide a graphical user interface. +%if ! %{with bootstrap} + %package demo Summary: Sources for building demo applications with OpenJDK 7 Group: Development/Languages/Java @@ -466,6 +470,8 @@ Although working pretty fine, there are known issues with accessibility on, so do not rather install this package unless you really need. +%endif + %prep %if 0%{?suse_version} >= 1230 %gpg_verify -f %{SOURCE2002} %{SOURCE2000} @@ -522,6 +528,7 @@ --with-javac=${JAVAC} \ --with-ecj=%{_bindir}/ecj \ --with-ecj-jar=${ECJJAR} \ + --disable-docs \ %else --disable-bootstrap \ %endif @@ -572,6 +579,7 @@ patch -p0 -i %{PATCH106} patch -p0 -i %{PATCH108} patch -p0 -i %{PATCH200} + %if ! %{with zero} patch -p0 -i %{PATCH403} %endif @@ -595,6 +603,7 @@ %endif patch -p1 -i %{PATCH1001} + %if %{with_default_hotspot_tarball} patch -p1 -i %{PATCH10011} %endif @@ -606,6 +615,7 @@ if [ -f %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts ]; then rm %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts fi + %if 0%{?suse_version} < 1130 # ========== a default keystore ========== # a cacerts generation - 11.3+ use java-ca-certificates package @@ -641,7 +651,6 @@ echo "sun.zoneinfo.dir=%{_datadir}/javazi" >> $JAVA_HOME/jre/lib/tz.properties %if %{with tests} - %check # Run jtreg test suite. export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image @@ -783,10 +792,14 @@ popd +%if ! %{with bootstrap} + # Install Javadoc documentation. install -d -m 755 %{buildroot}%{_javadocdir} cp -a %{buildoutputdir}/docs %{buildroot}%{_javadocdir}/%{sdklnk} +%endif + # Install icons and menu entries. for s in 16 24 32 48 ; do install -D -p -m 644 \ @@ -885,7 +898,6 @@ fi %if 0%{?suse_version} >= 1130 - %posttrans headless # bnc#781690#c11: don't trust user defined JAVA_HOME and use the current VM # XXX: this might conflict between various versions of openjdk @@ -1032,6 +1044,8 @@ update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} fi +%if ! %{with bootstrap} + %post javadoc update-alternatives \ --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{sdklnk}/api \ @@ -1052,6 +1066,8 @@ ln -sf %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar fi +%endif + %files %defattr(0644,root,root,0755) %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall} @@ -1101,11 +1117,13 @@ %exclude %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so #belongs to full package %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so + %if %{with_pulseaudio} %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libicedtea-sound.so %exclude %{_jvmdir}/%{sdkdir}/jre/lib/pulseaudio.properties %endif %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so + %ifarch %ix86 %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjsig.so @@ -1119,6 +1137,7 @@ #belongs to full package %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so %config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg + %if ! %{with zero} %ifnarch ppc64 ppc64le %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa @@ -1224,6 +1243,7 @@ %{_mandir}/man1/xjc-%{sdklnk}.1* %if ! %{with bootstrap} + %files demo %defattr(0644,root,root,0755) %{_jvmdir}/%{sdkdir}/demo ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.SAV2TA/_old 2014-10-02 14:13:32.000000000 +0200 +++ /var/tmp/diff_new_pack.SAV2TA/_new 2014-10-02 14:13:32.000000000 +0200 @@ -116,7 +116,17 @@ %global with_default_hotspot_tarball 0 %endif %endif - +%if %{with bootstrap} +%define _unpackaged_files_terminate_build 0 +BuildRequires: ecj-bootstrap +BuildRequires: java-1_5_0-gcj-compat-devel +Conflicts: java-1_7_0-openjdk +%else +BuildRequires: java-bootstrap >= 1.7.0 +BuildRequires: java-bootstrap-devel >= 1.7.0 +#!BuildIgnore: %{name} %{name}-devel %{name}-headless java java-devel +BuildRequires: ecj +%endif Name: java-1_7_0-openjdk Version: %{javaver}.%{buildver} Release: 0 @@ -223,6 +233,7 @@ #was bnc#634793 Requires: mozilla-nss Requires(pre): update-alternatives +BuildRoot: %{_tmppath}/%{name}-%{version}-build # Standard JPackage base provides. %if ! %{with bootstrap} Provides: java = %{javaver} @@ -230,12 +241,6 @@ Provides: java-%{javaver}-openjdk = %{version}-%{release} Provides: java-openjdk = %{version}-%{release} Provides: jre = %{javaver} -%ifarch %{ix86} ppc -Provides: jre-32 = %{javaver} -%endif -%ifarch x86_64 -Provides: jre-64 = %{javaver} -%endif Provides: jre-%{javaver} = %{version}-%{release} Provides: jre-%{javaver}-openjdk = %{version}-%{release} Provides: jre-openjdk = %{version}-%{release} @@ -264,8 +269,15 @@ Provides: jre1.5.x Provides: jre1.6.x Provides: jre1.7.x +%ifarch %ix86 ppc +Provides: jre-32 = %{javaver} +%endif +%ifarch x86_64 +Provides: jre-64 = %{javaver} +%endif +%else +Provides: java-bootstrap = %{javaver} %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build # Reduce build time from 27 hours to 12 hours by only running test # suites on JIT architectures. %ifarch %{test_arches} @@ -287,17 +299,6 @@ %if 0%{?suse_version} >= 1220 BuildRequires: xprop %endif -%if %{with bootstrap} -BuildRequires: ecj-bootstrap -BuildRequires: java-1_5_0-gcj-compat-devel -Conflicts: java-1_7_0-openjdk -%define _unpackaged_files_terminate_build 0 -%else -BuildRequires: %{name}-bootstrap >= 1.7.0 -BuildRequires: %{name}-bootstrap-devel >= 1.7.0 -#!BuildIgnore: %{name} %{name}-devel %{name}-headless java -BuildRequires: ecj -%endif # Mauve build requirements. %if %{with tests} BuildRequires: ecj @@ -403,6 +404,7 @@ Provides: java-sdk-%{javaver}-openjdk = %{version} Provides: java-sdk-openjdk = %{version} %else +Provides: java-bootstrap-devel = %{javaver} Conflicts: java-1_7_0-openjdk-devel %endif @@ -418,6 +420,8 @@ line. Except for the appletviewer, these tools do not provide a graphical user interface. +%if ! %{with bootstrap} + %package demo Summary: Sources for building demo applications with OpenJDK 7 Group: Development/Languages/Java @@ -466,6 +470,8 @@ Although working pretty fine, there are known issues with accessibility on, so do not rather install this package unless you really need. +%endif + %prep %if 0%{?suse_version} >= 1230 %gpg_verify -f %{SOURCE2002} %{SOURCE2000} @@ -522,6 +528,7 @@ --with-javac=${JAVAC} \ --with-ecj=%{_bindir}/ecj \ --with-ecj-jar=${ECJJAR} \ + --disable-docs \ %else --disable-bootstrap \ %endif @@ -572,6 +579,7 @@ patch -p0 -i %{PATCH106} patch -p0 -i %{PATCH108} patch -p0 -i %{PATCH200} + %if ! %{with zero} patch -p0 -i %{PATCH403} %endif @@ -595,6 +603,7 @@ %endif patch -p1 -i %{PATCH1001} + %if %{with_default_hotspot_tarball} patch -p1 -i %{PATCH10011} %endif @@ -606,6 +615,7 @@ if [ -f %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts ]; then rm %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts fi + %if 0%{?suse_version} < 1130 # ========== a default keystore ========== # a cacerts generation - 11.3+ use java-ca-certificates package @@ -641,7 +651,6 @@ echo "sun.zoneinfo.dir=%{_datadir}/javazi" >> $JAVA_HOME/jre/lib/tz.properties %if %{with tests} - %check # Run jtreg test suite. export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image @@ -783,10 +792,14 @@ popd +%if ! %{with bootstrap} + # Install Javadoc documentation. install -d -m 755 %{buildroot}%{_javadocdir} cp -a %{buildoutputdir}/docs %{buildroot}%{_javadocdir}/%{sdklnk} +%endif + # Install icons and menu entries. for s in 16 24 32 48 ; do install -D -p -m 644 \ @@ -885,7 +898,6 @@ fi %if 0%{?suse_version} >= 1130 - %posttrans headless # bnc#781690#c11: don't trust user defined JAVA_HOME and use the current VM # XXX: this might conflict between various versions of openjdk @@ -1032,6 +1044,8 @@ update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} fi +%if ! %{with bootstrap} + %post javadoc update-alternatives \ --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{sdklnk}/api \ @@ -1052,6 +1066,8 @@ ln -sf %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar fi +%endif + %files %defattr(0644,root,root,0755) %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall} @@ -1101,11 +1117,13 @@ %exclude %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so #belongs to full package %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so + %if %{with_pulseaudio} %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libicedtea-sound.so %exclude %{_jvmdir}/%{sdkdir}/jre/lib/pulseaudio.properties %endif %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so + %ifarch %ix86 %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjsig.so @@ -1119,6 +1137,7 @@ #belongs to full package %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so %config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg + %if ! %{with zero} %ifnarch ppc64 ppc64le %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa @@ -1224,6 +1243,7 @@ %{_mandir}/man1/xjc-%{sdklnk}.1* %if ! %{with bootstrap} + %files demo %defattr(0644,root,root,0755) %{_jvmdir}/%{sdkdir}/demo -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xterm for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '14

02 Oct '14

Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at 2014-10-02 14:13:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xterm (Old) and /work/SRC/openSUSE:Factory/.xterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xterm" Changes: -------- --- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2014-09-28 19:56:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2014-10-02 14:13:24.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 29 14:12:20 UTC 2014 - pcerny(a)suse.com + +- Patch #312 - 2014/09/28 + * undo change to do_select_regex() in patch #311 + (reports by H Merijn Brand, Sven-Haegar Koch, Debian #762978). + +------------------------------------------------------------------- Old: ---- xterm-311.tgz xterm-311.tgz.asc New: ---- xterm-312.tgz xterm-312.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.KokNC6/_old 2014-10-02 14:13:26.000000000 +0200 +++ /var/tmp/diff_new_pack.KokNC6/_new 2014-10-02 14:13:26.000000000 +0200 @@ -52,7 +52,7 @@ %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 311 +Version: 312 Release: 0 Summary: The basic X terminal program License: MIT ++++++ xterm-311.tgz -> xterm-312.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-311/MANIFEST new/xterm-312/MANIFEST --- old/xterm-311/MANIFEST 2014-07-28 23:36:30.000000000 +0200 +++ new/xterm-312/MANIFEST 2014-09-27 00:42:15.000000000 +0200 @@ -1,4 +1,4 @@ -MANIFEST for xterm-311, version xterm-311 +MANIFEST for xterm-312, version xterm-312 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-311/button.c new/xterm-312/button.c --- old/xterm-311/button.c 2014-09-18 02:17:35.000000000 +0200 +++ new/xterm-312/button.c 2014-09-27 01:58:14.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: button.c,v 1.481 2014/09/18 00:17:35 tom Exp $ */ +/* $XTermId: button.c,v 1.482 2014/09/26 23:58:14 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -3257,7 +3257,7 @@ int start_col = indexToCol(indexed, len, start_inx); int finis_col = indexToCol(indexed, len, finis_inx); - if (start_col >= actual && + if (start_col <= actual && actual < finis_col) { int test = finis_col - start_col; if (best_len < test) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-311/package/debian/changelog new/xterm-312/package/debian/changelog --- old/xterm-311/package/debian/changelog 2014-07-28 23:36:30.000000000 +0200 +++ new/xterm-312/package/debian/changelog 2014-09-27 00:42:15.000000000 +0200 @@ -1,3 +1,9 @@ +xterm-dev (312) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey(a)invisible-island.net> Fri, 26 Sep 2014 18:42:15 -0400 + xterm-dev (311) unstable; urgency=low * maintenance updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-311/package/freebsd/Makefile new/xterm-312/package/freebsd/Makefile --- old/xterm-311/package/freebsd/Makefile 2014-07-28 23:36:30.000000000 +0200 +++ new/xterm-312/package/freebsd/Makefile 2014-09-27 00:42:15.000000000 +0200 @@ -5,7 +5,7 @@ # and "make makesum". PORTNAME= xterm -PORTVERSION= 311 +PORTVERSION= 312 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ CRITICAL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-311/package/xterm.spec new/xterm-312/package/xterm.spec --- old/xterm-311/package/xterm.spec 2014-07-28 23:36:30.000000000 +0200 +++ new/xterm-312/package/xterm.spec 2014-09-27 00:42:15.000000000 +0200 @@ -1,11 +1,11 @@ -# $XTermId: xterm.spec,v 1.76 2014/07/28 21:36:30 tom Exp $ +# $XTermId: xterm.spec,v 1.77 2014/09/26 22:42:15 tom Exp $ Summary: X terminal emulator (development version) %global my_middle xterm %global my_suffix -dev %global fullname %{my_middle}%{my_suffix} %global my_class XTermDev Name: %{fullname} -Version: 311 +Version: 312 Release: 1 License: X11 Group: User Interface/X diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-311/version.h new/xterm-312/version.h --- old/xterm-311/version.h 2014-09-18 23:12:19.000000000 +0200 +++ new/xterm-312/version.h 2014-09-29 02:37:50.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.397 2014/09/18 21:12:19 tom Exp $ */ +/* $XTermId: version.h,v 1.399 2014/09/29 00:37:50 tom Exp $ */ /* * Copyright 1998-2013,2014 by Thomas E. Dickey @@ -38,8 +38,8 @@ * version of X to which this version of xterm has been built. The resulting * number in parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 311 -#define XTERM_DATE 2014-09-18 +#define XTERM_PATCH 312 +#define XTERM_DATE 2014-09-28 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-311/xterm.log.html new/xterm-312/xterm.log.html --- old/xterm-311/xterm.log.html 2014-09-18 23:11:45.000000000 +0200 +++ new/xterm-312/xterm.log.html 2014-09-29 02:39:23.000000000 +0200 @@ -30,7 +30,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.1522 2014/09/18 21:11:45 tom Exp $ + $XTermId: xterm.log.html,v 1.1526 2014/09/29 00:39:23 tom Exp $ --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> @@ -72,6 +72,8 @@ CHANGELOG</a>).</p> <ul> + <li><a href="#xterm_312">Patch #312 - 2014/09/28</a></li> + <li><a href="#xterm_311">Patch #311 - 2014/09/18</a></li> <li><a href="#xterm_310">Patch #310 - 2014/07/25</a></li> @@ -907,6 +909,15 @@ <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li> </ul> + <h1><a name="xterm_312" id="xterm_312">Patch #312 - + 2014/09/28</a></h1> + + <ul> + <li>undo change to <code>do_select_regex()</code> in <a href= + "#xterm_311">patch #311</a> (reports by H Merijn Brand, + Sven-Haegar Koch, Debian #762978).</li> + </ul> + <h1><a name="xterm_311" id="xterm_311">Patch #311 - 2014/09/18</a></h1> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tor for openSUSE:13.1:Update
by root＠hilbert.suse.de 02 Oct '14

02 Oct '14

Hello community, here is the log from the commit of package tor for openSUSE:13.1:Update checked in at 2014-10-02 11:23:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/tor (Old) and /work/SRC/openSUSE:13.1:Update/.tor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tor" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.7W0ZE0/_old 2014-10-02 11:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.7W0ZE0/_new 2014-10-02 11:23:01.000000000 +0200 @@ -1 +1 @@ -<link package='tor.2936' cicount='copy' /> +<link package='tor.3025' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tor for openSUSE:12.3:Update
by root＠hilbert.suse.de 02 Oct '14

02 Oct '14

Hello community, here is the log from the commit of package tor for openSUSE:12.3:Update checked in at 2014-10-02 11:22:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/tor (Old) and /work/SRC/openSUSE:12.3:Update/.tor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tor" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.TCJ3QN/_old 2014-10-02 11:22:59.000000000 +0200 +++ /var/tmp/diff_new_pack.TCJ3QN/_new 2014-10-02 11:22:59.000000000 +0200 @@ -1 +1 @@ -<link package='tor.2936' cicount='copy' /> +<link package='tor.3025' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tomcat for openSUSE:12.3:Update
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package tomcat for openSUSE:12.3:Update checked in at 2014-10-01 15:58:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/tomcat (Old) and /work/SRC/openSUSE:12.3:Update/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tomcat" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.Tjh4iH/_old 2014-10-01 15:58:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Tjh4iH/_new 2014-10-01 15:58:53.000000000 +0200 @@ -1 +1 @@ -<link package='tomcat.2432' cicount='copy' /> +<link package='tomcat.3015' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tomcat.3015 for openSUSE:12.3:Update
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package tomcat.3015 for openSUSE:12.3:Update checked in at 2014-10-01 15:58:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/tomcat.3015 (Old) and /work/SRC/openSUSE:12.3:Update/.tomcat.3015.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tomcat.3015" Changes: -------- New Changes file: --- /dev/null 2014-09-26 12:09:11.568032006 +0200 +++ /work/SRC/openSUSE:12.3:Update/.tomcat.3015.new/tomcat.changes 2014-10-01 15:58:52.000000000 +0200 @@ -0,0 +1,142 @@ +------------------------------------------------------------------- +Mon Sep 22 12:07:52 UTC 2014 - meissner(a)suse.com + +- updated to 7.0.42 security and bugfix release. bnc#896047 +- tomcat-CVE-2013-2071.patch removed, is upstream. + +------------------------------------------------------------------- +Mon Dec 16 15:17:17 UTC 2013 - mvyskocil(a)suse.com + +- Add tomcat-dbcp.jar (bnc#847505) back into tomcat lib dir +- Add missing commons-pool-tomcat5 symlink (bnc#847505c#13) + +------------------------------------------------------------------- +Tue Aug 6 20:24:06 UTC 2013 - robert.munteanu(a)gmail.com + +- Add missing 'su root tomcat' line to logrotate. See also + https://bugzilla.redhat.com/show_bug.cgi?id=790334 + +------------------------------------------------------------------- +Thu Jul 25 11:46:08 UTC 2013 - mvyskocil(a)suse.com + +- tomcat-CVE-2013-2071.patch (bnc#831117) +- use chown --no-dereference to prevent symlink attacks on log + (bnc#822177#c7/prevents CVE-2013-1976) + +------------------------------------------------------------------- +Sat Feb 16 07:29:52 UTC 2013 - m407(a)mail.ru + +- Fix tomcat init scripts generating malformed classpath + (http://youtrack.jetbrains.com/issue/JT-18545) + bnc#804992 + +------------------------------------------------------------------- +Mon Jan 21 13:54:18 UTC 2013 - mvyskocil(a)suse.com + +- update to 7.0.35 (bugfix release) + require ecj >= 4.2.1, like upstream do +- make gpg-offline work distros after 12.2 + +------------------------------------------------------------------- +Thu Dec 27 17:14:55 UTC 2012 - archie(a)dellroad.org + +- Ensure tomcat stdout/stderr output ends up in catalina.out + +------------------------------------------------------------------- +Thu Dec 20 22:45:19 UTC 2012 - archie(a)dellroad.org + +- Recommend libtcnative-1-0 >= 1.1.24 +- /etc/init.d/tomcate init script fixes: + * Include /usr/bin and /usr/sbin in the PATH + * Fix logic for cleaning the work directories + * Fix typo (log_success_msg lsb function name) + * Fix typo (reload message) +- Require log4j + +------------------------------------------------------------------- +Tue Dec 18 09:34:29 UTC 2012 - mvyskocil(a)suse.com + +- Require gpg-offline on 12.2+ + +------------------------------------------------------------------- +Thu Nov 29 19:17:03 CET 2012 - sbrabec(a)suse.cz + +- Verify GPG signature. + +------------------------------------------------------------------- +Mon Nov 26 13:01:44 UTC 2012 - mvyskocil(a)suse.com + +- update to 7.0.33 (bugfix release) + +------------------------------------------------------------------- +Tue Sep 11 08:24:53 UTC 2012 - mvyskocil(a)suse.cz + +- update to 7.0.30 (bugfix release) + * SSI and CGI disabled by default +- fix bnc#779538: change the working dir to $CATALINA_BASE +- document the CATALINA_BASE and CATALINA_HOME in tomcat.conf better +- fix rpmlintrc file + +------------------------------------------------------------------- +Thu Jul 19 08:48:31 UTC 2012 - mvyskocil(a)suse.cz + +- fix bnc#771802 - systemd support is broken + * change type froking to simple as it does not make a sense run java in a + background to emulate that + * remove the need of nested wrappers, so /usr/sbin/tomcat-sysd now relies on + systemd features like User/EnvironmentFile + * workaround the 143 exit code in Stop phase - return 0 in this case + * merge the jsvc into tomcat-sysd code, the -jsvc-sysd is a symlink + * properly use jsvc with pid file to start and stop + +------------------------------------------------------------------- +Wed Jun 13 12:37:49 UTC 2012 - mvyskocil(a)suse.cz + +- update to 7.0.26 (bugfix release) +- rename package to tomcat in order to emphasise a fact, there is only one + major release of tomcat maintained in distribution +- add manifest files and systemd support (thanks Fedora) +- create tomcat-jsvc package + +------------------------------------------------------------------- +Thu Feb 23 13:59:10 UTC 2012 - mvyskocil(a)suse.cz + +- update to 7.0.26 (bugfix release) +- fix bnc#747771 - don't use /var/lock/subsys + sync tomcat7 init with tomcat6 + +------------------------------------------------------------------- +Sun Feb 19 23:02:42 UTC 2012 - wittemar(a)googlemail.com + +- update to 7.0.25 (bugfix release) + +------------------------------------------------------------------- +Tue Nov 1 12:36:57 UTC 2011 - mvyskocil(a)suse.cz + +- update to 7.0.22 (bugfix release) +- wrote changes and prepare for inclusion to openSUSE distribution +- fix bnc#726307 + /etc/tomcat7 is writtable for tomcat group + +------------------------------------------------------------------- +Mon Sep 19 10:21:29 UTC 2011 - wittemar(a)googlemail.com + + - update to version 7.0.21 + +------------------------------------------------------------------- +Thu Jul 21 10:21:29 UTC 2011 - mvyskocil(a)suse.cz + + - update to version 7.0.16 (bugfix update) + +------------------------------------------------------------------- +Wed Mar 30 16:29:28 UTC 2011 - jrenner(a)suse.de + + - add rpmlintrc, digest, init and wrapper scripts and config file + - build require geronimo apis and wsdl4j + - disable webservices in javadoc target + +------------------------------------------------------------------- +Tue Jan 18 12:22:55 UTC 2011 - mvyskocil(a)suse.cz + + - initial packaging of tomcat7 7.0.6 + New: ---- apache-tomcat-7.0.42-src.tar.gz apache-tomcat-7.0.42-src.tar.gz.asc dbcp-tomcat-build.xml el-api-OSGi-MANIFEST.MF jasper-OSGi-MANIFEST.MF jasper-el-OSGi-MANIFEST.MF jsp-api-OSGi-MANIFEST.MF servlet-api-OSGi-MANIFEST.MF tomcat-7.0-bootstrap-MANIFEST.MF.patch tomcat-7.0-digest.script tomcat-7.0-jsvc.service tomcat-7.0-log4j.properties tomcat-7.0-tomcat-sysd tomcat-7.0-tomcat-users-webapp.patch tomcat-7.0-tool-wrapper.script tomcat-7.0.2-property-build.windows.patch tomcat-7.0.conf tomcat-7.0.init tomcat-7.0.logrotate tomcat-7.0.service tomcat-7.0.wrapper tomcat-api-OSGi-MANIFEST.MF tomcat-juli-OSGi-MANIFEST.MF tomcat-rpmlintrc tomcat.changes tomcat.keyring tomcat.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ ++++ 729 lines (skipped) ++++++ dbcp-tomcat-build.xml ++++++  <project name="commons-dbcp-tomcat5" default="build" basedir="."> <property name="tomcat-dbcp.home" value="dbcp-tomcat5"/> <property name="commons-dbcp.home" value="."/> <property name="tomcat-dbcp.jar" value="commons-dbcp-tomcat5.jar"/>  <property name="compile.debug" value="true"/> <property name="compile.deprecation" value="false"/> <property name="compile.source" value="1.5"/> <target name="clean"> <delete dir="${tomcat-dbcp.home}"/> </target> <target name="build"> <copy todir="${tomcat-dbcp.home}">  <fileset dir="${commons-dbcp.home}"> <include name="**/*.java" /> <exclude name="**/test/**" /> <exclude name="${tomcat-dbcp.home}/**"/> </fileset> </copy> <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"> <replacefilter token="return UnmodifiableList.decorate(l);" value="return l;" /> <replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;" value=" " /> </replace> <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" > <replacefilter token="org.apache.commons" value="org.apache.tomcat.dbcp" /> </replace> <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" /> <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp"> <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" /> </move> <mkdir dir="${tomcat-dbcp.home}/classes"/> <javac target="1.5" destdir="${tomcat-dbcp.home}/classes" optimize="off" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${compile.source}" sourcepath="${tomcat-dbcp.home}/src/java" srcdir="${tomcat-dbcp.home}/src/java" > <include name="**" /> </javac> <jar destfile="${tomcat-dbcp.home}/${tomcat-dbcp.jar}" index="true"> <fileset dir="${tomcat-dbcp.home}/classes"> <include name="**/*.class" /> <include name="**/*.properties" /> </fileset> </jar> </target> </project> ++++++ el-api-OSGi-MANIFEST.MF ++++++ Manifest-Version: 1.0 Export-Package: javax.el;version="2.2.0" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . Bundle-Version: 2.2.0 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: javax.el DynamicImport-Package: org.apache.el Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J 2SE-1.3 ++++++ jasper-OSGi-MANIFEST.MF ++++++ Manifest-Version: 1.0 Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version ="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas per.runtime;version="7.0.21",org.apache.jasper.security;version="7.0. 19",org.apache.jasper.servlet;version="7.0.21",org.apache.jasper.tagp lugins.jstl;version="7.0.21",org.apache.jasper.tagplugins.jstl.core;v ersion="7.0.21",org.apache.jasper.util;version="7.0.21",org.apache.ja sper.xmlparser;version="7.0.21" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . Bundle-Version: 7.0.21 Bundle-Localization: plugin Bundle-Name: %bundleName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.apache.jasper Import-Package: javax.servlet;version="[2.4.0, 3.0.0]",javax.servlet.h ttp;version="[2.4.0, 3.0.0]",javax.servlet.jsp;version="[2.0.0, 2.2.0 ]",javax.servlet.jsp.el;version="[2.0.0, 2.2.0]",javax.servlet.jsp.re sources;version="[2.0.0, 2.2.0]",javax.servlet.jsp.tagext;version="[2 .0.0, 2.2.0]",javax.servlet.resources;version="[2.4.0, 3.0.0]",javax. xml.parsers,org.apache.commons.el;version="[1.0.0,2.0.0)",org.apache. commons.logging;version="[1.0.0,2.0.0)",org.apache.tools.ant;resoluti on:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.a pache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util; resolution:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml. sax.helpers,org.apache.tomcat;version="7.0.21",org.apache.juli.loggin g;version="7.0.21",javax.el;version="2.2.0",org.eclipse.jdt.internal. compiler,org.eclipse.jdt.internal.compiler.parser,org.eclipse.jdt.int ernal.compiler.parser.diagnose,org.eclipse.jdt.internal.compiler.flow ,org.eclipse.jdt.internal.compiler.util,org.eclipse.jdt.internal.comp iler.impl,org.eclipse.jdt.internal.compiler.lookup,org.eclipse.jdt.in ternal.compiler.codegen,org.eclipse.jdt.internal.compiler.batch,org.e clipse.jdt.internal.compiler.classfmt,org.eclipse.jdt.internal.compil er.ast,org.eclipse.jdt.internal.compiler.problem,org.eclipse.jdt.inte rnal.compiler.env,org.eclipse.jdt.internal.core.util,org.eclipse.jdt. core.compiler Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J 2SE-1.3 ++++++ jasper-el-OSGi-MANIFEST.MF ++++++ Manifest-Version: 1.0 Export-Package: org.apache.el;version="7.0.21" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . Bundle-Version: 7.0.21 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Import-Package: javax.el;version="2.2" Bundle-SymbolicName: org.apache.el Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J 2SE-1.3 ++++++ jsp-api-OSGi-MANIFEST.MF ++++++ Manifest-Version: 1.0 Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 Bundle-Name: %bundleName Bundle-SymbolicName: javax.servlet.jsp Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp .tagext; version=2.2 Bundle-Version: 2.2.0.v200806031607 Bundle-ManifestVersion: 2 Import-Package: javax.servlet; version=3.0,javax.servlet.http; version =3.0,javax.servlet.resources; version=3.0,javax.el;version="2.2.0" ++++++ servlet-api-OSGi-MANIFEST.MF ++++++ Manifest-Version: 1.0 Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4 Bundle-SymbolicName: javax.servlet Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-Version: 3.0.0 Bundle-Vendor: %bundleProvider Export-Package: javax.servlet;version="3.0", javax.servlet;version="2.6", javax.servlet.http;version="3.0", javax.servlet.http;version="2.6", javax.servlet.annotation;version="2.6", javax.servlet.descriptor;version="3.0", javax.servlet.descriptor;version="2.6", javax.servlet.resources;version="3.0", javax.servlet.resources;version="2.6" ++++++ tomcat-7.0-bootstrap-MANIFEST.MF.patch ++++++ Index: apache-tomcat-7.0.2-src/res/META-INF/bootstrap.jar.manifest =================================================================== --- apache-tomcat-7.0.2-src.orig/res/META-INF/bootstrap.jar.manifest 2010-08-04 01:26:39.000000000 +0200 +++ apache-tomcat-7.0.2-src/res/META-INF/bootstrap.jar.manifest 2010-09-23 11:25:07.237277450 +0200 @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Main-Class: org.apache.catalina.startup.Bootstrap -Class-Path: commons-daemon.jar Specification-Title: Apache Tomcat Bootstrap Specification-Version: @VERSION_MAJOR_MINOR@ Specification-Vendor: Apache Software Foundation ++++++ tomcat-7.0-digest.script ++++++ #!/bin/sh # # tomcat-digest script # JPackage Project <http://www.jpackage.org/> # Source functions library if [ -f /usr/share/java-utils/java-functions ] ; then . /usr/share/java-utils/java-functions else echo "Can't find functions library, aborting" exit 1 fi # Get the tomcat config (use this for environment specific settings) if [ -z "${TOMCAT_CFG}" ]; then TOMCAT_CFG="/etc/tomcat/tomcat.conf" fi if [ -r "$TOMCAT_CFG" ]; then . $TOMCAT_CFG fi set_javacmd # CLASSPATH munging if [ -n "$JSSE_HOME" ]; then CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" fi CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" #sanitize the classpath - remove double and trailing colons CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`" export CLASSPATH # Configuration MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" BASE_OPTIONS="" BASE_JARS="commons-daemon tomcat/catalina servlet" # Set parameters set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run -server org.apache.catalina.realm.RealmBase "$@" ++++++ tomcat-7.0-jsvc.service ++++++ # Systemd unit file for tomcat # # You can clone this service by: # 1.) Add a new EnvironmentFile declaring the new values for CATALINA_BASE # and others # 2.) Define new Environment=JSVC_PIDFILE=/var/run/tomcat-foo.pid if you want # to run more than one service [Unit] Description=Apache Tomcat Web Application Container JSVC wrapper After=network.target [Service] Type=simple EnvironmentFile=/etc/tomcat/tomcat.conf ExecStart=/usr/sbin/tomcat-jsvc-sysd start ExecStop=/usr/sbin/tomcat-jsvc-sysd stop [Install] WantedBy=multi-user.target ++++++ tomcat-7.0-log4j.properties ++++++ log4j.rootLogger=debug, R log4j.appender.R=org.apache.log4j.RollingFileAppender log4j.appender.R.File=${catalina.home}/logs/tomcat.log log4j.appender.R.MaxFileSize=10MB log4j.appender.R.MaxBackupIndex=10 log4j.appender.R.layout=org.apache.log4j.PatternLayout log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n log4j.logger.org.apache.catalina=DEBUG, R log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG, R log4j.logger.org.apache.catalina.core=DEBUG, R log4j.logger.org.apache.catalina.session=DEBUG, R ++++++ tomcat-7.0-tomcat-sysd ++++++ #!/bin/bash # # This script provides systemd activation of the tomcat service and tomcat # throught jsvc wrapper # check the basic environment variables if [[ -z "${CATALINA_BASE}" || \ -z "${CATALINA_HOME}" || \ -z "${CATALINA_TMPDIR}" ]]; then echo "ERROR: one of CATALINA_BASE, CATALINA_HOME or CATALINA_TMPDIR is not defined" >&2 echo " use proper EnvironmentFile= in your .service file" >&2 exit 1 fi if [[ "${0}" =~ tomcat-jsvc ]]; then if [[ ! -x /usr/bin/jsvc ]]; then echo "ERROR: cannot use ${0}, /usr/bin/jsvc does not exists" >&2 exit 1 fi USE_JSVC=true JSVC_PIDFILE=${JSVC_PIDFILE:-/var/run/${0##*/}} else USE_JSVC=false fi #### from /usr/sbin/dtomcat if [[ -r /usr/share/java-utils/java-functions ]]; then . /usr/share/java-utils/java-functions else echo "ERROR: Can't read Java functions library, aborting" >&2 exit 1 fi set_javacmd # CLASSPATH munging if [[ -n "$JSSE_HOME" ]]; then CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" fi CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" #sanitize the classpath - remove double and trailing colons CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`" # See how we were called. function start() { local ret # running as root is not allowed if not running with jsvc if ! ${USE_JSVC} && [[ $(id -u) == 0 ]]; then echo "ERROR: starting tomcat under uid 0 is not supported" >&2 echo " use appropriate User/Group settings in service file" >&2 echo " see man systemd.exec for details" >&2 exit 2 fi if [[ "$SECURITY_MANAGER" = "true" ]]; then DSECURITY_MANAGER="-Djava.security.manager" else unset DSECURITY_MANAGER fi if ${USE_JSVC}; then JAVACMD="/usr/bin/jsvc -pidfile ${JSVC_PIDFILE} -nodetach -user ${TOMCAT_USER:-tomcat}" fi #bnc#779538 cd ${CATALINA_BASE} ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" ${DSECURITY_MANAGER} \ -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \ -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \ org.apache.catalina.startup.Bootstrap start \ >> ${CATALINA_BASE}/logs/catalina.out 2>&1 ret=${?} return $ret } function stop() { local ret if ${USE_JSVC}; then #XXX: foo is needed because of funny jsvc parser needs a class name /usr/bin/jsvc -stop -pidfile ${JSVC_PIDFILE} foo ret=${?} if [[ $ret == 0 ]]; then rm -f ${JSVC_PIDFILE} fi else ${JAVACMD} $JAVA_OPTS \ -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ org.apache.catalina.startup.Bootstrap stop ret=${?} # workaround the 143 code emmited by jvm in case of sigterm # using ExecStart=- will ignore all other failures as well if [[ ret == 143 ]]; then ret=0 fi fi return $ret } function version() { exec ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \ org.apache.catalina.util.ServerInfo } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart) stop start ;; version) version ;; *) echo "Usage: $0 {start|stop|restart|version}" >&2 exit 1 esac ++++++ tomcat-7.0-tomcat-users-webapp.patch ++++++ Index: apache-tomcat-7.0.2-src/conf/tomcat-users.xml =================================================================== --- apache-tomcat-7.0.2-src/conf/tomcat-users.xml 2010-08-04 01:26:35.000000000 +0200 +++ apache-tomcat-7.0.2-src/conf/tomcat-users.xml 2010-09-23 11:27:11.819276755 +0200 @@ -23,4 +23,14 @@ <user username="both" password="tomcat" roles="tomcat,role1"/> <user username="role1" password="tomcat" roles="role1"/> --> + + + + + + + + + + </tomcat-users> ++++++ tomcat-7.0-tool-wrapper.script ++++++ #!/bin/sh # # tomcat-digest script # JPackage Project <http://www.jpackage.org/> # Source functions library if [ -f /usr/share/java-utils/java-functions ] ; then . /usr/share/java-utils/java-functions else echo "Can't find functions library, aborting" exit 1 fi # Get the tomcat config (use this for environment specific settings) if [ -z "${TOMCAT_CFG}" ]; then TOMCAT_CFG="/etc/tomcat/tomcat.conf" fi if [ -r "$TOMCAT_CFG" ]; then . $TOMCAT_CFG fi set_javacmd # CLASSPATH munging if [ -n "$JSSE_HOME" ]; then CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" fi CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" #sanitize the classpath - remove double and trailing colons CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`" export CLASSPATH # Configuration MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_OPTIONS="" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" BASE_JARS="commons-daemon tomcat/catalina servlet" # Set parameters set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ tomcat-7.0.2-property-build.windows.patch ++++++ Index: apache-tomcat-7.0.27-src/build.properties.default =================================================================== --- apache-tomcat-7.0.27-src.orig/build.properties.default 2012-03-31 16:46:49.000000000 +0200 +++ apache-tomcat-7.0.27-src/build.properties.default 2012-06-13 13:56:38.272947593 +0200 @@ -197,3 +197,5 @@ dojo-js.loc=http://download.dojotoolkit.org/release-1.1.1/dojo-release-1.1.… dojo-js.jar=${dojo-js.home}/dojo/dojo.js +# ----- Build on Windows ---- +build.windows=false Index: apache-tomcat-7.0.27-src/build.xml =================================================================== --- apache-tomcat-7.0.27-src.orig/build.xml 2012-03-31 16:46:49.000000000 +0200 +++ apache-tomcat-7.0.27-src/build.xml 2012-06-13 13:56:38.274947593 +0200 @@ -2341,7 +2341,7 @@ </target> <target name="download-dist" - description="Download additional components for a distribution" > + description="Download additional components for a distribution" if="${build.windows}"> <antcall target="downloadzip-2"> <param name="sourcefile.1" value="${tomcat-native.win.1}"/> ++++++ tomcat-7.0.conf ++++++ # System-wide configuration file for tomcat services # This will be sourced by tomcat and any secondary service # Where your java installation lives JAVA_HOME="@@@JAVAHOME@@@" # Where your tomcat installation lives CATALINA_HOME="@@@TCHOME@@@" # where the given instance lives CATALINA_BASE="@@@TCHOME@@@" # the temp dir of the instance CATALINA_TMPDIR="@@@TCTEMP@@@" # You can pass some parameters to java here if you wish to #JAVA_OPTS="-Xminf0.1 -Xmaxf0.3" # Use JAVA_OPTS to set java.library.path for libtcnative.so #JAVA_OPTS="-Djava.library.path=@@@LIBDIR@@@" # What user should run tomcat # This value is interpreted differently # 1.) for systemd units derived from tomcat.service, the User/Group settings is used # 2.) for systemd units derived from tomcat-jsvc.service this value is respected (with tomcat as a default) # 3.) for sysv init script, this value is respected (with tomcat as a default) #TOMCAT_USER="tomcat" # You can change your tomcat locale here #LANG="en_US" # Run tomcat under the Java Security Manager SECURITY_MANAGER="false" # Time to wait in seconds, before killing process SHUTDOWN_WAIT="30" # Whether to annoy the user with "attempting to shut down" messages or not SHUTDOWN_VERBOSE="false" # Set the TOMCAT_PID location # WARNING: does not make any sense for systemd users #CATALINA_PID="/var/run/tomcat.pid" # Connector port is 8080 for this tomcat instance #CONNECTOR_PORT="8080" # If you wish to further customize your tomcat environment, # put your own definitions here # (i.e. LD_LIBRARY_PATH for some jdbc drivers) # Clear work directory when tomcat is stopped or restarted CLEAR_WORK="false" # Java runtime options used when the "start", or "run" command is executed # Use # it if you want: # Set a location of JAAS config file # CATALINA_OPTS="-Djava.security.auth.login.config=$CATALINA_HOME/conf/jaas.config" # To collect data on how long garbage collection is taking # CATALINA_OPTS="-verbose:gc" # Make jikes error messages compatible with jasper # CATALINA_OPTS="-Dbuild.compiler.emacs=true" # Debug the permission (WARNING - This will generate many megabytes of output!) # CATALINA_OPTS="-Djava.security.debug=all" ++++++ tomcat-7.0.init ++++++ #!/bin/bash # Copyright (c) 2008 SuSE Linux AG Nuernberg, Germany. # # - originally written by Henri Gomez, Keith Irwin, and Nicolas Mailhot # - heavily rewritten by Deepak Bhole and Jason Corley # - merged with previous SUSE's rctomcat55 by Petr Mladek and jpackage.org # original by Michal Vyskocil # # /etc/init.d/tomcat # # and its symbolic link # # /usr/sbin/rctomcat # # System startup script for the Tomcat servlet container # ### BEGIN INIT INFO # Provides: tomcat # Required-Start: $network $syslog $remote_fs # Should-Start: $named $syslog $time # Required-Stop: $network $syslog $remote_fs # Should-Stop: $named $syslog $time # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Tomcat Servlet Container # Description: Start and Stop Apache Tomcat ### END INIT INFO # set a minimalist PATH PATH="/bin:/sbin:/usr/bin:/usr/sbin" # Source LSB function library. if [ -r /lib/lsb/init-functions ]; then . /lib/lsb/init-functions else exit 1 fi DISTRIB_ID=`lsb_release -i -s 2>/dev/null` NAME="$(basename $0)" unset ISBOOT if [ "${NAME:0:1}" = "S" -o "${NAME:0:1}" = "K" ]; then NAME="${NAME:3}" ISBOOT="1" fi # remove SUSE's rc name if [ "${NAME:0:2}" = "rc" ]; then NAME="${NAME:2}" fi # For SELinux we need to use 'runuser' not 'su' if [ -x "/sbin/runuser" ]; then SU="/sbin/runuser" else SU="/bin/su" fi # Get the tomcat config (use this for environment specific settings) TOMCAT_CFG="/etc/tomcat/tomcat.conf" if [ -r "$TOMCAT_CFG" ]; then . $TOMCAT_CFG fi # Define which connector port to use CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" # Path to the tomcat launch script TOMCAT_SCRIPT="/usr/sbin/dtomcat" # Tomcat program name TOMCAT_PROG="${NAME}" # Define the tomcat username TOMCAT_USER="${TOMCAT_USER:-tomcat}" # Define the tomcat log file TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/${NAME}-initd.log}" # Define the tomcat pid file export CATALINA_PID="/var/run/${NAME}.pid" RETVAL="0" # pulled from RHEL4 /etc/rc.d/init.d/functions function checkpid() { local i for i in $* ; do if [ -d "/proc/${i}" ]; then return 0 fi done return 1 } # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. # Look for open ports, as the function name might imply function findFreePorts() { local isSet1="false" local isSet2="false" local isSet3="false" local lower="8000" randomPort1="0" randomPort2="0" randomPort3="0" local -a listeners="( $( netstat -ntl | \ awk '/^tcp/ {gsub("(.)*:", "", $4); print $4}' ) )" while [ "$isSet1" = "false" ] || \ [ "$isSet2" = "false" ] || \ [ "$isSet3" = "false" ]; do let port="${lower}+${RANDOM:0:4}" if [ -z `expr " ${listeners[*]} " : ".*$ $port $.*"` ]; then if [ "$isSet1" = "false" ]; then export randomPort1="$port" isSet1="true" elif [ "$isSet2" = "false" ]; then export randomPort2="$port" isSet2="true" elif [ "$isSet3" = "false" ]; then export randomPort3="$port" isSet3="true" fi fi done } function makeHomeDir() { if [ ! -d "$CATALINA_HOME" ]; then echo "$CATALINA_HOME does not exist, creating" if [ ! -d "/usr/share/${NAME}" ]; then mkdir /usr/share/${NAME} cp -pLR /usr/share/tomcat/* /usr/share/${NAME} fi mkdir -p /var/log/${NAME} \ /var/cache/${NAME} \ /var/tmp/${NAME} ln -fs /var/cache/${NAME} ${CATALINA_HOME}/work ln -fs /var/tmp/${NAME} ${CATALINA_HOME}/temp cp -pLR /usr/share/${NAME}/bin $CATALINA_HOME cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME ln -fs /usr/share/java/tomcat ${CATALINA_HOME}/lib ln -fs /usr/share/tomcat/webapps ${CATALINA_HOME}/webapps chown --no-dereference ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME} fi } function parseOptions() { options="" options="$options $( awk '!/^#/ && !/^$/ { ORS=" "; print "export ", $0, ";" }' \ $TOMCAT_CFG )" # if [ -r "/etc/sysconfig/${NAME}" ]; then # options="$options $( # awk '!/^#/ && !/^$/ { ORS=" "; # print "export ", $0, ";" }' \ # /etc/sysconfig/${NAME} # )" # fi TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}" } # See how we were called. function start() { echo -n "Starting Tomcat ($CATALINA_BASE)" if [ -f "/var/run/rc${NAME}" ] ; then if [ -f "/var/run/${NAME}.pid" ]; then read kpid < /var/run/${NAME}.pid if checkpid $kpid 2>&1; then echo "$NAME process already running" rc_failed 0 else echo -n "lock file found but no process running for pid $kpid, continuing" rc_failed 7 fi fi fi # fix permissions on the log and pid files export CATALINA_PID="/var/run/${NAME}.pid" touch $CATALINA_PID chown --no-dereference${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID touch $TOMCAT_LOG chown --no-dereference${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG if [ "$CATALINA_HOME" != "/usr/share/tomcat" ]; then # Create a tomcat directory if it doesn't exist makeHomeDir # If CATALINA_HOME doesn't exist modify port number so that # multiple instances don't interfere with each other findFreePorts sed -i -e "s/8005/${randomPort1}/g" -e "s/8080/${CONNECTOR_PORT}/g" \ -e "s/8009/${randomPort2}/g" -e "s/8443/${randomPort3}/g" \ ${CATALINA_HOME}/conf/server.xml fi parseOptions if [ "$SECURITY_MANAGER" = "true" ]; then $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \ >> $TOMCAT_LOG 2>&1 else $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1 fi RETVAL="$?" if [ "$RETVAL" -eq 0 ]; then rc_failed 0 touch /var/run/rc${NAME} else rc_failed 7 fi rc_status -v } ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Status has a slightly different for the status command: # 0 - service running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running # NOTE: checkproc returns LSB compliant status values. function status() { echo -n "Checking for Tomcat ($CATALINA_BASE)" if [ -f "/var/run/${NAME}.pid" ]; then read kpid < /var/run/${NAME}.pid if checkpid $kpid 2>&1; then rc_failed 0 else rc_failed 2 fi else #don't be dependent on procps #pid="$(/usr/bin/pgrep -u tomcat java)" pid="$(ps U tomcat o pid,cmd | grep java | grep -v 'grep java')" if [ -n "$pid" ]; then echo "$0 running (${pid}) but no PID file exists" rc_failed 0 else rc_failed 3 fi fi rc_status -v } function stop() { echo -n "Shutting down Tomcat ($CATALINA_BASE)" if [ -f "/var/run/rc${NAME}" ]; then parseOptions $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1 RETVAL="$?" if [ "$RETVAL" -eq "0" ]; then count="0" if [ -f "/var/run/${NAME}.pid" ]; then read kpid < /var/run/${NAME}.pid until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \ [ "$count" -gt "$SHUTDOWN_WAIT" ]; do if [ "$SHUTDOWN_VERBOSE" = "true" ]; then echo "waiting for processes $kpid to exit" fi sleep 1 let count="${count}+1" done if [ "$count" -gt "$SHUTDOWN_WAIT" ]; then if [ "$SHUTDOWN_VERBOSE" = "true" ]; then echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds" echo -n -e "after " echo -n "$SHUTDOWN_WAIT seconds" fi kill -9 $kpid fi rc_failed 0 if [ "$count" -gt "0" ]; then echo -n -e "\n" fi fi rm -f /var/run/rc${NAME} /var/run/${NAME}.pid if [ "${CLEAR_WORK}" = "true" ]; then echo -n "Cleaning work directory: " find ${CATALINA_HOME}/work/{Catalina,temp} -mindepth 2 -type d -print0 | xargs -0 rm -rf if [ "$?" -eq "0" ]; then log_success_msg echo -n -e "\n" fi fi else rc_failed 1 fi fi rc_status -v } # See how we were called. case "$1" in start) start ;; stop) stop ;; try-restart) ## Stop the service and if this succeeds (i.e. the ## service was running before), start it again. ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) $0 status >/dev/null && $0 restart # Remember status and be quiet rc_status ;; restart) stop sleep 2 start rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart. echo -n "Reload service Tomcat ($CATALINA_BASE)" ## if it supports it: #killproc -HUP $TOMCAT_BIN #touch /var/run/FOO.pid #rc_status -v ## Otherwise: $0 stop && $0 start rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signalling, do nothing (!) # If it supports signalling: #echo -n "Reload service FOO" #killproc -HUP $TOMCAT_BIN #touch /var/run/FOO.pid #rc_status -v ## Otherwise if it does not support reload: rc_failed 3 rc_status -v ;; status) status ;; probe) ## Optional: Probe for the necessity of a reload, ## give out the argument which is required for a reload. ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ tomcat-7.0.logrotate ++++++ @@@TCLOG@@@/catalina.out { copytruncate weekly rotate 52 compress missingok su root tomcat create 0644 tomcat tomcat } ++++++ tomcat-7.0.service ++++++ # Systemd unit file for tomcat # # You can clone this service by: # 1.) Add a new EnvironmentFile declaring the new values for CATALINA_BASE # and others [Unit] Description=Apache Tomcat Web Application Container After=network.target [Service] Type=simple EnvironmentFile=/etc/tomcat/tomcat.conf User=tomcat Group=tomcat ExecStart=/usr/sbin/tomcat-sysd start ExecStop=/usr/sbin/tomcat-sysd stop [Install] WantedBy=multi-user.target ++++++ tomcat-7.0.wrapper ++++++ #!/bin/bash if [ -r /usr/share/java-utils/java-functions ]; then . /usr/share/java-utils/java-functions else echo "Can't read Java functions library, aborting" exit 1 fi # Get the tomcat config (use this for environment specific settings) if [ -z "${TOMCAT_CFG}" ]; then TOMCAT_CFG="/etc/tomcat/tomcat.conf" fi if [ -r "$TOMCAT_CFG" ]; then . $TOMCAT_CFG fi set_javacmd # CLASSPATH munging if [ -n "$JSSE_HOME" ]; then CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" fi CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" #sanitize the classpath - remove double and trailing colons CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`" if [ "$1" = "start" ]; then ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \ -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \ org.apache.catalina.startup.Bootstrap start \ >> ${CATALINA_BASE}/logs/catalina.out 2>&1 & if [ ! -z "$CATALINA_PID" ]; then echo $! > $CATALINA_PID fi elif [ "$1" = "start-security" ]; then ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -Djava.security.manager \ -Djava.security.policy="${CATALINA_BASE}/conf/catalina.policy" \ -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \ -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \ org.apache.catalina.startup.Bootstrap start \ >> ${CATALINA_BASE}/logs/catalina.out 2>&1 & if [ ! -z "$CATALINA_PID" ]; then echo $! > $CATALINA_PID fi elif [ "$1" = "stop" ]; then ${JAVACMD} $JAVA_OPTS \ -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ org.apache.catalina.startup.Bootstrap stop \ >> ${CATALINA_BASE}/logs/catalina.out 2>&1 elif [ "$1" = "version" ]; then ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \ org.apache.catalina.util.ServerInfo else echo "Usage: $0 {start|start-security|stop|version}" exit 1 fi ++++++ tomcat-api-OSGi-MANIFEST.MF ++++++ Manifest-Version: 1.0 Export-Package: org.apache.tomcat;version="7.0.21" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . Bundle-Version: 7.0.21 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.apache.tomcat Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J 2SE-1.3 ++++++ tomcat-juli-OSGi-MANIFEST.MF ++++++ Manifest-Version: 1.0 Export-Package: org.apache.juli;version="7.0.21",org.apache.juli.loggi ng;version="7.0.21" Bundle-Vendor: %bundleProvider Bundle-ClassPath: . Bundle-Version: 7.0.21 Bundle-Name: %bundleName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.apache.juli Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J 2SE-1.3 ++++++ tomcat-rpmlintrc ++++++ #fix of bnc#520532 addFilter(".*non-etc-or-var-file-marked-as-conffile /srv/tomcat/webapps/ROOT.*") ++++++ tomcat.keyring ++++++ pub 4096R/2F6059E7 2009-09-18 uid Mark E D Thomas <markt(a)apache.org> sub 4096R/5E763BEC 2009-09-18 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t 6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz 4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8 Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0XjOE+7XBvM1lvz3+UarLfgSVmW8aheLd7e aIl5ItBk8844ZJ60LrQ+JiIqvqJemxyIM6epoZvY5a3ZshZpcLilC5hW8QARAQAB tCJNYXJrIEUgRCBUaG9tYXMgPG1hcmt0QGFwYWNoZS5vcmc+iQI3BBMBCgAhBQJK tA7pAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEBDAHFovYFnn2YgQAKN6 FLG/I1Ij3PUlC/XNlhasQxPeE3w2OvttweOQPYkblJ9nHtGH5pNqG2/qoGShlpI0 4jJy9GxWKOo7NV4v7M0mbVlCXVgjdlvMFWdL7lnocggwJAFejQcYlVtxyhu4m50L BvBunEhxCbQcKnnWmkB7Ocm0Ictaqjc9rCc1F/aNhVMUpJ0zG1kyTp9hxvN6TbCQ lacMx5ocTWzL0zn6QZhbUfrYwfxYJmSnkVYZOYzXIXIsLN5sJ9Q4P8tjY4qWgd+b QvOqPWrkzL9LVRnGOrSYIsoM5zWdoj1g1glMzK/ZqJdRqqqBhe6FYTbXipz8oX8i mCebcaxZnfLhGiqqX+yDa3YUwDiqom+sZOc0iXGvKkqltPLpNeF0MVT7aZjalsQ/ v2Ysb24RQl9FfjfWmvT8ZPWz8Kore1AI4UcIIgFVtM+zuLlL9CIsGjg+gHDE2dhZ DY0qfizlHL9CoAWUDM3pIfxM2V4BRn1xO+j/mModhjmYLZvnFVz4KGkNO7wRkofA ANIWYo3WI5x83BGDH371t3NRrrpSSFP0XpQX6/Leaj2j6U6puABL2qBxhscsO6ch c3u4/+019ff+peZVsc9ttcTQXsKIujmMb8p2sk5usmv6PKVX3oW/RAxpbVHU5kZ5 px1Hq7mMQdZfLs5ff4YymXBH02z4/RmSzPam0Xb5uQINBEq0DukBEADCNEkws5Yr oBmbu8789Xf006gTl5LzD/Hdt3sAp9iCfPgucO+l7U+xbo1XHTMJQwEVfS+Rx3Rb aLYRG+hU7FuJLQB/5NaCDNRuqw5KHyQtJUH+zo84IqqfMzG8aOSdHg1yr2xKH4QT mgQONBu/W0xEZmZro6TjYNwkk2pwXK2yuImZPUOy+mK1qF8Wm3hTtkPE+FFSNFIa eHDoTGmx/0Riu/K7dNJTrC0TlRpn2K6d60zB53YYTc+0DYSDyB0FupXiAx/+XEGn 3Q7eNi2BV6w50v5r51QP8zptiFflMfFKNAfV8xS5MteQd98YS5qqd/LPo3gS5HFP QaSL0k3RTClv7fQNHcZFqmv0OWpix6zm2npYxhqsTDGeSa52/uXehVXF5JubYFif MSLpbGVZqdrmG5hr2cycxsjFiY0zJOaRitmN/JWbOGLiwrcN4ukKNyFntFG5jPaF nJdx9rHfyJNeF9cgv9JlZeFxJ6WqIAhlKOuH3K8/py0SPE6ZOFfRo0YUxvh25K/s iOcPLm613aOxyY7YfQ8ME2vgn7I0mAtg9am+YFDabGqj839odwZdzZv2T2mUHnyb FTJFBuMWGWKYstYDS6eZEmhupbPvUKkDug/mO+gdo+pSKF9YS6DM5RtCdTNJq4NZ Y50ypBb5RSj+INHPocIp2V/DDTbzySsu6wARAQABiQIfBBgBCgAJBQJKtA7pAhsM AAoJEBDAHFovYFnnLe0P/i34oK5cE2LlqUEITEcTO94x1EX0UmtKokRfQ3AYWK8X eFD8cmSty72hMkL+1c0V//4Qc53SUyLIWXk8FKWF7hdL3zyuBqlRb55721CYC35G A/jR90p0k1vr701gaat2cNTOVC0/6H9cE5yYXT+zMr9TSiKCDwONhhSbmAJZc6X0 fgsmCD7I5xUI5VrihN/Wx0CZBtrXGUyE4hgFaYSGptZmkY5Ln1e+nI185Bda7bpL wcAIGrI9nYtVXgf71ybGKdPPtFfXIoPXuctn99M7NnWBhNuGDms2YWkOC7eeWBTx KkZDWR3vRmRy52B6GxR7USk/KXs7yqGPkfT/c4CZFfOurZUXXuC3PvOme0DQmqwE xtJormoG4Fy6suEFPrfhYMigTy7kSbVTCOBMjQLH+U/FFNshvg9+M/ZvaKT+0lpR vBSuG5ngsC0bO0xWsXhb6qfH2h53g4VcwFvCBL5IfqgAeUbCnGGHNcGWpmwdeb7D 7ahrNZSHEUUYR7lTbjkYS01/QDOcEwNZOqDRIJUQOOUq35721VeROkdhZmMZtFls QeQJsWoqGrQo/kEYicVlMVOgjmOOzOa5fRb/IqlGlBn4a4me3hWthLLtMy+OOEim 6ENjntVTBQiTP/YqrxWDbCkaD7b2e9wY5N3JlRxMIQHfcHaND3PRdQSn7oHYXmJl =8gQ0 -----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package aaa_base for openSUSE:13.1:Update checked in at 2014-10-01 12:59:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/aaa_base (Old) and /work/SRC/openSUSE:13.1:Update/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.WrCEsJ/_old 2014-10-01 12:59:12.000000000 +0200 +++ /var/tmp/diff_new_pack.WrCEsJ/_new 2014-10-01 12:59:12.000000000 +0200 @@ -1 +1 @@ -<link package='aaa_base.2908' cicount='copy' /> +<link package='aaa_base.3022' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.3022 for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 Oct '14

01 Oct '14

Hello community, here is the log from the commit of package patchinfo.3022 for openSUSE:13.1:Update checked in at 2014-10-01 12:59:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/patchinfo.3022 (Old) and /work/SRC/openSUSE:13.1:Update/.patchinfo.3022.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.3022" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <issue id="861124" tracker="bnc">add support for Fedora like additional actions to /sbin/service</issue> <issue id="882918" tracker="bnc">[HP HPS Bug] service command recommends using -l but does not recognize -l</issue> <issue id="860083" tracker="bnc">/sbin/service does not consider service alias links</issue> <issue id="880103" tracker="bnc">"rc<service> status" results "exit 0" in any case (backward incompatible change)</issue> <issue id="721682" tracker="bnc">CLEAR_TMP_DIRS_AT_BOOTUP does not work</issue> <category>recommended</category> <rating>moderate</rating> <packager>lnussel</packager> <description> The system base scripts in aaa_base were updated to fix various bugs: - remove no longer supported sysconfig settings (bnc#721682) - update service man page - always pass --full to systemctl (bnc#882918) - Enable service script to return LSB status exit values (bnc#880103) - implement legacy actions (bnc#861124) - Enable service script to reload systemd if required - handle targets in /sbin/service as well - Check systemd service using LoadState (bnc#860083) </description> <summary>aaa_base: various bugfixes</summary> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0