IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7825 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 54dae9b23c4a2909788b680e4100a3f1eb5da3a7
by git＠ipfire.org 10 Mar '10

10 Mar '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. b7202d9446b5afdac94d1f91a7e0a45804a0cc35
by git＠ipfire.org 10 Mar '10

10 Mar '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 69a840f3d84712af78267ff704b1e40ca42b77cb
by git＠ipfire.org 10 Mar '10

10 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 69a840f3d84712af78267ff704b1e40ca42b77cb (commit) from 07842dc180f3abd59748b2221b94165e0624b769 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 69a840f3d84712af78267ff704b1e40ca42b77cb Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Mar 10 22:24:30 2010 +0100 Fixded the gutenprint rootfile. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/gutenprint | 601 ++++++++++++++++++++++++++-------- 1 files changed, 460 insertions(+), 141 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/gutenprint b/config/rootfiles/packages/gutenprint index 69df945..6ebaae5 100644 --- a/config/rootfiles/packages/gutenprint +++ b/config/rootfiles/packages/gutenprint @@ -25,156 +25,456 @@ usr/bin/testpattern #usr/include/gutenprint/vars.h #usr/include/gutenprint/weave.h #usr/include/gutenprint/xml.h -#usr/include/gutenprintui #usr/include/gutenprintui2 -usr/lib/cups/backend/canon -usr/lib/cups/backend/epson -usr/lib/cups/driver/gutenprint.5.0 +usr/lib/cups/driver/gutenprint.5.2 usr/lib/cups/filter/commandtocanon usr/lib/cups/filter/commandtoepson -usr/lib/cups/filter/rastertogutenprint.5.0 -#usr/lib/gimp -#usr/lib/gimp/1.2 -#usr/lib/gimp/1.2/plug-ins +usr/lib/cups/filter/rastertogutenprint.5.2 #usr/lib/gutenprint -#usr/lib/gutenprint/5.0.2 -usr/lib/gutenprint/5.0.2/modules +usr/lib/gutenprint/5.2 +usr/lib/gutenprint/5.2/modules #usr/lib/libgutenprint.a #usr/lib/libgutenprint.la usr/lib/libgutenprint.so usr/lib/libgutenprint.so.2 -usr/lib/libgutenprint.so.2.0.0 +usr/lib/libgutenprint.so.2.0.6 #usr/lib/pkgconfig/gutenprint.pc -usr/sbin/cups-genppd.5.0 -usr/sbin/cups-genppdconfig.5.0 -usr/sbin/cups-genppdupdate.5.0 +usr/sbin/cups-genppd.5.2 +usr/sbin/cups-genppdupdate usr/share/cups/calibrate.ppm -usr/share/foomatic/db/source/driver/gutenprint-ijs-simplified.5.0.xml -usr/share/foomatic/db/source/driver/gutenprint-ijs.5.0.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-color.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-model.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-pagesize.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-printoutmode.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-resolution.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_borderless.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_brightness-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_cdinnerradius.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_contrast-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_duplex.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_fullbleed.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_imagetype.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_inkset.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_inktype.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_inputslot.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_laminate.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_mediatype.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_quality.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_resolution.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.0-stp_usegloss.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-color.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-model.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-pagesize.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-printoutmode.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-resolution.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_adjustdotsize.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_blackdensity-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_blackgamma-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_blacktrans-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_bluedensity-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_borderless.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_brightness-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_cdinnerradius.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_cdxadjustment-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_cdyadjustment-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_colorcorrection.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_contrast-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_cyanbalance-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_cyandensity-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_cyangamma-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_darkgraytransition-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_darkyellowtransition-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_density-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_ditheralgorithm.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_duplex.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enableblackdensity.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enableblackgamma.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enableblacktrans.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablebluedensity.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablecyanbalance.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablecyandensity.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablecyangamma.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enabledarkgraytransition.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enabledarkyellowtransition.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enabledensity.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablegamma.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablegcrlower.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablegcrupper.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enableglosslimit.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablegray1transition.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablegray2transition.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablegray3transition.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablegraytransition.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enableinklimit.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablelightcyantransition.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablelightgraytransition.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablelightmagentatransition.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablelightyellowtransition.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablemagentabalance.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablemagentadensity.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablemagentagamma.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enablereddensity.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enableyellowbalance.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enableyellowdensity.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_enableyellowgamma.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_fullbleed.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_gamma-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_gcrlower-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_gcrupper-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_glosslimit-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_gray1transition-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_gray2transition-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_gray3transition-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_graytransition-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_imagetype.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_inklimit-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_inklimit-2.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_inklimit-3.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_inklimit-4.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_inklimit-5.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_inklimit-6.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_inkset.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_inktype.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_inputslot.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_laminate.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_lightcyantransition-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_lightgraytransition-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_lightmagentatransition-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_lightyellowtransition-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_linearcontrast.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_magentabalance-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_magentadensity-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_magentagamma-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_mediatype.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_printingdirection.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_quality.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_reddensity-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_resolution.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_usegloss.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_weave.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_yellowbalance-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_yellowdensity-1.xml -usr/share/foomatic/db/source/opt/gutenprint-ijs.5.0-stp_yellowgamma-1.xml +usr/share/foomatic/db/source/driver/gutenprint-ijs-simplified.5.2.xml +usr/share/foomatic/db/source/driver/gutenprint-ijs.5.2.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-color.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-model.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-pagesize.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-printoutmode.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-resolution.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_borderless.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_brightness-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_cdinnerradius.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_colorcorrection.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_contrast-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_duplex.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_fullbleed.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_imagetype.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_inkset.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_inktype.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_inputslot.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_laminate.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_mediatype.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_quality.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_resolution.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs-simplified.5.2-stp_usegloss.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-color.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-model.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-pagesize.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-printoutmode.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-resolution.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_bandenhancement-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_blackdensity-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_blackgamma-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_blacktrans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_bluedensity-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_borderless.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_brightness-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdinnerradius.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdxadjustment-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdyadjustment-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_colorcorrection.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_contrast-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cyanbalance-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cyandensity-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cyangamma-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_darkgrayscale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_darkgraytrans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_darkgrayvalue-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_darkyellowscale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_darkyellowtrans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_darkyellowvalue-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_density-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_ditheralgorithm.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_dropsize1-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_dropsize2-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_dropsize3-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_duplex.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablebandenhancement.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableblackdensity.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableblackgamma.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableblacktrans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablebluedensity.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablecyanbalance.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablecyandensity.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablecyangamma.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enabledarkgrayscale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enabledarkgraytrans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enabledarkgrayvalue.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enabledarkyellowscale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enabledarkyellowtrans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enabledarkyellowvalue.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enabledensity.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enabledropsize1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enabledropsize2.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enabledropsize3.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablefeedadjustment.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablefeedsequence.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegamma.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegcrlower.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegcrupper.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableglosslimit.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegray1scale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegray1trans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegray1value.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegray2scale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegray2trans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegray2value.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegray3scale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegray3trans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegray3value.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegrayscale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegraytrans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablegrayvalue.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray1scale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray1trans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray1value.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray2scale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray2trans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray2value.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray3scale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray3trans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray3value.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray4scale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray4trans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray4value.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray5scale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray5trans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablehgray5value.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableinklimit.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablelightcyanscale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablelightcyantrans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablelightcyanvalue.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablelightgrayscale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablelightgraytrans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablelightgrayvalue.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablelightmagentascale.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablelightmagentatrans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablelightmagentavalue.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablelightyellowtrans.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablemagentabalance.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablemagentadensity.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablemagentagamma.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableorangedensity.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablepaperthickness.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableplatengap.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableprintmethod.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablereddensity.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablevacuumintensity.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableyellowbalance.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableyellowdensity.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableyellowgamma.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_feedadjustment-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_feedsequence-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_fullbleed.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gamma-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gcrlower-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gcrupper-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_glosslimit-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gray1scale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gray1trans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gray1value-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gray2scale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gray2trans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gray2value-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gray3scale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gray3trans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_gray3value-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_grayscale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_graytrans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_grayvalue-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray1scale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray1trans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray1value-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray2scale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray2trans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray2value-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray3scale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray3trans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray3value-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray4scale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray4trans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray4value-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray5scale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray5trans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_hgray5value-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_imagetype.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-2.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-3.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-4.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-5.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-6.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inkset.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inktype.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inputslot.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_laminate.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightcyanscale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightcyantrans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightcyantrans-2.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightcyanvalue-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightgrayscale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightgraytrans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightgrayvalue-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightmagentascale-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightmagentatrans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightmagentatrans-2.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightmagentavalue-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_lightyellowtrans-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_linearcontrast.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_magentabalance-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_magentadensity-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_magentagamma-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_mediatype.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_orangedensity-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_paperthickness-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_platengap-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_printingdirection.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_printmethod-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_quality.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_reddensity-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_resolution.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_usegloss.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_vacuumintensity-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_weave.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_yellowbalance-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_yellowdensity-1.xml +usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_yellowgamma-1.xml usr/share/foomatic/kitload.log #usr/share/gutenprint -#usr/share/gutenprint/5.0.2 -#usr/share/gutenprint/5.0.2/xml -usr/share/gutenprint/5.0.2/xml/dither-matrix-1x1.xml -usr/share/gutenprint/5.0.2/xml/dither-matrix-2x1.xml -usr/share/gutenprint/5.0.2/xml/dither-matrix-4x1.xml -usr/share/gutenprint/5.0.2/xml/papers.xml -usr/share/gutenprint/5.0.2/xml/printers.xml +usr/share/gutenprint/5.2 +usr/share/gutenprint/5.2/xml +usr/share/gutenprint/5.2/xml/dither-matrix-1x1.xml +usr/share/gutenprint/5.2/xml/dither-matrix-2x1.xml +usr/share/gutenprint/5.2/xml/dither-matrix-4x1.xml +usr/share/gutenprint/5.2/xml/escp2 +usr/share/gutenprint/5.2/xml/escp2/inks +usr/share/gutenprint/5.2/xml/escp2/inks/artisan.xml +usr/share/gutenprint/5.2/xml/escp2/inks/b500.xml +usr/share/gutenprint/5.2/xml/escp2/inks/c120.xml +usr/share/gutenprint/5.2/xml/escp2/inks/c64.xml +usr/share/gutenprint/5.2/xml/escp2/inks/c80.xml +usr/share/gutenprint/5.2/xml/escp2/inks/c82.xml +usr/share/gutenprint/5.2/xml/escp2/inks/claria.xml +usr/share/gutenprint/5.2/xml/escp2/inks/cmy.xml +usr/share/gutenprint/5.2/xml/escp2/inks/cmykrb.xml +usr/share/gutenprint/5.2/xml/escp2/inks/cmykro.xml +usr/share/gutenprint/5.2/xml/escp2/inks/cx3650.xml +usr/share/gutenprint/5.2/xml/escp2/inks/defaultblack.xml +usr/share/gutenprint/5.2/xml/escp2/inks/f360.xml +usr/share/gutenprint/5.2/xml/escp2/inks/f360_photo.xml +usr/share/gutenprint/5.2/xml/escp2/inks/f360_photo7_japan.xml +usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome.xml +usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3.xml +usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3v.xml +usr/share/gutenprint/5.2/xml/escp2/inks/nx100.xml +usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen0.xml +usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen1.xml +usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen2.xml +usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen3.xml +usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen3_4.xml +usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen4.xml +usr/share/gutenprint/5.2/xml/escp2/inks/photo_pigment.xml +usr/share/gutenprint/5.2/xml/escp2/inks/picturemate_4.xml +usr/share/gutenprint/5.2/xml/escp2/inks/picturemate_6.xml +usr/share/gutenprint/5.2/xml/escp2/inks/pro_gen1.xml +usr/share/gutenprint/5.2/xml/escp2/inks/pro_gen2.xml +usr/share/gutenprint/5.2/xml/escp2/inks/pro_pigment.xml +usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome.xml +usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml +usr/share/gutenprint/5.2/xml/escp2/inks/standard.xml +usr/share/gutenprint/5.2/xml/escp2/inks/standard_gen0.xml +usr/share/gutenprint/5.2/xml/escp2/inks/ultrachrome.xml +usr/share/gutenprint/5.2/xml/escp2/inks/wf40.xml +usr/share/gutenprint/5.2/xml/escp2/inks/wf500.xml +usr/share/gutenprint/5.2/xml/escp2/inks/x80.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots +usr/share/gutenprint/5.2/xml/escp2/inputslots/artisan.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/b500.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/cd.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_roll_feed.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/cutter_roll_feed.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/default.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/pro_roll_feed.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/r1800.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/r2400.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/r2880.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/rx680.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/rx700.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/spro5000.xml +usr/share/gutenprint/5.2/xml/escp2/inputslots/standard_roll_feed.xml +usr/share/gutenprint/5.2/xml/escp2/media +usr/share/gutenprint/5.2/xml/escp2/media/artisan.xml +usr/share/gutenprint/5.2/xml/escp2/media/b500.xml +usr/share/gutenprint/5.2/xml/escp2/media/c120.xml +usr/share/gutenprint/5.2/xml/escp2/media/c64.xml +usr/share/gutenprint/5.2/xml/escp2/media/c80.xml +usr/share/gutenprint/5.2/xml/escp2/media/c82.xml +usr/share/gutenprint/5.2/xml/escp2/media/claria.xml +usr/share/gutenprint/5.2/xml/escp2/media/claria1400.xml +usr/share/gutenprint/5.2/xml/escp2/media/cmy.xml +usr/share/gutenprint/5.2/xml/escp2/media/cmykrb.xml +usr/share/gutenprint/5.2/xml/escp2/media/cmykro.xml +usr/share/gutenprint/5.2/xml/escp2/media/cx3650.xml +usr/share/gutenprint/5.2/xml/escp2/media/f360.xml +usr/share/gutenprint/5.2/xml/escp2/media/f360_photo.xml +usr/share/gutenprint/5.2/xml/escp2/media/f360_photo7_japan.xml +usr/share/gutenprint/5.2/xml/escp2/media/f360_ultrachrome.xml +usr/share/gutenprint/5.2/xml/escp2/media/f360_ultrachrome_k3.xml +usr/share/gutenprint/5.2/xml/escp2/media/f360_ultrachrome_k3v.xml +usr/share/gutenprint/5.2/xml/escp2/media/nx100.xml +usr/share/gutenprint/5.2/xml/escp2/media/photo_gen0.xml +usr/share/gutenprint/5.2/xml/escp2/media/photo_gen1.xml +usr/share/gutenprint/5.2/xml/escp2/media/photo_gen2.xml +usr/share/gutenprint/5.2/xml/escp2/media/photo_gen3.xml +usr/share/gutenprint/5.2/xml/escp2/media/photo_gen3_4.xml +usr/share/gutenprint/5.2/xml/escp2/media/photo_gen4.xml +usr/share/gutenprint/5.2/xml/escp2/media/photo_pigment.xml +usr/share/gutenprint/5.2/xml/escp2/media/picturemate_4.xml +usr/share/gutenprint/5.2/xml/escp2/media/picturemate_6.xml +usr/share/gutenprint/5.2/xml/escp2/media/pro_gen1.xml +usr/share/gutenprint/5.2/xml/escp2/media/pro_gen2.xml +usr/share/gutenprint/5.2/xml/escp2/media/pro_pigment.xml +usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome.xml +usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3.xml +usr/share/gutenprint/5.2/xml/escp2/media/r800.xml +usr/share/gutenprint/5.2/xml/escp2/media/standard.xml +usr/share/gutenprint/5.2/xml/escp2/media/standard_gen0.xml +usr/share/gutenprint/5.2/xml/escp2/media/ultrachrome.xml +usr/share/gutenprint/5.2/xml/escp2/media/wf500.xml +usr/share/gutenprint/5.2/xml/escp2/media/x80.xml +usr/share/gutenprint/5.2/xml/escp2/mediasizes +usr/share/gutenprint/5.2/xml/escp2/mediasizes/standard.xml +usr/share/gutenprint/5.2/xml/escp2/model +usr/share/gutenprint/5.2/xml/escp2/model/model_0.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_1.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_10.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_100.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_11.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_12.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_13.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_14.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_15.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_16.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_17.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_18.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_19.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_2.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_20.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_21.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_22.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_23.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_24.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_25.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_26.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_27.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_28.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_29.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_3.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_30.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_31.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_32.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_33.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_34.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_35.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_36.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_37.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_38.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_39.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_4.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_40.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_41.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_42.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_43.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_44.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_45.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_46.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_47.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_48.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_49.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_5.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_50.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_51.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_52.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_53.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_54.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_55.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_56.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_57.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_58.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_59.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_6.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_60.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_61.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_62.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_63.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_64.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_65.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_66.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_67.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_68.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_69.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_7.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_70.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_71.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_72.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_73.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_74.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_75.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_76.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_77.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_78.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_79.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_8.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_80.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_81.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_82.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_83.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_84.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_85.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_86.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_87.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_88.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_89.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_9.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_90.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_91.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_92.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_93.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_94.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_95.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_96.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_97.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_98.xml +usr/share/gutenprint/5.2/xml/escp2/model/model_99.xml +usr/share/gutenprint/5.2/xml/escp2/qualitypresets +usr/share/gutenprint/5.2/xml/escp2/qualitypresets/p1_5.xml +usr/share/gutenprint/5.2/xml/escp2/qualitypresets/picturemate.xml +usr/share/gutenprint/5.2/xml/escp2/qualitypresets/standard.xml +usr/share/gutenprint/5.2/xml/escp2/qualitypresets/v2880.xml +usr/share/gutenprint/5.2/xml/escp2/qualitypresets/wf40.xml +usr/share/gutenprint/5.2/xml/escp2/weaves +usr/share/gutenprint/5.2/xml/escp2/weaves/pro7000.xml +usr/share/gutenprint/5.2/xml/escp2/weaves/pro7500.xml +usr/share/gutenprint/5.2/xml/escp2/weaves/pro7600.xml +usr/share/gutenprint/5.2/xml/escp2/weaves/standard.xml +usr/share/gutenprint/5.2/xml/papers.xml +usr/share/gutenprint/5.2/xml/printers.xml #usr/share/gutenprint/doc +#usr/share/gutenprint/doc/AUTHORS +#usr/share/gutenprint/doc/COPYING +#usr/share/gutenprint/doc/ChangeLog #usr/share/gutenprint/doc/FAQ.html +#usr/share/gutenprint/doc/NEWS +#usr/share/gutenprint/doc/README #usr/share/gutenprint/doc/gutenprint-users-manual.odt #usr/share/gutenprint/doc/gutenprint-users-manual.pdf #usr/share/gutenprint/doc/gutenprint.pdf @@ -205,24 +505,43 @@ usr/share/gutenprint/samples/extended.sample usr/share/gutenprint/samples/profile.jpg usr/share/gutenprint/samples/testpattern.sample #usr/share/locale/cs/LC_MESSAGES/gutenprint.mo +#usr/share/locale/cs/gutenprint_cs.po #usr/share/locale/da/LC_MESSAGES/gutenprint.mo +#usr/share/locale/da/gutenprint_da.po usr/share/locale/de/LC_MESSAGES/gutenprint.mo +usr/share/locale/de/gutenprint_de.po #usr/share/locale/el/LC_MESSAGES/gutenprint.mo -#usr/share/locale/en_GB/LC_MESSAGES/gutenprint.mo -#usr/share/locale/es/LC_MESSAGES/gutenprint.mo -#usr/share/locale/fr/LC_MESSAGES/gutenprint.mo +#usr/share/locale/el/gutenprint_el.po +usr/share/locale/en_GB/LC_MESSAGES/gutenprint.mo +usr/share/locale/en_GB/gutenprint_en_GB.po +usr/share/locale/es/LC_MESSAGES/gutenprint.mo +usr/share/locale/es/gutenprint_es.po +usr/share/locale/fr/LC_MESSAGES/gutenprint.mo +usr/share/locale/fr/gutenprint_fr.po #usr/share/locale/hu/LC_MESSAGES/gutenprint.mo +#usr/share/locale/hu/gutenprint_hu.po +#usr/share/locale/it/LC_MESSAGES/gutenprint.mo +#usr/share/locale/it/gutenprint_it.po #usr/share/locale/ja/LC_MESSAGES/gutenprint.mo +#usr/share/locale/ja/gutenprint_ja.po #usr/share/locale/nb/LC_MESSAGES/gutenprint.mo +#usr/share/locale/nb/gutenprint_nb.po #usr/share/locale/nl/LC_MESSAGES/gutenprint.mo +#usr/share/locale/nl/gutenprint_nl.po #usr/share/locale/pl/LC_MESSAGES/gutenprint.mo +#usr/share/locale/pl/gutenprint_pl.po #usr/share/locale/pt/LC_MESSAGES/gutenprint.mo +#usr/share/locale/pt/gutenprint_pt.po +usr/share/locale/ru/LC_MESSAGES/gutenprint.mo +usr/share/locale/ru/gutenprint_ru.po #usr/share/locale/sk/LC_MESSAGES/gutenprint.mo +#usr/share/locale/sk/gutenprint_sk.po #usr/share/locale/sv/LC_MESSAGES/gutenprint.mo +#usr/share/locale/sv/gutenprint_sv.po #usr/share/locale/zh_TW/LC_MESSAGES/gutenprint.mo +#usr/share/locale/zh_TW/gutenprint_zh_TW.po #usr/share/man/man1/escputil.1 #usr/share/man/man8/cups-calibrate.8 #usr/share/man/man8/cups-genppd.8 -#usr/share/man/man8/cups-genppdconfig.8 #usr/share/man/man8/cups-genppdupdate.8 -var/ipfire/cups/command.types +var/ipfire/cups/command.types \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 98a5af50fff364c64d03be34eb821e153081190d
by git＠ipfire.org 10 Mar '10

10 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 98a5af50fff364c64d03be34eb821e153081190d (commit) via cf62eca5ea5ad23295fb98f3b96b6d154043b2f4 (commit) via dcaa666f924abe4e7bd09c66790a5c58d27a84a8 (commit) via 8f30d55245acec290c7558c99a3452221d65f0d3 (commit) from 822fa11f38838f5d27d380dcb5445063f0200e87 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 98a5af50fff364c64d03be34eb821e153081190d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 10 21:22:44 2010 +0100 Add resize2fs to e2fsprogs rootfile. commit cf62eca5ea5ad23295fb98f3b96b6d154043b2f4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 10 21:21:30 2010 +0100 Updated openswan (git-20100309). commit dcaa666f924abe4e7bd09c66790a5c58d27a84a8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 8 12:19:36 2010 +0100 gutenprint: Bump release version. commit 8f30d55245acec290c7558c99a3452221d65f0d3 Author: Jorrit de Jonge <jorritdejonge(a)gmail.com> Date: Mon Mar 8 02:31:42 2010 -0800 Updated gutenprint to version 5.2.5 Signed-off-by: Schantl Stefan <Stevee(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/e2fsprogs | 2 +- lfs/gutenprint | 6 +++--- lfs/openswan | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs index 320f80c..57ff884 100644 --- a/config/rootfiles/common/e2fsprogs +++ b/config/rootfiles/common/e2fsprogs @@ -26,7 +26,7 @@ sbin/fsck.ext3 sbin/mke2fs sbin/mkfs.ext2 sbin/mkfs.ext3 -#sbin/resize2fs +sbin/resize2fs sbin/tune2fs usr/bin/chattr #usr/bin/compile_et diff --git a/lfs/gutenprint b/lfs/gutenprint index 81b3660..a1bc343 100644 --- a/lfs/gutenprint +++ b/lfs/gutenprint @@ -24,7 +24,7 @@ include Config -VER = 5.0.2 +VER = 5.2.5 THISAPP = gutenprint-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = gutenprint -PAK_VER = 1 +PAK_VER = 2 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ca6c45616caa720e9e185817272b08d7 +$(DL_FILE)_MD5 = 10a0a9fac081d8116ec5ed47fbc1591c install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) diff --git a/lfs/openswan b/lfs/openswan index 05a0650..a5d6520 100644 --- a/lfs/openswan +++ b/lfs/openswan @@ -30,10 +30,10 @@ else VERSUFIX=ipfire endif -VER = 2.6.24 +VER = git-20100309 -THISAPP = openswan-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = openswan.git +DL_FILE = openswan.$(VER).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -51,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1c76b6982c05392f7c360afb92699661 +$(DL_FILE)_MD5 = f23b716b8ffb242436d8e713d93d209c install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 822fa11f38838f5d27d380dcb5445063f0200e87
by git＠ipfire.org 10 Mar '10

10 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 822fa11f38838f5d27d380dcb5445063f0200e87 (commit) via a443986b63989d14e622c3750d047bbe0c1ae8ef (commit) via a8844147ebe6216fffa100ec7d1cd570220d1a32 (commit) via fb25052fb3f254f21a3d65273f606374d56aa00d (commit) via 6803ea5902156881c55829f108a4273e7db0f259 (commit) from 139a9b4fa189c63c94544a556e593e8c83c07a05 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 822fa11f38838f5d27d380dcb5445063f0200e87 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 10 14:24:26 2010 +0100 Update packages-list.txt. commit a443986b63989d14e622c3750d047bbe0c1ae8ef Merge: a8844147ebe6216fffa100ec7d1cd570220d1a32 fb25052fb3f254f21a3d65273f606374d56aa00d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 10 14:24:12 2010 +0100 Merge branch 'cryptodev' into next commit a8844147ebe6216fffa100ec7d1cd570220d1a32 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 10 14:23:43 2010 +0100 kernel: Enable tickless system on std kernel. commit fb25052fb3f254f21a3d65273f606374d56aa00d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 10 00:18:18 2010 +0100 Add cryptodev support to kernel. commit 6803ea5902156881c55829f108a4273e7db0f259 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 10 00:16:45 2010 +0100 Add cryptodev support to kernel. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 5 +- doc/packages-list.txt | 2 + lfs/{v4l-dvb => cryptodev} | 21 ++++--- lfs/openssl | 1 + make.sh | 2 + src/patches/openssl-0.9.8k-cryptodev.diff | 101 +++++++++++++++++++++++++++++ 6 files changed, 121 insertions(+), 11 deletions(-) copy lfs/{v4l-dvb => cryptodev} (89%) create mode 100644 src/patches/openssl-0.9.8k-cryptodev.diff Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 28dd0c6..aab5582 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.9-ipfire -# Sat Feb 27 16:19:37 2010 +# Wed Mar 10 13:22:52 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -194,7 +194,7 @@ CONFIG_FREEZER=y # Processor type and features # CONFIG_TICK_ONESHOT=y -# CONFIG_NO_HZ is not set +CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y @@ -442,6 +442,7 @@ CONFIG_X86_SPEEDSTEP_LIB=m # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y # # Bus options (PCI etc.) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 8f02a4c..eb98dab 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -70,6 +70,8 @@ * coreutils-5.96 * cpio-2.6 * cpufrequtils-007 +* cryptodev-20091126-kmod-2.6.32.9-ipfire +* cryptodev-20091126-kmod-2.6.32.9-ipfire-xen * cups-1.4.2 * curl-7.19.5 * cyrus-imapd-2.2.12 diff --git a/lfs/cryptodev b/lfs/cryptodev new file mode 100644 index 0000000..5c1646b --- /dev/null +++ b/lfs/cryptodev @@ -0,0 +1,90 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +ifeq "$(XEN)" "1" + VERSUFIX=ipfire-xen +else + VERSUFIX=ipfire +endif + +VER = 20091126 + +THISAPP = cryptodev-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 26ffa32ef75bea7e980ab66166616e95 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + $(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make build \ + KERNEL_DIR=/lib/modules/$(KVER)-$(VERSUFIX)/build + + -mkdir -pv /usr/include/crypto + cd $(DIR_APP) && make install \ + KERNEL_DIR=/lib/modules/$(KVER)-$(VERSUFIX)/build + ln -svf ../crypto/cryptodev.h /usr/include/linux/cryptodev.h + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/openssl b/lfs/openssl index 96c66bb..eaa5d65 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8k-cryptodev.diff ifeq "$(PADLOCK)" "1" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8g-engine-padlock.patch endif diff --git a/make.sh b/make.sh index c7a6924..6a7c63a 100755 --- a/make.sh +++ b/make.sh @@ -351,6 +351,7 @@ buildipfire() { ipfiremake openswan XEN=1 KMOD=1 #ipfiremake mISDN XEN=1 #ipfiremake compat-wireless XEN=1 + ipfiremake cryptodev XEN=1 ipfiremake linux ipfiremake kqemu #ipfiremake kvm-kmod @@ -361,6 +362,7 @@ buildipfire() { ipfiremake openswan KMOD=1 #ipfiremake mISDN #ipfiremake compat-wireless + ipfiremake cryptodev ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio diff --git a/src/patches/openssl-0.9.8k-cryptodev.diff b/src/patches/openssl-0.9.8k-cryptodev.diff new file mode 100644 index 0000000..0a4793a --- /dev/null +++ b/src/patches/openssl-0.9.8k-cryptodev.diff @@ -0,0 +1,101 @@ +diff -ur openssl-0.9.8k/crypto/engine/eng_all.c openssl-0.9.8k.new/crypto/engine/eng_all.c +--- openssl-0.9.8k/crypto/engine/eng_all.c 2008-06-04 21:01:39.000000000 +0300 ++++ openssl-0.9.8k.new/crypto/engine/eng_all.c 2009-11-24 13:41:49.000000000 +0200 +@@ -104,16 +104,15 @@ + #endif + #endif + #ifndef OPENSSL_NO_HW +-#if defined(__OpenBSD__) || defined(__FreeBSD__) ++# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || defined(__linux__) + ENGINE_load_cryptodev(); +-#endif ++# endif + #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) + ENGINE_load_capi(); + #endif + #endif + } + +-#if defined(__OpenBSD__) || defined(__FreeBSD__) + void ENGINE_setup_bsd_cryptodev(void) { + static int bsd_cryptodev_default_loaded = 0; + if (!bsd_cryptodev_default_loaded) { +@@ -122,4 +121,3 @@ + } + bsd_cryptodev_default_loaded=1; + } +-#endif +diff -ur openssl-0.9.8k/crypto/engine/eng_cryptodev.c openssl-0.9.8k.new/crypto/engine/eng_cryptodev.c +--- openssl-0.9.8k/crypto/engine/eng_cryptodev.c 2004-06-15 14:45:42.000000000 +0300 ++++ openssl-0.9.8k.new/crypto/engine/eng_cryptodev.c 2009-11-24 13:45:31.000000000 +0200 +@@ -34,14 +34,15 @@ + #if (defined(__unix__) || defined(unix)) && !defined(USG) && \ + (defined(OpenBSD) || defined(__FreeBSD_version)) + #include <sys/param.h> +-# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) +-# define HAVE_CRYPTODEV +-# endif + # if (OpenBSD >= 200110) + # define HAVE_SYSLOG_R + # endif + #endif + ++#if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || defined(__linux__) ++# define HAVE_CRYPTODEV ++#endif ++ + #ifndef HAVE_CRYPTODEV + + void +@@ -54,7 +55,12 @@ + #else + + #include <sys/types.h> +-#include <crypto/cryptodev.h> ++#if defined(__linux__) ++# include <linux/cryptodev.h> ++# define HAVE_CRYPTODEV_NAME ++#else ++# include <crypto/cryptodev.h> ++#endif + #include <sys/ioctl.h> + #include <errno.h> + #include <stdio.h> +@@ -77,7 +83,11 @@ + static int get_dev_crypto(void); + static int cryptodev_max_iv(int cipher); + static int cryptodev_key_length_valid(int cipher, int len); +-static int cipher_nid_to_cryptodev(int nid); ++#ifndef HAVE_CRYPTODEV_NAME ++ static int cipher_nid_to_cryptodev(int nid); ++#else ++ static char *cipher_nid_to_cryptodev_name(int nid); ++#endif + static int get_cryptodev_ciphers(const int **cnids); + static int get_cryptodev_digests(const int **cnids); + static int cryptodev_usable_ciphers(const int **nids); +diff -ur openssl-0.9.8k/crypto/engine/engine.h openssl-0.9.8k.new/crypto/engine/engine.h +--- openssl-0.9.8k/crypto/engine/engine.h 2008-06-04 21:01:40.000000000 +0300 ++++ openssl-0.9.8k.new/crypto/engine/engine.h 2009-11-24 13:41:49.000000000 +0200 +@@ -703,9 +703,7 @@ + * values. */ + void *ENGINE_get_static_state(void); + +-#if defined(__OpenBSD__) || defined(__FreeBSD__) + void ENGINE_setup_bsd_cryptodev(void); +-#endif + + /* BEGIN ERROR CODES */ + /* The following lines are auto generated by the script mkerr.pl. Any changes +diff -ur openssl-0.9.8k/crypto/evp/c_all.c openssl-0.9.8k.new/crypto/evp/c_all.c +--- openssl-0.9.8k/crypto/evp/c_all.c 2004-08-29 19:36:04.000000000 +0300 ++++ openssl-0.9.8k.new/crypto/evp/c_all.c 2009-11-24 13:41:49.000000000 +0200 +@@ -83,8 +83,6 @@ + OpenSSL_add_all_ciphers(); + OpenSSL_add_all_digests(); + #ifndef OPENSSL_NO_ENGINE +-# if defined(__OpenBSD__) || defined(__FreeBSD__) + ENGINE_setup_bsd_cryptodev(); +-# endif + #endif + } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 139a9b4fa189c63c94544a556e593e8c83c07a05
by git＠ipfire.org 09 Mar '10

09 Mar '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2f2b526964081aab5872404691c2c3615e45da12
by git＠ipfire.org 09 Mar '10

09 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 2f2b526964081aab5872404691c2c3615e45da12 (commit) via 0b34d1a225efdf278a72abb9d5a8eaed6bd206df (commit) via b7b168eb8925a888b2091fc144f07f9f818b40e3 (commit) from 48cd21cdc0bf64193bfe42b4073412d510373868 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2f2b526964081aab5872404691c2c3615e45da12 Merge: 0b34d1a225efdf278a72abb9d5a8eaed6bd206df 48cd21cdc0bf64193bfe42b4073412d510373868 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 9 21:46:44 2010 +0100 Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next commit 0b34d1a225efdf278a72abb9d5a8eaed6bd206df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 9 21:45:15 2010 +0100 installer: Enhancement for handling SATA drives. Benutzer reported that his SATA dvd drive is not useable by the installer. We now load the ahci handler to enable support for SATA. commit b7b168eb8925a888b2091fc144f07f9f818b40e3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 9 21:43:31 2010 +0100 Add mkfs.vfat and mtools to distribution. This was requested by a user to handle his usb hdds. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/dosfstools | 12 ++++++------ config/rootfiles/common/mtools | 2 +- src/install+setup/install/main.c | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/rootfiles/common/dosfstools b/config/rootfiles/common/dosfstools index eba686f..f4c82df 100644 --- a/config/rootfiles/common/dosfstools +++ b/config/rootfiles/common/dosfstools @@ -1,9 +1,9 @@ -#sbin/dosfsck -#sbin/fsck.msdos -#sbin/fsck.vfat -#sbin/mkdosfs -#sbin/mkfs.msdos -#sbin/mkfs.vfat +sbin/dosfsck +sbin/fsck.msdos +sbin/fsck.vfat +sbin/mkdosfs +sbin/mkfs.msdos +sbin/mkfs.vfat #usr/man/man8/dosfsck.8 #usr/man/man8/fsck.msdos.8 #usr/man/man8/fsck.vfat.8 diff --git a/config/rootfiles/common/mtools b/config/rootfiles/common/mtools index 9de61c4..d4c5421 100644 --- a/config/rootfiles/common/mtools +++ b/config/rootfiles/common/mtools @@ -23,7 +23,7 @@ #usr/bin/mrd #usr/bin/mren #usr/bin/mshowfat -#usr/bin/mtools +usr/bin/mtools #usr/bin/mtoolstest #usr/bin/mtype #usr/bin/mxtar diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 76d37c2..a1dd90d 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -125,6 +125,7 @@ int main(int argc, char *argv[]) mysystem("/sbin/modprobe sr_mod"); mysystem("/sbin/modprobe usb-storage"); mysystem("/sbin/modprobe usbhid"); + mysystem("/sbin/modprobe ahci"); mysystem("/sbin/modprobe iso9660"); // CDROM mysystem("/sbin/modprobe ext2"); // Boot patition hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 48cd21cdc0bf64193bfe42b4073412d510373868
by git＠ipfire.org 09 Mar '10

09 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 48cd21cdc0bf64193bfe42b4073412d510373868 (commit) via a5420c0edbdc460665c1e4211e3e5a15ff635447 (commit) via c7a9f93ee4d3e2a395c1f5890d66cab2e16fba78 (commit) from 05ffd50f499d7090c4224f604dccaf1ce53a2452 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 48cd21cdc0bf64193bfe42b4073412d510373868 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 9 20:37:44 2010 +0100 Updated openssh (5.4p1). commit a5420c0edbdc460665c1e4211e3e5a15ff635447 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 9 20:37:12 2010 +0100 Updated openssl (0.9.8m). commit c7a9f93ee4d3e2a395c1f5890d66cab2e16fba78 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 9 20:35:42 2010 +0100 Updated apache (2.2.15). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/apache2 | 5 ++- config/rootfiles/common/openssh | 3 +- config/rootfiles/common/openssl | 73 ++++++++++++++++++++++++++++++++++++-- doc/packages-list.txt | 6 ++-- lfs/apache2 | 4 +- lfs/openssh | 4 +- lfs/openssl | 4 +- 7 files changed, 84 insertions(+), 15 deletions(-) Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index d7df625..e6abdc2 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -740,6 +740,8 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_proxy_http.html.en #srv/web/ipfire/manual/mod/mod_proxy_scgi.html #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en +#srv/web/ipfire/manual/mod/mod_reqtimeout.html +#srv/web/ipfire/manual/mod/mod_reqtimeout.html.en #srv/web/ipfire/manual/mod/mod_rewrite.html #srv/web/ipfire/manual/mod/mod_rewrite.html.en #srv/web/ipfire/manual/mod/mod_setenvif.html @@ -1242,6 +1244,7 @@ usr/lib/apache/mod_proxy_connect.so usr/lib/apache/mod_proxy_ftp.so usr/lib/apache/mod_proxy_http.so usr/lib/apache/mod_proxy_scgi.so +usr/lib/apache/mod_reqtimeout.so usr/lib/apache/mod_rewrite.so usr/lib/apache/mod_setenvif.so usr/lib/apache/mod_speling.so @@ -1259,7 +1262,7 @@ usr/lib/apache/mod_vhost_alias.so #usr/lib/libapr-1.la usr/lib/libapr-1.so usr/lib/libapr-1.so.0 -usr/lib/libapr-1.so.0.3.9 +usr/lib/libapr-1.so.0.4.2 #usr/lib/libaprutil-1.a #usr/lib/libaprutil-1.la usr/lib/libaprutil-1.so diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh index e86c53b..faae918 100644 --- a/config/rootfiles/common/openssh +++ b/config/rootfiles/common/openssh @@ -19,8 +19,8 @@ usr/bin/ssh-keyscan #usr/lib/openssh usr/lib/openssh/sftp-server usr/lib/openssh/ssh-keysign +usr/lib/openssh/ssh-pkcs11-helper usr/sbin/sshd -#usr/share/Ssh.bin #usr/share/man/man1/scp.1 #usr/share/man/man1/sftp.1 #usr/share/man/man1/slogin.1 @@ -34,4 +34,5 @@ usr/sbin/sshd #usr/share/man/man5/sshd_config.5 #usr/share/man/man8/sftp-server.8 #usr/share/man/man8/ssh-keysign.8 +#usr/share/man/man8/ssh-pkcs11-helper.8 #usr/share/man/man8/sshd.8 diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index 016e841..c075845 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -39,8 +39,6 @@ usr/bin/openssl #usr/include/openssl/engine.h #usr/include/openssl/err.h #usr/include/openssl/evp.h -#usr/include/openssl/fips.h -#usr/include/openssl/fips_rand.h #usr/include/openssl/hmac.h #usr/include/openssl/idea.h #usr/include/openssl/krb5_asn.h @@ -94,8 +92,6 @@ usr/bin/openssl #usr/lib/engines/libnuron.so #usr/lib/engines/libsureware.so #usr/lib/engines/libubsec.so -#usr/lib/fips_premain.c -#usr/lib/fips_premain.c.sha1 #usr/lib/libcrypto.a usr/lib/libcrypto.so usr/lib/libcrypto.so.0.9.8 @@ -659,6 +655,72 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/OpenSSL_add_all_digests.3 #usr/share/man/man3/OpenSSL_add_ssl_algorithms.3 #usr/share/man/man3/PEM.3 +#usr/share/man/man3/PEM_read_DHparams.3 +#usr/share/man/man3/PEM_read_DSAPrivateKey.3 +#usr/share/man/man3/PEM_read_DSA_PUBKEY.3 +#usr/share/man/man3/PEM_read_DSAparams.3 +#usr/share/man/man3/PEM_read_NETSCAPE_CERT_SEQUENCE.3 +#usr/share/man/man3/PEM_read_PKCS7.3 +#usr/share/man/man3/PEM_read_PUBKEY.3 +#usr/share/man/man3/PEM_read_PrivateKey.3 +#usr/share/man/man3/PEM_read_RSAPrivateKey.3 +#usr/share/man/man3/PEM_read_RSAPublicKey.3 +#usr/share/man/man3/PEM_read_RSA_PUBKEY.3 +#usr/share/man/man3/PEM_read_X509.3 +#usr/share/man/man3/PEM_read_X509_AUX.3 +#usr/share/man/man3/PEM_read_X509_CRL.3 +#usr/share/man/man3/PEM_read_X509_REQ.3 +#usr/share/man/man3/PEM_read_bio_DHparams.3 +#usr/share/man/man3/PEM_read_bio_DSAPrivateKey.3 +#usr/share/man/man3/PEM_read_bio_DSA_PUBKEY.3 +#usr/share/man/man3/PEM_read_bio_DSAparams.3 +#usr/share/man/man3/PEM_read_bio_NETSCAPE_CERT_SEQUENCE.3 +#usr/share/man/man3/PEM_read_bio_PKCS7.3 +#usr/share/man/man3/PEM_read_bio_PUBKEY.3 +#usr/share/man/man3/PEM_read_bio_PrivateKey.3 +#usr/share/man/man3/PEM_read_bio_RSAPrivateKey.3 +#usr/share/man/man3/PEM_read_bio_RSAPublicKey.3 +#usr/share/man/man3/PEM_read_bio_RSA_PUBKEY.3 +#usr/share/man/man3/PEM_read_bio_X509.3 +#usr/share/man/man3/PEM_read_bio_X509_AUX.3 +#usr/share/man/man3/PEM_read_bio_X509_CRL.3 +#usr/share/man/man3/PEM_read_bio_X509_REQ.3 +#usr/share/man/man3/PEM_write_DHparams.3 +#usr/share/man/man3/PEM_write_DSAPrivateKey.3 +#usr/share/man/man3/PEM_write_DSA_PUBKEY.3 +#usr/share/man/man3/PEM_write_DSAparams.3 +#usr/share/man/man3/PEM_write_NETSCAPE_CERT_SEQUENCE.3 +#usr/share/man/man3/PEM_write_PKCS7.3 +#usr/share/man/man3/PEM_write_PKCS8PrivateKey.3 +#usr/share/man/man3/PEM_write_PKCS8PrivateKey_nid.3 +#usr/share/man/man3/PEM_write_PUBKEY.3 +#usr/share/man/man3/PEM_write_PrivateKey.3 +#usr/share/man/man3/PEM_write_RSAPrivateKey.3 +#usr/share/man/man3/PEM_write_RSAPublicKey.3 +#usr/share/man/man3/PEM_write_RSA_PUBKEY.3 +#usr/share/man/man3/PEM_write_X509.3 +#usr/share/man/man3/PEM_write_X509_AUX.3 +#usr/share/man/man3/PEM_write_X509_CRL.3 +#usr/share/man/man3/PEM_write_X509_REQ.3 +#usr/share/man/man3/PEM_write_X509_REQ_NEW.3 +#usr/share/man/man3/PEM_write_bio_DHparams.3 +#usr/share/man/man3/PEM_write_bio_DSAPrivateKey.3 +#usr/share/man/man3/PEM_write_bio_DSA_PUBKEY.3 +#usr/share/man/man3/PEM_write_bio_DSAparams.3 +#usr/share/man/man3/PEM_write_bio_NETSCAPE_CERT_SEQUENCE.3 +#usr/share/man/man3/PEM_write_bio_PKCS7.3 +#usr/share/man/man3/PEM_write_bio_PKCS8PrivateKey.3 +#usr/share/man/man3/PEM_write_bio_PKCS8PrivateKey_nid.3 +#usr/share/man/man3/PEM_write_bio_PUBKEY.3 +#usr/share/man/man3/PEM_write_bio_PrivateKey.3 +#usr/share/man/man3/PEM_write_bio_RSAPrivateKey.3 +#usr/share/man/man3/PEM_write_bio_RSAPublicKey.3 +#usr/share/man/man3/PEM_write_bio_RSA_PUBKEY.3 +#usr/share/man/man3/PEM_write_bio_X509.3 +#usr/share/man/man3/PEM_write_bio_X509_AUX.3 +#usr/share/man/man3/PEM_write_bio_X509_CRL.3 +#usr/share/man/man3/PEM_write_bio_X509_REQ.3 +#usr/share/man/man3/PEM_write_bio_X509_REQ_NEW.3 #usr/share/man/man3/PKCS12_create.3 #usr/share/man/man3/PKCS12_parse.3 #usr/share/man/man3/PKCS7_decrypt.3 @@ -741,6 +803,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/SSL_CTX_add_session.3 #usr/share/man/man3/SSL_CTX_callback_ctrl.3 #usr/share/man/man3/SSL_CTX_check_private_key.3 +#usr/share/man/man3/SSL_CTX_clear_options.3 #usr/share/man/man3/SSL_CTX_ctrl.3 #usr/share/man/man3/SSL_CTX_flush_sessions.3 #usr/share/man/man3/SSL_CTX_free.3 @@ -838,6 +901,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/SSL_callback_ctrl.3 #usr/share/man/man3/SSL_check_private_key.3 #usr/share/man/man3/SSL_clear.3 +#usr/share/man/man3/SSL_clear_options.3 #usr/share/man/man3/SSL_connect.3 #usr/share/man/man3/SSL_ctrl.3 #usr/share/man/man3/SSL_do_handshake.3 @@ -868,6 +932,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/SSL_get_peer_certificate.3 #usr/share/man/man3/SSL_get_quiet_shutdown.3 #usr/share/man/man3/SSL_get_rbio.3 +#usr/share/man/man3/SSL_get_secure_renegotiation_support.3 #usr/share/man/man3/SSL_get_session.3 #usr/share/man/man3/SSL_get_shutdown.3 #usr/share/man/man3/SSL_get_ssl_method.3 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index d2130b6..8f02a4c 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -132,7 +132,7 @@ * hostapd-0.6.9 * hplip-2.7.10 * htop-0.8.1 -* httpd-2.2.14 +* httpd-2.2.15 * hwdata * iana-etc-2.10 * icecast-2.3.2 @@ -247,8 +247,8 @@ * open-vm-tools-2009.05.22-167859 * openldap-2.3.20 * openmailadmin-1.0.0 -* openssh-5.3p1 -* openssl-0.9.8l +* openssh-5.4p1 +* openssl-0.9.8m * openswan-2.6.24 * openswan-2.6.24-kmod-2.6.32.9-ipfire * openswan-2.6.24-kmod-2.6.32.9-ipfire-xen diff --git a/lfs/apache2 b/lfs/apache2 index 94c38c7..920bccd 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@ include Config -VER = 2.2.14 +VER = 2.2.15 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch -$(DL_FILE)_MD5 = a5226203aaf97e5b941c41a71c112704 +$(DL_FILE)_MD5 = 016cec97337eccead2aad6a7c27f2e14 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822 install : $(TARGET) diff --git a/lfs/openssh b/lfs/openssh index c64cd56..ffcf476 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 5.3p1 +VER = 5.4p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 13563dbf61f36ca9a1e4254260131041 +$(DL_FILE)_MD5 = da10af8a789fa2e83e3635f3a1b76f5e install : $(TARGET) diff --git a/lfs/openssl b/lfs/openssl index 878f52b..96c66bb 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 0.9.8l +VER = 0.9.8m THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 05a0ece1372392a2cf310ebb96333025 +$(DL_FILE)_MD5 = 898bf125370926d5f692a2201124f8ec install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 05ffd50f499d7090c4224f604dccaf1ce53a2452
by git＠ipfire.org 08 Mar '10

08 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 05ffd50f499d7090c4224f604dccaf1ce53a2452 (commit) via e644e0ce0f462bcde27c22526184453a23a1625b (commit) from ba48a4a5d521e5d68ae52cbaf579e54cc9d31a61 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 05ffd50f499d7090c4224f604dccaf1ce53a2452 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Mar 8 19:18:49 2010 +0100 Fix grub at flashimage. commit e644e0ce0f462bcde27c22526184453a23a1625b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Mar 8 19:18:26 2010 +0100 Grub rootfile update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/grub | 33 +++++++++++++++------------------ lfs/flash-images | 4 ++-- 2 files changed, 17 insertions(+), 20 deletions(-) Difference in files: diff --git a/config/rootfiles/common/grub b/config/rootfiles/common/grub index 2324e1c..e466ff0 100644 --- a/config/rootfiles/common/grub +++ b/config/rootfiles/common/grub @@ -1,5 +1,4 @@ #boot/grub -#boot/grub/default boot/grub/grub.conf boot/grub/ipfire.xpm.gz boot/grub/stage1 @@ -7,22 +6,6 @@ boot/grub/stage2 #usr/bin/mbchk #usr/info/grub.info #usr/info/multiboot.info -usr/lib/grub -#usr/lib/grub/i386-pc -#usr/lib/grub/i386-pc/e2fs_stage1_5 -#usr/lib/grub/i386-pc/fat_stage1_5 -#usr/lib/grub/i386-pc/ffs_stage1_5 -#usr/lib/grub/i386-pc/iso9660_stage1_5 -#usr/lib/grub/i386-pc/jfs_stage1_5 -#usr/lib/grub/i386-pc/minix_stage1_5 -#usr/lib/grub/i386-pc/reiserfs_stage1_5 -#usr/lib/grub/i386-pc/reiser4_stage1_5 -#usr/lib/grub/i386-pc/stage1 -#usr/lib/grub/i386-pc/stage2 -#usr/lib/grub/i386-pc/stage2_eltorito -#usr/lib/grub/i386-pc/ufs2_stage1_5 -#usr/lib/grub/i386-pc/vstafs_stage1_5 -#usr/lib/grub/i386-pc/xfs_stage1_5 #usr/man/man1/mbchk.1 #usr/man/man8/grub-install.8 #usr/man/man8/grub-md5-crypt.8 @@ -31,5 +14,19 @@ usr/lib/grub usr/sbin/grub usr/sbin/grub-install usr/sbin/grub-md5-crypt -usr/sbin/grub-set-default usr/sbin/grub-terminfo +usr/share/grub +#usr/share/grub/i386-pc +#usr/share/grub/i386-pc/e2fs_stage1_5 +#usr/share/grub/i386-pc/fat_stage1_5 +#usr/share/grub/i386-pc/ffs_stage1_5 +#usr/share/grub/i386-pc/iso9660_stage1_5 +#usr/share/grub/i386-pc/jfs_stage1_5 +#usr/share/grub/i386-pc/minix_stage1_5 +#usr/share/grub/i386-pc/reiserfs_stage1_5 +#usr/share/grub/i386-pc/stage1 +#usr/share/grub/i386-pc/stage2 +#usr/share/grub/i386-pc/stage2_eltorito +#usr/share/grub/i386-pc/ufs2_stage1_5 +#usr/share/grub/i386-pc/vstafs_stage1_5 +#usr/share/grub/i386-pc/xfs_stage1_5 diff --git a/lfs/flash-images b/lfs/flash-images index f3353ff..5eff02a 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -106,8 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -s ipfirerd-$(KVER)-emergency.img $(MNThdd)/boot/ipfirerd-$(KVER).img # Copy grub files manually - cp -f $(MNThdd)/usr/lib/grub/i386-pc/* $(MNThdd)/boot/grub/ - chroot $(MNThdd) /usr/sbin/grub-set-default 0 + cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ + #chroot $(MNThdd) /usr/sbin/grub-set-default 0 # Create a script for rebuild-initrd and setup echo "#!/bin/bash" > $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 07842dc180f3abd59748b2221b94165e0624b769
by git＠ipfire.org 08 Mar '10

08 Mar '10

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM